openmeetings-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From solo...@apache.org
Subject svn commit: r1603931 - /openmeetings/branches/3.0.x/build.xml
Date Thu, 19 Jun 2014 15:42:06 GMT
Author: solomax
Date: Thu Jun 19 15:42:06 2014
New Revision: 1603931

URL: http://svn.apache.org/r1603931
Log:
[OPENMEETINGS-1028] java version is updated to be java7

Modified:
    openmeetings/branches/3.0.x/build.xml

Modified: openmeetings/branches/3.0.x/build.xml
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/build.xml?rev=1603931&r1=1603930&r2=1603931&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/build.xml (original)
+++ openmeetings/branches/3.0.x/build.xml Thu Jun 19 15:42:06 2014
@@ -135,7 +135,7 @@
 		<echo>Ant version is ${ant.version}</echo> <!-- output Ant version -->
 	</target>
 
-	<target name="prepare.mkdir" depends="-java6or7.check">
+	<target name="prepare.mkdir" depends="-java7.check">
 		<mkdir dir="${red5.server.lib}" />
 		<mkdir dir="${red5.lib}/log" />
 		<mkdir dir="${red5.client.dir}/dist" />
@@ -1396,7 +1396,7 @@
 		<ivy:cleancache />
 	</target>
 
-	<target name="prepare-eclipse" if="java6.installed" description="Layout various files
necessary for development" depends="-java6or7.check">
+	<target name="prepare-eclipse" if="java7.installed" description="Layout various files
necessary for development" depends="-java7.check">
 		<antcall target="-retrieve-mainlibs" inheritAll="true" inheritRefs="true" />
 		<antcall target="-retrieve-om" inheritAll="true" inheritRefs="true" />
 		<antcall target="-retrieve-junit" inheritAll="true" inheritRefs="true" />
@@ -1409,21 +1409,20 @@
 		<antcall target="-process-db" inheritAll="true" inheritRefs="true" />
 	</target>
 	
-	<target name="-java6or7.check" unless="java6.installed" depends="info">
-		<condition property="java6.installed" value="true">
+	<target name="-java7.check" unless="java6.installed" depends="info">
+		<condition property="java7.installed" value="true">
 			<and>
 				<or>
-					<equals arg1="${java.specification.version}" arg2="1.6" />
 					<equals arg1="${java.specification.version}" arg2="1.7" />
 				</or>
 				<matches string="${java.vm.specification.vendor}" pattern=".*[sun,oracle].*" casesensitive="false"
singleline="true" />
 			</and>
 		</condition>
 		<echo message="Using Java ${java.version} specification: ${java.specification.version}"
/>
-		<fail message="Unsupported Java version - detected: ${java.version} Only Sun/Oracle
Java compiler version 6 or 7 supported.">
+		<fail message="Unsupported Java version - detected: ${java.version} Only Sun/Oracle
Java compiler version 7 supported.">
 			<condition>
 				<not>
-					<equals arg1="${java6.installed}" arg2="true" />
+					<equals arg1="${java7.installed}" arg2="true" />
 				</not>
 			</condition>
 		</fail>



Mime
View raw message