commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbe...@apache.org
Subject svn commit: r988282 - /commons/sandbox/gsoc/2010/scxml-js/trunk/build.xml
Date Mon, 23 Aug 2010 19:45:48 GMT
Author: jbeard
Date: Mon Aug 23 19:45:48 2010
New Revision: 988282

URL: http://svn.apache.org/viewvc?rev=988282&view=rev
Log:
Made use of properties in other parts of build.xml

Modified:
    commons/sandbox/gsoc/2010/scxml-js/trunk/build.xml

Modified: commons/sandbox/gsoc/2010/scxml-js/trunk/build.xml
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-js/trunk/build.xml?rev=988282&r1=988281&r2=988282&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-js/trunk/build.xml (original)
+++ commons/sandbox/gsoc/2010/scxml-js/trunk/build.xml Mon Aug 23 19:45:48 2010
@@ -6,6 +6,21 @@
 		</classpath>
 	</taskdef>
 
+	<!-- location properties -->
+	<property name="src" value="src"/>
+
+	<property name="lib" location="lib"/>
+	<property name="lib-java" location="${lib}/java"/>
+	<property name="lib-js" location="${lib}/js"/>
+	<property name="lib-test-java" location="${lib}/test-java"/>
+	<property name="lib-test-js" location="${lib}/test-js"/>
+
+	<property name="build" location="build"/>
+	<property name="build-js" location="${build}/build-js"/>
+	<property name="build-class" location="${build}/class"/>
+	<property name="build-jar" location="${build}/jar"/>
+
+
 	<property name="ie_browser_name" value="ie"/>
 
 	<property name="is_for_ie" value="is-for-ie"/>
@@ -15,7 +30,10 @@
 	<!--
 	<property name="backends" value="switch"/>
 	-->
+	<property name="browsers" value="firefox,chrome"/>
+	<!--
 	<property name="browsers" value="firefox,${ie_browser_name},chrome"/>
+	-->
 	<property name="for-ie" value="${is_for_ie},${is_not_for_ie}"/>
 
 	<!-- selenium configuration options -->
@@ -30,32 +48,32 @@
 	<property name="selenium_safari_id" value="*safari"/>
 
 	<!-- classpath configuration stuff -->
-	<path id="rhino-classpath" location="lib/java/js.jar"/>
-	<path id="closure-classpath" location="lib/js/requirejs/build/lib/closure/compiler.jar"/>
+	<path id="rhino-classpath" location="${lib-java}/js.jar"/>
+	<path id="closure-classpath" location="${lib-js}/requirejs/build/lib/closure/compiler.jar"/>
 
-	<path id="xslt-processor-classpath" location="lib/java/xalan.jar"/>
+	<path id="xslt-processor-classpath" location="${lib-java}/xalan.jar"/>
 
 	<path id="requirejs_bootstrap_paths">
-		<pathelement location="lib/js/requirejs/require.js"/> 
-		<pathelement location="lib/js/requirejs/require/rhino.js"/> 
-		<pathelement location="lib/js/requirejs/require/text.js"/> 
-		<pathelement location="lib/js/requirejs/require/xml.js"/> 
+		<pathelement location="${lib-js}/requirejs/require.js"/> 
+		<pathelement location="${lib-js}/requirejs/require/rhino.js"/> 
+		<pathelement location="${lib-js}/requirejs/require/text.js"/> 
+		<pathelement location="${lib-js}/requirejs/require/xml.js"/> 
 	</path>
 
-	<property name="path_to_dojo_base" location="lib/test-js/dojo-release-1.4.2-src/dojo"/>
+	<property name="path_to_dojo_base" location="${lib-test-js}/dojo-release-1.4.2-src/dojo"/>
 	<property name="path_to_dojo" value="${path_to_dojo_base}/dojo.js"/>
 
 	<path id="scxml-js-compiler-classpath">
 		<path refid="rhino-classpath"/>
