Skip to content
Browse files

Revert "cross compile with jdk7 compiler"

This reverts commit d23c317.
  • Loading branch information...
1 parent 7c18d3d commit 3cb447d2b6c6207a524c38cbfcd3ae01e2d1b820 @akkumar akkumar committed
Showing with 4 additions and 24 deletions.
  1. +1 −9 build.properties
  2. +3 −15 build.xml
View
10 build.properties
@@ -1,11 +1,4 @@
-## Main source
-
-
-# Directory that points to the JRE folder to bootstrap.
-# See: http://blogs.oracle.com/darcy/entry/bootclasspath_older_source for more details
-# Eg: /usr/local/jdk1.6.0_30/jre, say , that contains the rt.jar for the distribution.
-java5.home=${java.home}
-
+## Main source
src.dir=src
java.dir=src/java
python.dir=clients/python
@@ -42,4 +35,3 @@ tomcat.context=/voldemort
## Release
curr.release=0.90.1
-
View
18 build.xml
@@ -14,13 +14,6 @@
</fileset>
<pathelement path="${classes.dir}" />
</path>
-
- <path id="bootref-classpath">
- <fileset dir="${java5.home}/lib">
- <include name="rt.jar" />
- </fileset>
- </path>
-
<!-- set the build number based on environment variable, otherwise blank -->
<property environment="env" description="System environment variables (including those set by Hudson)"/>
@@ -86,12 +79,9 @@
<!-- place to put log4j.properties -->
<replace-dir dir="${resources.dir}"/>
<copy file="${java.dir}/log4j.properties" todir="${resources.dir}"/>
- <echo message="JAVA_HOME = ${java5.home}" />
- <echo message="JAVA5_HOME = ${java5.home}" />
- <javac destdir="${classes.dir}" source="1.5" target="1.5" debug="true" deprecation="false" failonerror="true" includeantruntime="false">
+ <javac destdir="${classes.dir}" target="1.5" debug="true" deprecation="false" failonerror="true" includeantruntime="false">
<src path="${java.dir}" />
<classpath refid="main-classpath" />
- <bootclasspath refid="bootref-classpath" />
</javac>
</target>
@@ -109,12 +99,11 @@
<exclude name="**/*.html" />
</fileset>
</copy>
- <javac destdir="${testclasses.dir}" source="1.5" target="1.5" debug="true" deprecation="false" failonerror="true" includeantruntime="false">
+ <javac destdir="${testclasses.dir}" target="1.5" debug="true" deprecation="false" failonerror="true" includeantruntime="false">
<src path="${unittestsrc.dir}" />
<src path="${inttestsrc.dir}" />
<src path="${commontestsrc.dir}" />
<classpath refid="main-classpath" />
- <bootclasspath refid="bootref-classpath" />
</javac>
</target>
@@ -190,12 +179,11 @@
<target name="contrib-build" depends="build, buildtest" description="Compile contrib packages (java and test) ">
<replace-dir dir="${contrib.classes.dir}" />
- <javac destdir="${contrib.classes.dir}" source="1.5" target="1.5" debug="true" deprecation="false" failonerror="true" includeantruntime="false">
+ <javac destdir="${contrib.classes.dir}" target="1.5" debug="true" deprecation="false" failonerror="true" includeantruntime="false">
<src path="${contrib.root.dir}" />
<src path="${contrib.root.dir}" />
<classpath refid="main-classpath" />
<classpath refid="contrib-classpath" />
- <bootclasspath refid="bootref-classpath" />
</javac>
<copy todir="${contrib.classes.dir}">
<fileset dir="${contrib.root.dir}/ec2-testing/resources" />

0 comments on commit 3cb447d

Please sign in to comment.
Something went wrong with that request. Please try again.