IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2026-09-03 20:52:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fixed Web UI build error caused by rhino changes in F19

Browse Source 
rhino-1.7R4-2.fc19.noarch dropped -main flag which made the build fail in rawhide (F19).

We can't use the same command for rhino-1.7R3-6 (F18) and rhino-1.7R4-2 (F19).
This patch adds check if rhino supports '-require' option. If so it calls rhino with it if not it calls rhino with -main option.

https://fedorahosted.org/freeipa/ticket/3501
This commit is contained in:
Petr Vobornik
2013-03-21 09:30:35 +01:00
committed by Martin Kosek
parent be54d1deb5
commit 790a576ad1
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
install/ui/util/uglifyjs/uglify
+7 -1
View File
@@ -23,4 +23,10 @@
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
rhino -main $DIR/uglify-js.js $DIR/ug.js $1 $2 -v # rhino-1.7R4 doesn't have -main option to enable CommonJS support. It was
# replaced by -require option.
if [ `rhino --help | grep -e -require | wc -l` -gt 0 ] ; then
rhino -require $DIR/uglify-js.js $@
else
rhino -main $DIR/uglify-js.js $DIR/ug.js $@
fi