removed clojure-compiler compilation from the default build. Added a couple popcorn-port
authorhamidouk
Wed, 21 Dec 2011 10:56:09 +0100
branchpopcorn-port
changeset 494 cb88c0c8ddfa
parent 493 f7333cdf5320
child 495 41a9f7b27952
child 505 b1e442d9a1bc
removed clojure-compiler compilation from the default build. Added a couple script to run it if necessary.
sbin/build/client.xml
sbin/build/minify.bat
sbin/build/minify.sh
--- a/sbin/build/client.xml	Wed Dec 21 10:51:33 2011 +0100
+++ b/sbin/build/client.xml	Wed Dec 21 10:56:09 2011 +0100
@@ -16,7 +16,7 @@
 	<delete dir="${basedir}/../../build" />
 	<mkdir  dir="${basedir}/../../build" />
 		
-	<target name="makeall" depends="concatenate,compile" />
+	<target name="makeall" depends="concatenate" />
 	
 	<target name="make_templates" description="Concatenate the html templates together">
 	    <for param="file">
@@ -44,29 +44,7 @@
 	    	</sequential>
 		</for>
 	</target>
-	
-	<target name="compile" depends="concatenate">
-		<jscomp compilationLevel="simple" warning="quiet" debug="false"
-			output="../../build/LdtPlayer.min.raw.js">
-			<externs dir="${basedir}/../../res/">
-				<file name="js/jquery.min.js" />
-				<file name="js/jquery.tools.min.js" />
-				<file name="js/jquery-ui.min.js" />
-				<file name="js/swfobject.js" />
-			</externs>
-			<sources dir="${basedir}/../../src/js">
-				<file name="LdtPlayer.js" />
-			</sources>
-		</jscomp>
-		<concat destfile="../../build/LdtPlayer.min.js"
-			append="false">
-			<filelist dir="../../src/js/" files="header.js" />
-	        <filelist dir="../../build/" files="LdtPlayer.min.raw.js" />
-		</concat>
-		<delete file="../../build/LdtPlayer.min.raw.js" />
-		<delete file="../../build/compiled_templates.js" />
-	</target>
-	    	
+		    	
 	<target name="concatenate" description="Build the developer release file" depends="make_templates">
 	    <concat encoding="UTF-8" outputencoding="UTF-8" destfile="../../build/LdtPlayer-release.js">
 			<filelist dir="../../src/js/" files="header.js" />
@@ -102,8 +80,30 @@
 	    	    <deletecharacters chars="&#xFEFF;" />
 	    	</filterchain>
 	    </concat>
+      <delete file="../../build/compiled_templates.js" />
 	</target>
 	
+  <target name="minify" depends="concatenate">
+		<jscomp compilationLevel="simple" warning="quiet" debug="false"
+			output="../../build/LdtPlayer.min.raw.js">
+			<externs dir="${basedir}/../../res/">
+				<file name="js/jquery.min.js" />
+				<file name="js/jquery.tools.min.js" />
+				<file name="js/jquery-ui.min.js" />
+				<file name="js/swfobject.js" />
+			</externs>
+			<sources dir="${basedir}/../../build">
+				<file name="LdtPlayer-release.js" />
+			</sources>
+		</jscomp>
+		<concat destfile="../../build/LdtPlayer.min.js"
+			append="false">
+			<filelist dir="../../src/js/" files="header.js" />
+	        <filelist dir="../../build/" files="LdtPlayer.min.raw.js" />
+		</concat>
+		<delete file="../../build/LdtPlayer.min.raw.js" />
+	</target>
+  
 	<property name="rhino.jar" value="${basedir}/../res/rhino.jar"/>  
 	<property name="jslint-wrapper.js" value="${basedir}/../res/jslint-wrapper.js"/>
 	<property name="jslint.js" value="${basedir}/../res/jslint.js"/>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sbin/build/minify.bat	Wed Dec 21 10:56:09 2011 +0100
@@ -0,0 +1,1 @@
+..\res\ant\bin\ant.bat -f client.xml minify
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sbin/build/minify.sh	Wed Dec 21 10:56:09 2011 +0100
@@ -0,0 +1,2 @@
+#!/bin/sh
+sh ../res/ant/bin/ant -f client.xml minify
\ No newline at end of file