-		<pathelement location="lib/java/commons-cli.jar"/>
-		<pathelement location="lib/java/serializer.jar"/>
-		<pathelement location="lib/java/xalan.jar"/>
-		<pathelement location="lib/java/xercesImpl.jar"/>
-		<pathelement location="lib/java/xml-apis.jar"/>
+		<pathelement location="${lib-java}/commons-cli.jar"/>
+		<pathelement location="${lib-java}/serializer.jar"/>
+		<pathelement location="${lib-java}/xalan.jar"/>
+		<pathelement location="${lib-java}/xercesImpl.jar"/>
+		<pathelement location="${lib-java}/xml-apis.jar"/>
 		<pathelement location="build/scxml-js.jar"/>
 	</path>
 
-	<fileset id="stylesheets-to-preprocess" dir="src/xslt/backends/js">
+	<fileset id="stylesheets-to-preprocess" dir="${src}/xslt/backends/js">
 		<include name="StatePatternStatechartGenerator.xsl"/>
 		<include name="StateTableStatechartGenerator.xsl"/>
 		<include name="SwitchyardStatechartGenerator.xsl"/>
@@ -92,9 +110,9 @@
 			<!-- TODO: update classpath here -->
 			<script language="javascript" manager="bsf">
 				<classpath>
-				<fileset dir="lib/java/" includes="js.jar"/>
+				<fileset dir="${lib-java}/" includes="js.jar"/>
 				<fileset dir="lib/build-java/" includes="*.jar"></fileset>
-				<fileset dir="lib/test-java/" includes="*.jar"></fileset>
+				<fileset dir="${lib-test-java}/" includes="*.jar"></fileset>
 				</classpath><![CDATA[
 					var shell = org.mozilla.javascript.tools.shell.Main;
 					var args = ["-e","var a='STRING';"];
@@ -416,7 +434,7 @@
 	<target name="preprocess-stylesheets" depends="init">
 		<xslt 
 			classpathref="xslt-processor-classpath" 
-			style="src/xslt/util/preprocess_import.xsl" 
+			style="${src}/xslt/util/preprocess_import.xsl" 
 			destdir="build"
 			scanincludeddirectories="false"
 			useImplicitFileset="false">
@@ -797,19 +815,8 @@
 	<target name="run-all-unit-tests" 
 		depends="run-unit-tests-with-selenium,run-in-browser-unit-tests-with-selenium,run-unit-tests-with-rhino"
/>
 
-	<property name="src" value="src"/>
 
-
-	<property name="lib" location="lib"/>
-	<property name="lib-java" location="${lib}/java"/>
-	<property name="lib-js" location="${lib}/js"/>
-	<property name="lib-test-java" location="${lib}/test-java"/>
-	<property name="lib-test-js" location="${lib}/test-js"/>
-
-	<property name="build" location="build"/>
-	<property name="build-js" location="${build}/build-js"/>
-	<property name="build-class" location="${build}/class"/>
-	<property name="build-jar" location="${build}/jar"/>
+	<!-- build standalone executable -->
 
 	<property name="build-js-main" location="${build-js}/main-built.js"/>
 	<property name="build-class-main-name" value="SCXMLCompiler"/>
@@ -823,14 +830,13 @@
 
 	<property name="test" location="test"/>
 
-	<!-- build standalone executable -->
 	<target name="compile-single-js">
 		<mkdir dir="${build-js}"/>
 
 		<java classname="org.mozilla.javascript.tools.shell.Main">
 			<classpath>
-				<pathelement location="lib/java/js.jar"/>
-				<pathelement location="lib/js/requirejs/build/lib/closure/compiler.jar"/>
+				<path refid="rhino-classpath"/>
+				<path refid="closure-classpath"/>
 			</classpath>
 			<arg value="${js-build-script}"/>
 			<arg value="${js-build-dir}"/>
@@ -850,7 +856,6 @@
 		<java classname="org.mozilla.javascript.tools.jsc.Main">
 			<classpath>
 				<path refid="rhino-classpath"/>
-				<path refid="closure-classpath"/>
 			</classpath>
 			<arg value="-o"/>
 			<arg value="${build-class-main-name}.class"/>



Mime
View raw message