From eac30db6329f05cc7cf2a35613497e357b4db3aa Mon Sep 17 00:00:00 2001
From: abranson <abranson@PCUWE01.cern.ch>
Date: Thu, 26 Apr 2012 00:31:26 +0200
Subject: Update for javax.script

---
 build.xml | 47 ++++++++++++++---------------------------------
 1 file changed, 14 insertions(+), 33 deletions(-)

(limited to 'build.xml')

diff --git a/build.xml b/build.xml
index 0fc492b..0b934cb 100644
--- a/build.xml
+++ b/build.xml
@@ -1,33 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project basedir="." default="jar" name="cristal-dev">
-	<!--===================================================================-->
-	<!-- Global properties                                                 -->
-	<!-- NOTE: Ant will automatically will add all jar files to the        -->
-	<!-- classpath from the $(ANT_HOME)/lib directory. In cristal2         -->
-	<!-- setup this directories are equal to the cristal2/lib              -->
-	<!-- directory which eliminates thecalculation of classpath for        -->
-	<!-- the most of the 'javac' tasks                                     -->
-	<!--===================================================================-->
 	<property name="name" value="cristal-dev"/>
 	<property name="version" value="1.0"/>
-	<!--===================================================================-->
-	<!--   Directories                                                     -->
-	<!--===================================================================-->
 	<property name="src.dir" value="src"/>
 	<property name="res.dir" value="ch/cern/cristaldev/resources"/>
 	<property name="build.dir" value="bin"/>
 	<property name="resource.dir" value="resources"/>
-	<!--===================================================================-->
-	<!--                Global javacc attributes                           -->
-	<!--===================================================================-->
 	<property name="debug" value="true"/>
 	<property name="deprecation" value="false"/>
 	<property name="optimize" value="true"/>
-	<property name="junit.fork" value="false"/>
-	<!-- ==================================================================-->
-	<!--            The pattern for the support files that need            -->
-	<!--                to be copied when compiling classes                -->
-	<!-- ==================================================================-->
+
+	<!-- Resource file patterns -->
 	<patternset id="resource.files">
 		<include name="boot/**/*.txt"/>
 		<include name="boot/**/*.xml"/>
@@ -36,24 +19,11 @@
 		<include name="images/**/*.jpg"/>		
 		<include name="images/**/*.png"/>
 	</patternset>
-		
-	<!--===================================================================-->
-	<!--       Prepare the build (takes the timestamp see: Ant1.3 docs)    -->
-	<!--===================================================================-->
+
 	<target name="prepare">
 		<tstamp/>
 	</target>
 
-	<target name="clean" description="cleans up the build directories">
-		<delete dir="${build.dir}"/>
-	</target>	
-	<target name="rebuild" depends="clean, jar" description="deletes and rebuilds the cristal-dev module"/>
-	<target name="jar" depends="resources" description="make jar">
-		<jar basedir="${build.dir}" includes="**" jarfile="cristaldev.jar"/>
-	</target>
-	<!--===================================================================-->
-	<!--    Assembles cristal2 resources                                  -->
-	<!--===================================================================-->
 	<target name="resources" depends="prepare" description="Moves all resources to the build directory for the Resource class to read">
 		<mkdir dir="${build.dir}/${res.dir}"/>
 		<copy todir="${build.dir}/${res.dir}">
@@ -68,4 +38,15 @@
 		</copy>
 	</target>
 
+	<target name="jar" depends="resources" description="make jar">
+		<jar basedir="${build.dir}" includes="**" jarfile="cristaldev.jar"/>
+	</target>
+
+	<target name="clean" description="cleans up the build directories">
+		<delete dir="${build.dir}"/>
+	</target>	
+
+	<target name="rebuild" depends="clean, jar" description="deletes and rebuilds the cristal-dev module"/>
+	
+
 </project>
-- 
cgit v1.2.3