webui-build: use /usr/share/java/js.jar instead of rhino.jar
/usr/share/java/rhino.jar is a Fedora's symlink to /usr/share/java/js.jar Debian doesn't have it. Direct usage of upstream /usr/share/java/js.jar should work on both systems. Reviewed-By: Timo Aaltonen <tjaalton@ubuntu.com>
This commit is contained in:
1 parent
21c829ffa5
commit
76ec9384fb
2 files changed
+2
-2
No files matched your search
@@ -31,6 +31,6 @@ if [[ ! $profile ]] ; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
RHINO="java -Xss${JAVA_STACK_SIZE:-512k} -classpath /usr/share/java/rhino.jar org.mozilla.javascript.tools.shell.Main"
|
||||
RHINO="java -Xss${JAVA_STACK_SIZE:-512k} -classpath /usr/share/java/js.jar org.mozilla.javascript.tools.shell.Main"
|
||||
$RHINO $DIR/build/build.js baseUrl=$DIR/build load=build profile=$DIR/../src/$profile.profile.js
|
||||
exit $?
|
||||
@@ -25,7 +25,7 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
||||
|
||||
# rhino-1.7R4 doesn't have -main option to enable CommonJS support. It was
|
||||
# replaced by -require option.
|
||||
RHINO="java -Xss${JAVA_STACK_SIZE:-512k} -classpath /usr/share/java/rhino.jar org.mozilla.javascript.tools.shell.Main"
|
||||
RHINO="java -Xss${JAVA_STACK_SIZE:-512k} -classpath /usr/share/java/js.jar org.mozilla.javascript.tools.shell.Main"
|
||||
if [ `$RHINO --help | grep -e -require | wc -l` -gt 0 ] ; then
|
||||
$RHINO -require $DIR/uglify-js.js $@
|
||||
else
|
||||
|
||||
Reference in new issue
Block a user