Author: dthompson Date: 2008-03-29 16:17:11-0700 New Revision: 14260 Modified: branches/work_issue4625_dthompson/src/argouml-build/build.bat branches/work_issue4625_dthompson/src/argouml-build/build.xml branches/work_issue4625_dthompson/src/argouml-build/default.properties
Log: Updated build.xml files to make junit tests work. Junit tests now seem to compile and run ok, but there's an error while generating the reports. Modified: branches/work_issue4625_dthompson/src/argouml-build/build.bat Url: http://argouml.tigris.org/source/browse/argouml/branches/work_issue4625_dthompson/src/argouml-build/build.bat?view=diff&rev=14260&p1=branches/work_issue4625_dthompson/src/argouml-build/build.bat&p2=branches/work_issue4625_dthompson/src/argouml-build/build.bat&r1=14259&r2=14260 ============================================================================== --- branches/work_issue4625_dthompson/src/argouml-build/build.bat (original) +++ branches/work_issue4625_dthompson/src/argouml-build/build.bat 2008-03-29 16:17:11-0700 @@ -29,6 +29,7 @@ call "%ANT_HOME%\bin\ant" %1 %2 %3 %4 %5 %6 %7 %8 %9 +if ERRORLEVEL 1 goto endfail endlocal goto EOF @@ -37,5 +38,6 @@ echo. echo Build failed pause +endlocal :EOF \ No newline at end of file Modified: branches/work_issue4625_dthompson/src/argouml-build/build.xml Url: http://argouml.tigris.org/source/browse/argouml/branches/work_issue4625_dthompson/src/argouml-build/build.xml?view=diff&rev=14260&p1=branches/work_issue4625_dthompson/src/argouml-build/build.xml&p2=branches/work_issue4625_dthompson/src/argouml-build/build.xml&r1=14259&r2=14260 ============================================================================== --- branches/work_issue4625_dthompson/src/argouml-build/build.xml (original) +++ branches/work_issue4625_dthompson/src/argouml-build/build.xml 2008-03-29 16:17:11-0700 @@ -308,15 +308,15 @@ <!-- Run tests in all subdirectories. --> <!-- Order is important. --> <!-- =================================================================== --> - <target name="tests" + <target name="tests" depends="package" description="Run tests."> <!-- Build the subdirs in order. --> <!-- infra doesn't have tests. --> <!-- model doesn't have tests. --> - <ant dir="model-mdr" inheritAll="false" target="tests"/> + <ant dir="argouml-core-model-mdr" inheritAll="false" target="tests"/> <!-- <ant dir="model-euml" inheritAll="false" target="tests"/> --> - <ant dir="app" inheritAll="false" target="tests"/> + <ant dir="argouml-app" inheritAll="false" target="tests"/> <ant target="tests-reports"/> </target> @@ -382,9 +382,9 @@ use="${javadoc.use}" windowtitle="ArgoUML Javadoc for internal use"> <sourcepath> - <pathelement location="app/src"/> - <pathelement location="model/src"/> - <pathelement location="model-mdr/src"/> + <pathelement location="argouml-app/src"/> + <pathelement location="argouml-core-model/src"/> + <pathelement location="argouml-core-model-mdr/src"/> </sourcepath> <classpath> Modified: branches/work_issue4625_dthompson/src/argouml-build/default.properties Url: http://argouml.tigris.org/source/browse/argouml/branches/work_issue4625_dthompson/src/argouml-build/default.properties?view=diff&rev=14260&p1=branches/work_issue4625_dthompson/src/argouml-build/default.properties&p2=branches/work_issue4625_dthompson/src/argouml-build/default.properties&r1=14259&r2=14260 ============================================================================== --- branches/work_issue4625_dthompson/src/argouml-build/default.properties (original) +++ branches/work_issue4625_dthompson/src/argouml-build/default.properties 2008-03-29 16:17:11-0700 @@ -80,7 +80,7 @@ log4j.javadoc.packagelist=argouml-core-infra/lib/javadocs/log4j jmi.javadoc.link=http://java.sun.com/products/jmi/jmi-1_0-fr-doc/ -jmi.javadoc.packagelist=model-mdr/lib/javadocs/jmi +jmi.javadoc.packagelist=argouml-core-model-mdr/lib/javadocs/jmi gef.javadoc.link=http://gef.tigris.org/nonav/api/current gef.javadoc.packagelist=argouml-app/lib/javadocs/gef @@ -92,7 +92,7 @@ checkstyle.jar.path=${argo.tools.dir}/checkstyle-4.3/checkstyle-all-4.3.jar jdepend.jar.path=${argo.tools.dir}/jdepend-2.9/lib/jdepend-2.9.jar junit.jar.path=${argo.tools.dir}/junit-3.8.2/junit.jar -#junit.jar.path=${argo.tools.dir}/junit-4.2/junit.jar +junit.jar.path=${argo.tools.dir}/junit-4.2/junit.jar easymock.jar.path=${argo.tools.dir}/lib/easymock12.jar pmd.dir=${argo.tools.dir}/pmd-4.0 --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
