[Mobies-commit] [commit] r3674 - in UDM/trunk: InnoSetup judm

[ksmyth at redhat1.isis.vanderbilt.edu]

Author: ksmyth
Date: Thu Mar 24 14:10:14 2011
New Revision: 3674

Log:
Put the sources in jars, dont redistribute standalone sources or example javadoc

Modified:
   UDM/trunk/InnoSetup/udm_innosetupVS2008.iss
   UDM/trunk/judm/build.xml

Modified: UDM/trunk/InnoSetup/udm_innosetupVS2008.iss
==============================================================================
--- UDM/trunk/InnoSetup/udm_innosetupVS2008.iss	Thu Mar 24 14:09:02 2011	(r3673)
+++ UDM/trunk/InnoSetup/udm_innosetupVS2008.iss	Thu Mar 24 14:10:14 2011	(r3674)
@@ -191,9 +191,9 @@
 Source: {#UDMPATH}\samples\cross_links\cross_links.cpp; DestDir: {app}\samples\C++\cross_links; Components: C; Flags: ignoreversion
 Source: {#UDMPATH}\samples\cross_links\CL.xme; DestDir: {app}\samples\C++\cross_links; Components: C; Flags: ignoreversion
 ;Udm Samples folder/java
-Source: {#UDMPATH}\judm\build\build_win\GeneTF\*; DestDir: {app}\samples\java\GeneTF; Components: Java; Flags: recursesubdirs createallsubdirs ignoreversion
-Source: {#UDMPATH}\judm\build\build_win\GeneTRE\*; DestDir: {app}\samples\java\GeneTRE; Components: Java; Flags: recursesubdirs createallsubdirs ignoreversion
-Source: {#UDMPATH}\judm\build\build_win\SBML2Ex\*; DestDir: {app}\samples\java\SBML2Ex; Components: Java; Flags: recursesubdirs createallsubdirs ignoreversion
+Source: {#UDMPATH}\judm\build\build_win\GeneTF\*; DestDir: {app}\samples\java\GeneTF; Excludes: "\apidoc\*,\classes\*,"; Components: Java; Flags: recursesubdirs createallsubdirs ignoreversion
+Source: {#UDMPATH}\judm\build\build_win\GeneTRE\*; DestDir: {app}\samples\java\GeneTRE; Excludes: "\apidoc\*,\classes\*,"; Components: Java; Flags: recursesubdirs createallsubdirs ignoreversion
+Source: {#UDMPATH}\judm\build\build_win\SBML2Ex\*; DestDir: {app}\samples\java\SBML2Ex; Excludes: "\apidoc\*,\classes\*,"; Components: Java; Flags: recursesubdirs createallsubdirs ignoreversion
 ; Python samples
 Source: {#UDMPATH}\tests\test_UdmPython\UdmPythonTestMeta.xme; DestDir: {app}\samples\python\UdmPythonTest; Components: Python
 Source: {#UDMPATH}\tests\test_UdmPython\UdmPythonTestMeta.xml; DestDir: {app}\samples\python\UdmPythonTest; Components: Python

Modified: UDM/trunk/judm/build.xml
==============================================================================
--- UDM/trunk/judm/build.xml	Thu Mar 24 14:09:02 2011	(r3673)
+++ UDM/trunk/judm/build.xml	Thu Mar 24 14:10:14 2011	(r3674)
@@ -493,7 +493,7 @@
 	</target>
 
 	<!-- Update the jUdm build -->
-	<target name="judm-build" description="Update the jUdm build">
+	<target name="judm-build" description="Update the jUdm build" depends="init">
 		
 		<!-- Copy the jUnit to the build directory -->
 		<antcall target="judm-build-windows-junit" />
@@ -505,6 +505,9 @@
 		<!-- Create judm.jar in the build directory -->
 		<jar destfile="${judm.dir}/judm.jar" manifest="${srcdir}/etc/MANIFEST.MF">
 			<fileset dir="${judm.classes.dir}"/>
+			<fileset dir="${util.src.dir}" includes="**/*.java"/>
+			<fileset dir="${udmswig.src.dir}" includes="**/*.java"/>
+			<fileset dir="${udmswiglight.src.dir}" includes="**/*.java"/>
 		</jar>
 		
 		<!-- Copy the Uml.xsd to the build directory -->
@@ -524,6 +527,7 @@
 	<target name="ds-test-jar-windows" if="isWindows">
 		<jar destfile="${build.dir}/${dspackage}/${dspackage}-test.jar">
 			<fileset dir="${build.dir}/${dspackage}/classes/test" />
+			<fileset dir="${srcdir}/samples/${dspackage}/src/test" includes="**/*.java" />
 			<manifest>
 				<attribute name="Main-Class" value="edu.vanderbilt.isis.${dspackagelower}.test.AllTests" />
 				<attribute name="Class-Path" value="../judm/judm.jar ../judm/junit.jar ${dspackage}.jar" />
@@ -575,26 +579,13 @@
 		<!-- Create domain specific jar file -->
 		<jar destfile="${build.dir}/${dspackage}/${dspackage}.jar" manifest="${srcdir}/samples/${dspackage}/ETC/MANIFEST.MF">
 			<fileset dir="${build.dir}/${dspackage}/classes/main" />
+			<fileset dir="${srcdir}/samples/${dspackage}/src/main" includes="**/*.java" />
 		</jar>
 		
 		<!-- Create domain specific test jar file -->
 		<antcall target="ds-test-jar-windows"/>
 		<antcall target="ds-test-jar-linux"/>
 		
-		<!-- Copy the domain specific source  -->
-		<mkdir dir="${build.dir}/${dspackage}/src/main/edu" />
-		<copy todir="${build.dir}/${dspackage}/src/main/edu">
-			<fileset dir="samples/${dspackage}/src/main/edu"/>
-		</copy>
-		
-		<mkdir dir="${build.dir}/${dspackage}/src/test" />
-		<copy todir="${build.dir}/${dspackage}/src/test">
-			<fileset dir="${srcdir}/samples/${dspackage}/src/test">
-				<include name="**/*.java" />
-				<include name="**/*.html" />
-			</fileset>
-		</copy>
-		
 		<!-- Copy the appropriate batch file in the build  -->
 		<antcall target="set_up_batch_file_win"/>
 		<antcall target="set_up_batch_file_linux"/>
@@ -681,8 +672,8 @@
 
 		<!-- Generate a domain-specific API documentation --> 
 		<javadoc failonerror="yes" classpathref="compile.classpath" defaultexcludes="yes" useexternalfile="yes" verbose="no" destdir="${build.dir}/${dspackage}/apidoc" windowtitle="${dspackage} API">
-			<fileset dir="${build.dir}/${dspackage}/src/main" defaultexcludes="yes"/>
-			<fileset dir="${build.dir}/${dspackage}/src/test" defaultexcludes="yes"/>
+			<fileset dir="${srcdir}/samples/${dspackage}/src/main" defaultexcludes="yes"/>
+			<fileset dir="${srcdir}/samples/${dspackage}/src/test" defaultexcludes="yes"/>
 		    <doctitle><![CDATA[<h1>${dspackage} API</h1>]]></doctitle>
 		    <bottom><![CDATA[<i>Copyright &#169; Vanderbilt University, 2000-2005. All Rights Reserved.</i>]]></bottom>
 		</javadoc>