Permalink
Browse files

Include java version in build script, so we build with java 6 by default

  • Loading branch information...
1 parent b448f89 commit 511827838301fa53c024a444838232f45753349f @jsilter jsilter committed Dec 10, 2012
Showing with 4 additions and 2 deletions.
  1. +3 −2 build.xml
  2. +1 −0 build_macros.xml
View
@@ -105,14 +105,15 @@
to include the main classes in the JAR and so it's easier to run
tests later. -->
<target name="compile" depends="init" description="Compile main source files to temp directory">
- <javac srcdir="${src.dir}" debug="on" destdir="${tmp.dir}" encoding="${java.encoding}">
+ <javac srcdir="${src.dir}" debug="on" destdir="${tmp.dir}" encoding="${java.encoding}"
+ target="${javac.target}" source="${javac.target}">
<classpath refid="@jars"/>
</javac>
</target>
<target name="compileTests" if="compile.tests" description="Compile test files to testtmp directory">
<javac srcdir="${testsrc.dir}" debug="on" destdir="${testtmp.dir}" includeantruntime="true"
- encoding="${java.encoding}">
+ target="${javac.target}" source="${javac.target}" encoding="${java.encoding}">
<classpath refid="test.classpath"/>
</javac>
</target>
View
@@ -18,6 +18,7 @@
<property name="java.encoding" value="UTF-8"/>
<!--Note: $$ translates to $, because $ is a special character-->
<property name="data-server-url" value="http://www.broadinstitute.org/igvdata/$$$$_dataServerRegistry.txt"/>
+ <property name="javac.target" value="1.6"/>
<macrodef name="write_version">
<attribute name="targetFile"/>

0 comments on commit 5118278

Please sign in to comment.