[Mobies-commit] [commit] r4228 - UDM/trunk/judm

[endre at redhat3.isis.vanderbilt.edu]

Author: endre
Date: Sun Jan  5 23:41:52 2014
New Revision: 4228

Log:
Junit is not included anymore by default on MAC OS X 10.9.
provide a possibility to indicate the location of Junit through environment variables

Modified:
   UDM/trunk/judm/Makefile.OSX
   UDM/trunk/judm/build.xml

Modified: UDM/trunk/judm/Makefile.OSX
==============================================================================
--- UDM/trunk/judm/Makefile.OSX	Sun Jan  5 23:41:47 2014	(r4227)
+++ UDM/trunk/judm/Makefile.OSX	Sun Jan  5 23:41:52 2014	(r4228)
@@ -1,22 +1,10 @@
 include ../Makefile.OSX.incl
 
 all:	
-	rm -f build_judm.sh
-	echo "#!/bin/bash"> build_judm.sh
-	echo "source ../set-env.sh" >> build_judm.sh
-	echo $(ANT) >> build_judm.sh
-	chmod +x build_judm.sh
-	./build_judm.sh
+	DYLD_LIBRARY_PATH=$(DYLDLIBRARYPATH) JUNIT=$(JUNIT) JUNITDIR=$(JUNITDIR) $(ANT) 
 	
 test:
-	rm -f test_judm.sh
-	echo "#!/bin/bash"> test_judm.sh
-	echo "source ../set-env.sh" >> test_judm.sh
-	echo $(ANT) " test" >> test_judm.sh
-	chmod +x test_judm.sh
-	./test_judm.sh
+	DYLD_LIBRARY_PATH=$(DYLDLIBRARYPATH) JUNIT=$(JUNIT) JUNITDIR=$(JUNITDIR) JVMD32=$(JVMD32) $(ANT) test
 
 clean:
-	$(ANT) clean
-	rm -f build_judm.sh
-	rm -f test_judm.sh
+	DYLD_LIBRARY_PATH=$(DYLDLIBRARYPATH) $(ANT) clean

Modified: UDM/trunk/judm/build.xml
==============================================================================
--- UDM/trunk/judm/build.xml	Sun Jan  5 23:41:47 2014	(r4227)
+++ UDM/trunk/judm/build.xml	Sun Jan  5 23:41:52 2014	(r4228)
@@ -97,7 +97,10 @@
 		<echo> "Linux platform" </echo>
 	</target>
 	<target name="setenvmac" if="isMac">
-		<echo> "MAC OS X platform" </echo>
+		<echo> MAC OS X platform </echo>
+        <echo> Junit DIRectory: ${junit.dir} </echo>
+        <echo> Junit JAR :${junit.jar.file} </echo>
+        <echo> Junit APIDOC JAR: ${junit.apidoc.jar.file} </echo>
 	</target>
 
 	<!-- Get the environment variables of UDM from UNIX systems -->
@@ -110,9 +113,57 @@
 	<condition property="build.dir" value="build/build_linux"><isset property="isLinux"/></condition>
 	<condition property="build.dir" value="build/build_macosx"><isset property="isMac"/></condition>
 	<property name="srcdir" location="${basedir}" />
+    <!-- 
+     property junit.dir 
+     
+     by default it is /usr/share/java/
+     if /usr/share/java/junit does not exists than use environment variable JUNITDIR
+     
+     -->
+    
 	<condition property="junit.dir" value="/usr/share/java/">
 		<available file="/usr/share/java/junit.jar"/>
 	</condition>
+    
+    <condition property="junit.dir" value="${env.JUNITDIR}">
+        <and>
+            <not>
+                <available file="/usr/share/java/junit.jar"/>
+            </not>
+            <not>
+                <isset property="isWindows"/>
+            </not>
+        </and>
+	</condition>
+    <!--
+     property junit.jar.file
+     
+     JUNITDIR/JUNIT.jar if exists otherwise by default is junit.jar
+     
+    -->
+    
+    <condition property="junit.jar.file" value="${env.JUNIT}.jar">
+        <available file = "${env.JUNITDIR}/${env.JUNIT}.jar"/>
+    </condition>
+	
+    <condition property="junit.jar.file" value="junit.jar">
+        <not>
+            <available file = "${env.JUNITDIR}/${env.JUNIT}.jar"/>
+        </not>
+    </condition>
+    
+	<condition property="junit.apidoc.jar.file" value="${env.JUNIT}-javadoc.jar">
+        <available file = "${env.JUNITDIR}/${env.JUNIT}-javadoc.jar"/>
+    </condition>
+	
+    <condition property="junit.apidoc.jar.file" value="junit-javadoc.jar">
+        <not>
+            <available file = "${env.JUNITDIR}/${env.JUNIT}-javadoc.jar"/>
+        </not>
+    </condition>
+    
+    
+    
 	<condition property="jvm32d" value="${env.JVMD32}">
 		<and>
 			<available file="${env.JVMD32}"/>
@@ -128,8 +179,9 @@
 		<pathelement location="${judm.classes.dir}" />
 		<pathelement location="${judmhelper.classes.dir}" />
 		<fileset dir="${junit.dir}">
-			<include name="junit.jar" />
-		</fileset>
+            <include name ="${junit.jar.file}" />
+			<include name ="${junit.apidoc.jar.file}" />
+        </fileset>
 	</path>
 
 	<!-- Initialize directories and properties of the build -->