[ZKforge-subversion-log] SF.net SVN: zkforge: [215] trunk/build

[<to...@us...>]

Revision: 215
          http://svn.sourceforge.net/zkforge/?rev=215&view=rev
Author:   tomyeh
Date:     2007-02-04 06:58:05 -0800 (Sun, 04 Feb 2007)

Log Message:
-----------


Modified Paths:
--------------
    trunk/build

Modified: trunk/build
===================================================================
--- trunk/build	2007-02-04 14:55:10 UTC (rev 214)
+++ trunk/build	2007-02-04 14:58:05 UTC (rev 215)
@@ -117,7 +117,7 @@
 fi
 
 #-- adjust javac debug and optimize flags
-dflag=$(grep '^debug' $setting)
+dflag=$(grep '^debug=' $setting)
 dflag=${dflag#debug=}
 if [ "$dflag" = "true" ] ; then
 	dflag=on
@@ -128,7 +128,7 @@
 	exit 1
 fi
 
-oflag=$(grep '^optimize' $setting)
+oflag=$(grep '^optimize=' $setting)
 oflag=${oflag#optimize=}
 if [ "$oflag" = "true" ] ; then
 	oflag=on
@@ -407,6 +407,23 @@
 		tgtver=1.4
 	fi
 
+	this_dflag=$dflag
+	dflagtmp=$(grep '^debug=' version)
+	dflagtmp=${dflagtmp#debug=}
+	if [ "$dflagtmp" = "true" ] ; then
+		this_dflag=on
+	elif [ "$dflagtmp" = "false" ] ; then
+		this_dflag=off
+	fi
+	this_oflag=$oflag
+	oflagtmp=$(grep '^optimize=' version)
+	oflagtmp=${oflagtmp#optimize=}
+	if [ "$oflagtmp" = "true" ] ; then
+		this_oflag=on
+	elif [ "$oflagtmp" = "false" ] ; then
+		this_oflag=off
+	fi
+	
 	format="$(head -1 format)"
 	if [ "$format" = "cpp" ] ; then
 		if [ ! -d $outdir ] ; then
@@ -430,7 +447,7 @@
 		-Dproject.name="$2" -Dproject.version="$prjver" \
 		-Dsource.version="$srcver" -Dtarget.version="$tgtver" \
 		-Dhaltonerror=$haltonerror -Dout.dir=$outdir \
-		-Ddebug=$dflag -Doptimize=$oflag ${nojc} \
+		-Ddebug=$this_dflag -Doptimize=$this_oflag ${nojc} \
 		-Dshare.javadoc.dir="$javadocdir" \
 		-Djavadoc.class.path="$DCP" -Dapp.name=$app $unziplist \
 		-Droot.context=$rootContext \


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.