Skip to content

Commit

Permalink
Merge pull request #5 from sampottinger/master
Browse files Browse the repository at this point in the history
Update ant / javac language targets
  • Loading branch information
benfry committed Oct 8, 2019
2 parents 9d9c7cc + 54bdd37 commit dfb4542
Show file tree
Hide file tree
Showing 11 changed files with 29 additions and 29 deletions.
4 changes: 2 additions & 2 deletions app/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
<!-- env used to set classpath below -->
<property environment="env" />

<javac source="1.8"
target="1.8"
<javac source="11"
target="11"
destdir="bin"
excludes="**/tools/format/**"
encoding="UTF-8"
Expand Down
4 changes: 2 additions & 2 deletions build/jre/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
<!-- Where can I expect to find Java Mode JARs? -->
<property name="java.mode" value="../../java/mode/" />

<javac source="1.8"
target="1.8"
<javac source="11"
target="11"
srcdir="@{srcdir}"
destdir="@{destdir}"
debug="true"
Expand Down
4 changes: 2 additions & 2 deletions core/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@

<!-- link against apple.jar for the ThinkDifferent class -->
<mkdir dir="@{destdir}" />
<javac source="1.8"
target="1.8"
<javac source="11"
target="11"
encoding="UTF-8"
includeAntRuntime="false"
debug="true"
Expand Down
6 changes: 3 additions & 3 deletions core/methods/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
<target name="compile">

<mkdir dir="bin" />
<javac source="1.8"
target="1.8"
<javac source="11"
target="11"
srcdir="src"
destdir="bin"
debug="true"
includeantruntime="true"
nowarn="true">

</javac>
</target>

Expand Down
4 changes: 2 additions & 2 deletions java/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,8 @@
<!-- env used to set classpath below -->
<property environment="env" />

<javac source="1.8"
target="1.8"
<javac source="11"
target="11"
destdir="@{destdir}"
excludes="**/tools/format/**"
encoding="UTF-8"
Expand Down
4 changes: 2 additions & 2 deletions java/libraries/dxf/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
<fail unless="core-built" message="Please build the core library first and make sure it sits in ../../../core/library/core.jar" />

<mkdir dir="bin" />
<javac source="1.8"
target="1.8"
<javac source="11"
target="11"
srcdir="src" destdir="bin"
encoding="UTF-8"
includeAntRuntime="false"
Expand Down
16 changes: 8 additions & 8 deletions java/libraries/io/build.xml
Original file line number Diff line number Diff line change
@@ -1,31 +1,31 @@
<?xml version="1.0"?>
<project name="Processing Hardware I/O Library" default="build">

<target name="clean" description="Clean the build directories">
<delete dir="bin" />
<delete file="library/io.jar" />
</target>

<target name="compile" description="Compile sources">
<condition property="core-built">
<available file="../../../core/library/core.jar" />
</condition>
<fail unless="core-built" message="Please build the core library first and make sure it sits in ../../../core/library/core.jar" />

<mkdir dir="bin" />
<javac source="1.8"
target="1.8"
srcdir="src" destdir="bin"
<javac source="11"
target="11"
srcdir="src" destdir="bin"
encoding="UTF-8"
includeAntRuntime="false"
classpath="../../../core/library/core.jar"
nowarn="true"
compiler="org.eclipse.jdt.core.JDTCompilerAdapter">
<compilerclasspath path="../../mode/org.eclipse.jdt.core.jar;
<compilerclasspath path="../../mode/org.eclipse.jdt.core.jar;
../../mode/jdtCompilerAdapter.jar" />
</javac>
</target>

<target name="build" depends="compile" description="Build I/O library">
<jar basedir="bin" destfile="library/io.jar" />
</target>
Expand Down
4 changes: 2 additions & 2 deletions java/libraries/net/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
<fail unless="core-built" message="Please build the core library first and make sure it sits in ../../../core/library/core.jar" />

<mkdir dir="bin" />
<javac source="1.8"
target="1.8"
<javac source="11"
target="11"
srcdir="src" destdir="bin"
encoding="UTF-8"
includeAntRuntime="false"
Expand Down
4 changes: 2 additions & 2 deletions java/libraries/pdf/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
<fail unless="core-built" message="Please build the core library first and make sure it sits in ../../../core/library/core.jar" />

<mkdir dir="bin" />
<javac source="1.8"
target="1.8"
<javac source="11"
target="11"
srcdir="src" destdir="bin"
encoding="UTF-8"
includeAntRuntime="false"
Expand Down
4 changes: 2 additions & 2 deletions java/libraries/serial/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
<fail unless="core-built" message="Please build the core library first and make sure it sits in ../../../core/library/core.jar" />

<mkdir dir="bin" />
<javac source="1.8"
target="1.8"
<javac source="11"
target="11"
srcdir="src" destdir="bin"
encoding="UTF-8"
includeAntRuntime="false"
Expand Down
4 changes: 2 additions & 2 deletions java/libraries/svg/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
<fail unless="core-built" message="Please build the core library first and make sure it sits in ../../../core/library/core.jar" />

<mkdir dir="bin" />
<javac source="1.8"
target="1.8"
<javac source="11"
target="11"
srcdir="src" destdir="bin"
encoding="UTF-8"
includeAntRuntime="false"
Expand Down

0 comments on commit dfb4542

Please sign in to comment.