bkruse: branch group/new_exp r1811 - in /team/group/new_exp: Makefile configure

[SVN commits to the Asterisk-GUI project]

Author: bkruse
Date: Mon Nov 19 14:46:07 2007
New Revision: 1811

URL: http://svn.digium.com/view/asterisk-gui?view=rev&rev=1811
Log:
Fixed a quick makefile error astman.js != astman.hs

Going to start using a directory like scripts_opt
for optimized javascript files (pre-optimized)

Going to have to think that one out, but added
the option to the configure script/makefile

Modified:
    team/group/new_exp/Makefile
    team/group/new_exp/configure

Modified: team/group/new_exp/Makefile
URL: http://svn.digium.com/view/asterisk-gui/team/group/new_exp/Makefile?view=diff&rev=1811&r1=1810&r2=1811
==============================================================================
--- team/group/new_exp/Makefile (original)
+++ team/group/new_exp/Makefile Mon Nov 19 14:46:07 2007
@@ -142,14 +142,14 @@
 defaults.h: makeopts
 	@build_tools/make_defaults_h > $@.tmp
 	@if cmp -s $@.tmp $@ ; then : ; else \
-		mv $@.tmp $@ ; \
+		mv -f $@.tmp $@ ; \
 	fi
 	@rm -f $@.tmp
 
 astman_vars.js: makeopts
 	@build_tools/make_astman_vars_js > $@.tmp
 	@if cmp -s $@.tmp scripts/$@ ; then : ; else \
-		mv $@.tmp scripts/$@ ; \
+		mv -f $@.tmp scripts/$@ ; \
 	fi
 	@rm -f $@.tmp
 
@@ -247,7 +247,6 @@
 	mkdir -p $(CONFIGDIR)/stylesheets
 	mkdir -p $(CONFIGDIR)/scripts
 	@cat scripts/astman.js >> scripts/astman_vars.js
-	$(INSTALL) -m 644 scripts/astman_vars.js $(CONFIGDIR)/scripts/astman.hs
 	@for x in images/*; do \
 		echo "$$x  -->  $(CONFIGDIR)/images/" ; \
 		$(INSTALL) -m 644 $$x $(CONFIGDIR)/images/ ; \
@@ -256,6 +255,7 @@
 		echo "$$x  -->  $(CONFIGDIR)/scripts/" ; \
 		$(INSTALL) -m 644 $$x $(CONFIGDIR)/scripts/ ; \
 	done
+	$(INSTALL) -m 644 scripts/astman_vars.js $(CONFIGDIR)/scripts/astman.js
 	@for x in stylesheets/*; do \
 		echo "$$x  -->  $(CONFIGDIR)/stylesheets/" ; \
 		$(INSTALL) -m 644 $$x $(CONFIGDIR)/stylesheets/ ; \

Modified: team/group/new_exp/configure
URL: http://svn.digium.com/view/asterisk-gui/team/group/new_exp/configure?view=diff&rev=1811&r1=1810&r2=1811
==============================================================================
--- team/group/new_exp/configure (original)
+++ team/group/new_exp/configure Mon Nov 19 14:46:07 2007
@@ -1224,6 +1224,7 @@
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
   --with-zaptel=PATH      use Zaptel files in PATH
+  --without-optimization  do NOT use optimization of javascript files (useful for debugging)
 
 Some influential environment variables:
   CC          C compiler command
@@ -3891,6 +3892,23 @@
 fi
 
 PBX_ZAPTEL=0
+
+OPTIMIZE_JAVASCRIPT=yes
+if test "${without_optimization+set}" = set; then
+  withval=$without_optimization;
+case ${withval} in
+     n|no)
+     OPTIMIZE_JAVASCRIPT=yes
+     # I hope no one really does --without-optimization=no but I will include it :)
+     ;;
+     y|ye|yes)
+     OPTIMIZE_JAVASCRIPT=no
+     ;;
+     *)
+     OPTIMIZE_JAVASCRIPT=no
+     ;;
+esac
+fi