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

[ksmyth at redhat1.isis.vanderbilt.edu]

Author: ksmyth
Date: Tue Aug 21 10:38:32 2012
New Revision: 4097

Log:
Add source=1.5 to fix 'javac: target release 1.5 conflicts with default source release 1.7' error on javac1.7

Modified:
   UDM/trunk/judm/build.xml

Modified: UDM/trunk/judm/build.xml
==============================================================================
--- UDM/trunk/judm/build.xml	Mon Aug 20 14:04:22 2012	(r4096)
+++ UDM/trunk/judm/build.xml	Tue Aug 21 10:38:32 2012	(r4097)
@@ -284,13 +284,13 @@
 		<mkdir dir="${judm.classes.dir}" />
 
 		<!-- Compile util classes-->
-		<javac srcdir="${util.src.dir}" destdir="${judm.classes.dir}" deprecation="false" debug="true" classpathref="compile.classpath" target="1.5" />
+		<javac srcdir="${util.src.dir}" destdir="${judm.classes.dir}" deprecation="false" debug="true" classpathref="compile.classpath" target="1.5" source="1.5" />
 		
 		<!-- Compile SWIG generated UdmCint classes-->
-		<javac srcdir="${udmswig.src.dir}" destdir="${judm.classes.dir}" deprecation="false" debug="true" classpathref="compile.classpath" target="1.5" />
+		<javac srcdir="${udmswig.src.dir}" destdir="${judm.classes.dir}" deprecation="false" debug="true" classpathref="compile.classpath" target="1.5" source="1.5" />
 
 		<!-- Compile wrapper for the SWIG generated Java code classes (UdmCintLight)-->
-		<javac srcdir="${udmswiglight.src.dir}" destdir="${judm.classes.dir}" deprecation="false" debug="true" classpathref="compile.classpath" target="1.5" />
+		<javac srcdir="${udmswiglight.src.dir}" destdir="${judm.classes.dir}" deprecation="false" debug="true" classpathref="compile.classpath" target="1.5" source="1.5" />
 
 	</target>
 
@@ -304,10 +304,10 @@
 		<mkdir dir="${build.dir}/${dspackage}/classes/test" />
 
 		<!-- Compile the main classes -->
-		<javac srcdir="samples/${dspackage}/src/main" destdir="${build.dir}/${dspackage}/classes/main" deprecation="false" debug="true" classpathref="compile.classpath" target="1.5" />
+		<javac srcdir="samples/${dspackage}/src/main" destdir="${build.dir}/${dspackage}/classes/main" deprecation="false" debug="true" classpathref="compile.classpath" target="1.5" source="1.5" />
 
 		<!-- Compile the test classes -->
-		<javac srcdir="${srcdir}/samples/${dspackage}/src/test" destdir="${build.dir}/${dspackage}/classes/test" deprecation="false" debug="true" target="1.5" >
+		<javac srcdir="${srcdir}/samples/${dspackage}/src/test" destdir="${build.dir}/${dspackage}/classes/test" deprecation="false" debug="true" target="1.5" source="1.5" >
 			<classpath>
 				<path refid="compile.classpath" />
 				<pathelement location="${build.dir}/${dspackage}/classes/main" />