commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbe...@apache.org
Subject svn commit: r1037490 - in /commons/sandbox/gsoc/2010/scxml-js/trunk: build-common.xml build.xml mvn-ant-build.xml pom.xml
Date Sun, 21 Nov 2010 16:06:12 GMT
Author: jbeard
Date: Sun Nov 21 16:06:12 2010
New Revision: 1037490

URL: http://svn.apache.org/viewvc?rev=1037490&view=rev
Log:
Intermediate commit. State pattern passes all unit tests. Switch and table patterns are broken.

Modified:
    commons/sandbox/gsoc/2010/scxml-js/trunk/build-common.xml
    commons/sandbox/gsoc/2010/scxml-js/trunk/build.xml
    commons/sandbox/gsoc/2010/scxml-js/trunk/mvn-ant-build.xml
    commons/sandbox/gsoc/2010/scxml-js/trunk/pom.xml

Modified: commons/sandbox/gsoc/2010/scxml-js/trunk/build-common.xml
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-js/trunk/build-common.xml?rev=1037490&r1=1037489&r2=1037490&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-js/trunk/build-common.xml (original)
+++ commons/sandbox/gsoc/2010/scxml-js/trunk/build-common.xml Sun Nov 21 16:06:12 2010
@@ -45,10 +45,10 @@
 
 	<property name="language-frontends" value="js,py,sh"/>
 
-	<property name="backends" value="switch,table,state"/>
 	<!--
-	<property name="backends" value="switch"/>
+	<property name="backends" value="switch,table,state"/>
 	-->
+	<property name="backends" value="state"/>
 	<property name="browsers" value="firefox,chrome"/>
 	<!--
 	<property name="browsers" value="firefox,${ie_browser_name},chrome"/>
@@ -549,7 +549,7 @@
 		</sequential>
 	</macrodef>
 
-	<target name="preprocess-stylesheets">
+	<target name="preprocess-stylesheets" unless="${skip-preprocessing-xsl}">
 		<xslt 
 			classpathref="maven.plugin.classpath" 
 			style="${src}/xslt/util/preprocess_import.xsl" 
@@ -593,7 +593,7 @@
 		</for>
 	</target>
 
-	<target name="build-language-frontend-modules"  depends="build-dependency-lists">
+	<target name="build-language-frontend-modules"  depends="build-dependency-lists" unless="${skip-generating-modules}">
 
 		<path id="build-xsl-dep-list-path">
 			<fileset dir="${build-xsl-dep-list}" includes="*.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=1037490&r1=1037489&r2=1037490&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-js/trunk/build.xml (original)
+++ commons/sandbox/gsoc/2010/scxml-js/trunk/build.xml Sun Nov 21 16:06:12 2010
@@ -104,7 +104,7 @@
 	-->
 
 	<!-- run unit and performance tests -->
-	<target name="generate-javascript" depends="setup-properties,preprocess-stylesheets,generate-javascript-mvn"/>
+	<target name="generate-javascript" depends="setup-properties,preprocess-stylesheets,build-language-frontend-modules,generate-javascript-mvn"/>
 
 	<target name="generate-unit-test-html" depends="setup-properties">
 		<mkdir dir="${build}/generate-unit-tests-html"/>
@@ -169,7 +169,7 @@
 	</target>
 
 
-	<target name="run-in-browser-unit-tests-with-selenium" depends="preprocess-stylesheets,generate-in-browser-unit-test-html"
if="isWindows">
+	<target name="run-in-browser-unit-tests-with-selenium" depends="preprocess-stylesheets,build-language-frontend-modules,generate-in-browser-unit-test-html"
if="isWindows">
 		<run-unit-tests-with-selenium-macro 
 			unit-tests-html-property-name="in-browser-unit-test-html-location"/>
 	</target>

Modified: commons/sandbox/gsoc/2010/scxml-js/trunk/mvn-ant-build.xml
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-js/trunk/mvn-ant-build.xml?rev=1037490&r1=1037489&r2=1037490&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-js/trunk/mvn-ant-build.xml (original)
+++ commons/sandbox/gsoc/2010/scxml-js/trunk/mvn-ant-build.xml Sun Nov 21 16:06:12 2010
@@ -33,7 +33,7 @@
 
 	<property name="test" location="test"/>
 
-	<target name="compile-single-js-mvn" depends="preprocess-stylesheets">
+	<target name="compile-single-js-mvn" depends="preprocess-stylesheets,build-language-frontend-modules">
 		<mkdir dir="${build-js}"/>
 
 		<java classname="org.mozilla.javascript.tools.shell.Main">

Modified: commons/sandbox/gsoc/2010/scxml-js/trunk/pom.xml
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-js/trunk/pom.xml?rev=1037490&r1=1037489&r2=1037490&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-js/trunk/pom.xml (original)
+++ commons/sandbox/gsoc/2010/scxml-js/trunk/pom.xml Sun Nov 21 16:06:12 2010
@@ -205,6 +205,7 @@
             <configuration>
               <tasks>
 		<ant target="preprocess-stylesheets" inheritRefs="true" antfile="mvn-ant-build.xml"/>
+		<ant target="build-language-frontend-modules" inheritRefs="true" antfile="mvn-ant-build.xml"/>
               </tasks>
             </configuration>
             <goals>
@@ -235,7 +236,6 @@
               <goal>run</goal>
             </goals>
           </execution>
-<!--
           <execution>
 	    <id>generate-test-sources</id>
             <phase>generate-test-sources</phase>
@@ -260,7 +260,6 @@
               <goal>run</goal>
             </goals>
           </execution>
--->
         </executions>
 	<dependencies>
 		<!-- dependencies for running Rhino JavaScript scripts in Ant -->



Mime
View raw message