Changeset 1510

Timestamp:

12/02/08 15:54:27 (5 weeks ago)

Author:

csims

Message:

The build should no longer include the junit tests or libraries by default. This might break the build on the build server.

Location:

branches/dev/j2merosa/org.javarosa.demo

Files:

• .classpath (modified) (2 diffs)
• build.xml (modified) (5 diffs)
• tools/j2meunit-javarosa.jar (moved) (moved from branches/dev/j2merosa/org.javarosa.demo/lib/j2meunit-javarosa.jar) (1 prop)

branches/dev/j2merosa/org.javarosa.demo/.classpath

@@ -4 +4 @@
         <classpathentry kind="src" path="test"/>
         <classpathentry exported="true" kind="lib" path="/org.javarosa.core/lib/cldc_crypto.zip"/>
+        <classpathentry kind="lib" path="tools/j2meunit-javarosa.jar"/>
         <classpathentry kind="con" path="J2MELIB"/>
         <classpathentry combineaccessrules="false" kind="src" path="/org.javarosa.core"/>
@@ -22 +23 @@
         <classpathentry combineaccessrules="false" kind="src" path="/org.javarosa.user"/>
         <classpathentry combineaccessrules="false" kind="src" path="/org.javarosa.polish.activity"/>
-        <classpathentry kind="lib" path="lib/j2meunit-javarosa.jar"/>
         <classpathentry combineaccessrules="false" kind="src" path="/org.javarosa.polish.chatterbox.extensions"/>
         <classpathentry combineaccessrules="false" kind="src" path="/org.javarosa.clforms"/>

branches/dev/j2merosa/org.javarosa.demo/build.xml

@@ -37 +37 @@
                                 usePolishGui="${javarosa.usepolishui}"
                                 workDir="${dir.work}"
-                                destDir="${dir.dist}"
-                                binaryLibraries="${dir.lib}">
+                                destDir="${dir.dist}">
+                                
+                                <libraries>
+                                        <library dir="${dir.lib}"/>
+                                        <library file="${dir.tools}/j2meunit-javarosa.jar" if="unittests" />
+                                </libraries>
 
                                 <!-- midlets definition -->
@@ -52 +56 @@
                                         <source dir="${basedir}/../org.javarosa.communication.ui/src/"/>
                                         <source dir="${basedir}/../org.javarosa.clforms/src/"/>
-                                        <source dir="${basedir}/../org.javarosa.clforms/test/"/>
                                         <source dir="${basedir}/../org.javarosa.core/src/"/>
-                                        <source dir="${basedir}/../org.javarosa.core/test/"/>
                                         <source dir="${basedir}/../org.javarosa.core.model/src/"/>
-                                        <source dir="${basedir}/../org.javarosa.core.model/test/"/>
-                                        <source dir="${basedir}/../org.javarosa.demo/test/"/>
                                         <source dir="${basedir}/../org.javarosa.formmanager/src/"/>
                                         <source dir="${basedir}/../org.javarosa.j2me/src/"/>
@@ -67 +67 @@
                                         <source dir="${basedir}/../org.javarosa.services.properties/src/"/>
                                         <source dir="${basedir}/../org.javarosa.user/src/"/>
-                                        <source dir="${basedir}/../org.javarosa.user/test/"/>
                                         <source dir="${basedir}/../org.javarosa.patient/src/"/>
-                                        <source dir="${basedir}/../org.javarosa.patient/test/"/>
                                         <source dir="${basedir}/../org.javarosa.xform/src/"/>
-                                        <source dir="${basedir}/../org.javarosa.xform/test/"/>
+                                        
                                         <!--source dir="${basedir}/../org.mesh4j.sync/src/"/-->
                                         <!--source dir="${basedir}/../org.mesh4j.sync.message/src/"/-->
                                         <!-- Add back in Mesh4X code once we're satisfied with using Java5's in Polish -->
+                                        
+                                        
+                                        <source dir="${basedir}/../org.javarosa.clforms/test/" if="unittests"/>
+                                        <source dir="${basedir}/../org.javarosa.core/test/" if="unittests"/>
+                                        <source dir="${basedir}/../org.javarosa.core.model/test/" if="unittests"/>
+                                        <source dir="${basedir}/../org.javarosa.demo/test/" if="unittests"/>
+                                        <source dir="${basedir}/../org.javarosa.user/test/" if="unittests"/>
+                                        <source dir="${basedir}/../org.javarosa.patient/test/" if="unittests"/>
+                                        <source dir="${basedir}/../org.javarosa.xform/test/" if="unittests"/>
                                         
                                         <!-- defunct
@@ -170 +177 @@
 
         <!-- Main Target: Builds project and runs j2mepolish Unit Tests on constructed jars -->
-        <target name="RunJ2MEUnitTests" depends="supressOutput, disableObfuscator, BuildPolish" description="Runs j2mepolish Unit Tests on constructed jars">
+        <target name="RunJ2MEUnitTests" depends="supressOutput, disableObfuscator, enableTesting, BuildClean" description="Runs j2mepolish Unit Tests on constructed jars">
                 <!--RunTestSuite suite="org.javarosa.formmanager.view.clforms.test.FormViewManagerTest"/-->
                 <!--RunTestSuite suite="org.javarosa.formmanager.view.clforms.test.CLFormsWidgetsTest"/-->
@@ -263 +270 @@
                 <property name="dir.work" value="build/test" />
         </target>
+        
+        <target name="enableTesting">
+                <property name="unittests" value="true"/>
+        </target>
 
         <target name="build-xpath-parser">