Build: Using JAVA_HOME to find jdk.

This commit is contained in:
Samuel Carlsson 2016-03-03 07:29:34 +01:00
parent 8e834fd096
commit d8acf8d45f
2 changed files with 6 additions and 9 deletions

View File

@ -1,3 +1,2 @@
path.variable.kotlin_bundled=/Applications/IntelliJ IDEA 15 CE.app/Contents/plugins/Kotlin/kotlinc path.variable.kotlin_bundled=/Applications/IntelliJ IDEA 15 CE.app/Contents/plugins/Kotlin/kotlinc
path.variable.maven_repository=/Users/vidstige/.m2/repository path.variable.maven_repository=/Users/vidstige/.m2/repository
jdk.home.1.6=/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Home

View File

@ -3,11 +3,9 @@
<property file="build.properties"/> <property file="build.properties"/>
<!-- Uncomment the following property if no tests compilation is needed --> <property environment="env"/>
<!-- <property name="jdk.home.1.6" value="${env.JAVA_HOME}"/>
<property name="skip.tests" value="true"/>
-->
<!-- Compiler options --> <!-- Compiler options -->
<property name="compiler.debug" value="on"/> <property name="compiler.debug" value="on"/>
@ -55,7 +53,7 @@
</patternset> </patternset>
<!-- JDK definitions --> <!-- JDK definitions -->
<property name="jdk.bin.1.6" value="${jdk.home.1.6}/bin"/> <property name="jdk.bin.1.6" value="${jdk.home.1.6}/bin"/>
<path id="jdk.classpath.1.6"> <path id="jdk.classpath.1.6">
<fileset dir="${jdk.home.1.6}"> <fileset dir="${jdk.home.1.6}">
@ -132,6 +130,6 @@
<target name="all" depends="build.modules, build.all.artifacts" description="build all"/> <target name="all" depends="build.modules, build.all.artifacts" description="build all"/>
<target name="test" depends="build.modules"> <target name="test" depends="build.modules">
</target> </target>
</project> </project>