FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

change build scripts to use built-in ecj (removes jdk req) · codetorex/processing@9271c4e · GitHub

  1. codetorex
  2. processing

Repository navigation

Commit 9271c4e

Browse files
benfry
committed
change build scripts to use built-in ecj (removes jdk req)
1 parent 9057813 commit 9271c4e

12 files changed

Lines changed: 58 additions & 12 deletions

File tree

‎app/build.xml‎

100644100755
Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,12 @@
9292
encoding="UTF-8"
9393
includeAntRuntime="false"
9494
classpath="../core/library/core.jar; lib/ant.jar; lib/ant-launcher.jar; lib/antlr.jar; lib/apple.jar; lib/jdt-core.jar; lib/jna.jar; lib/org-netbeans-swing-outline.jar;lib/com.ibm.icu_4.4.2.v20110823.jar;lib/jdi.jar;lib/jdimodel.jar;lib/org.eclipse.osgi_3.8.1.v20120830-144521.jar"
95-
debug="on">
95+
debug="on"
96+
nowarn="true"
97+
compiler="org.eclipse.jdt.core.JDTCompilerAdapter">
9698
<src path="src" />
9799
<src path="generated" />
100+
<compilerclasspath path="../java/mode/ecj.jar" />
98101
</javac>
99102
</target>
100103

‎build/build.xml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0"?>
22
<project name="Processing" default="build">
3-
3+
44
<!-- Sets properties for macosx/windows/linux depending on current system -->
55
<condition property="platform" value="macosx">
66
<os family="mac" />
@@ -36,22 +36,26 @@
3636

3737
<!-- Make sure that we have a legitimate JDK... This was promoted
3838
from app/build.xml because we now need this on OS X as well. -->
39+
<!--
3940
<property name="java_home" value="${env.JAVA_HOME}" />
4041
<available file="${env.JAVA_HOME}/lib/tools.jar"
4142
property="java_tools_found" />
4243
4344
<fail if="windows" unless="java_tools_found"
4445
message="The JAVA_HOME variable must be set to the location of a full JDK. For instance, on Windows, this might be c:\jdk1.6.0_19." />
46+
-->
4547

4648
<!-- OS X gets a second chance that covers JDK 6,
4749
a necessity for building on OS X 10.6. -->
50+
<!--
4851
<available file="/System/Library/Frameworks/JavaVM.framework/Classes/classes.jar" property="java_tools_found" />
4952
5053
<fail if="macosx" unless="java_tools_found"
5154
message="To build on OS X, you must install both Apple's Java 6 and Oracle's JDK 7 (not just the plugin). Then add this line: ${line.separator}export JAVA_HOME=`/usr/libexec/java_home`${line.separator}to ~/.profile and open a new Terminal window." />
5255
5356
<fail if="linux" unless="java_tools_found"
5457
message="The JAVA_HOME variable must be set to the location of a full JDK. For instance, on Ubuntu Linux, this might be /usr/lib/jvm/java-6-sun." />
58+
-->
5559

5660
<!-- Figure out the platform-specific output directory for all this work. -->
5761
<condition property="target.path"

‎build/shared/tools/MovieMaker/build.xml‎

100644100755
Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,11 @@
2424
destdir="bin"
2525
encoding="UTF-8"
2626
includeAntRuntime="false"
27-
classpath="../../../../app/bin" />
27+
classpath="../../../../app/bin"
28+
nowarn="true"
29+
compiler="org.eclipse.jdt.core.JDTCompilerAdapter">
30+
<compilerclasspath path="../../../../java/mode/ecj.jar" />
31+
</javac>
2832
</target>
2933

3034
<target name="build" depends="compile" description="Build Movie Maker Tool">

‎core/build.xml‎

100644100755
Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,11 @@
1919
includeAntRuntime="false"
2020
debug="true"
2121
srcdir="src" destdir="bin"
22-
classpath="library/jogl-all.jar; library/gluegen-rt.jar" />
22+
classpath="library/jogl-all.jar; library/gluegen-rt.jar"
23+
nowarn="true"
24+
compiler="org.eclipse.jdt.core.JDTCompilerAdapter">
25+
<compilerclasspath path="../java/mode/ecj.jar" />
26+
</javac>
2327

2428
<!-- Copy the jnilib to the bin folder so it's included. -->
2529
<copy todir="bin/japplemenubar"

‎core/methods/build.xml‎

100644100755
Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,11 @@
77
<javac target="1.5"
88
srcdir="src" destdir="bin"
99
debug="true"
10-
includeantruntime="true" />
10+
includeantruntime="true"
11+
nowarn="true"
12+
compiler="org.eclipse.jdt.core.JDTCompilerAdapter">
13+
<compilerclasspath path="../../java/mode/ecj.jar" />
14+
</javac>
1115
</target>
1216

1317
<target name="task-lib" depends="compile">

‎experimental/build.xml‎

100644100755
Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,10 @@
4848
encoding="UTF-8"
4949
includeAntRuntime="false"
5050
classpath="../core/library/core.jar; ${env.JAVA_HOME}/lib/tools.jar; ../app/lib/ant.jar; ../app/lib/ant-launcher.jar; ../app/lib/antlr.jar; ../app/lib/apple.jar; ../app/lib/jdt-core.jar; ../app/lib/jna.jar; ../app/lib/org-netbeans-swing-outline.jar; ../app/pde.jar; mode/CompilationChecker.jar; mode/com.ibm.icu_4.4.2.v20110823.jar; mode/jdi.jar; mode/jdimodel.jar; mode/org.eclipse.core.contenttype_3.4.200.v20120523-2004.jar; mode/org.eclipse.core.jobs_3.5.300.v20120622-204750.jar; mode/org.eclipse.core.resources_3.8.1.v20120802-154922.jar; mode/org.eclipse.core.runtime_3.8.0.v20120521-2346.jar; mode/org.eclipse.equinox.common_3.6.100.v20120522-1841.jar; mode/org.eclipse.equinox.preferences_3.5.0.v20120522-1841.jar; mode/org.eclipse.jdt.core_3.8.2.v20120814-155456.jar; mode/org.eclipse.jdt.debug_3.7.101.v20120725-115645.jar; mode/org.eclipse.osgi_3.8.1.v20120830-144521.jar; mode/org.eclipse.text_3.5.200.v20120523-1310.jar"
51-
debug="on">
51+
debug="on"
52+
nowarn="true"
53+
compiler="org.eclipse.jdt.core.JDTCompilerAdapter">
54+
<compilerclasspath path="../java/mode/ecj.jar" />
5255
<src path="src" />
5356
</javac>
5457
</target>

‎java/libraries/dxf/build.xml‎

100644100755
Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,11 @@
1818
srcdir="src" destdir="bin"
1919
encoding="UTF-8"
2020
includeAntRuntime="false"
21-
classpath="../../../core/library/core.jar" />
21+
classpath="../../../core/library/core.jar"
22+
nowarn="true"
23+
compiler="org.eclipse.jdt.core.JDTCompilerAdapter">
24+
<compilerclasspath path="../../mode/ecj.jar" />
25+
</javac>
2226
</target>
2327

2428
<target name="build" depends="compile" description="Build DXF library">

‎java/libraries/lwjgl/build.xml‎

100644100755
Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,11 @@
1818
srcdir="src" destdir="bin"
1919
encoding="UTF-8"
2020
includeAntRuntime="false"
21-
classpath="../../../core/library/core.jar; library/lwjgl.jar; library/lwjgl_util.jar" />
21+
classpath="../../../core/library/core.jar; library/lwjgl.jar; library/lwjgl_util.jar"
22+
nowarn="true"
23+
compiler="org.eclipse.jdt.core.JDTCompilerAdapter">
24+
<compilerclasspath path="../../mode/ecj.jar" />
25+
</javac>
2226
</target>
2327

2428
<target name="build" depends="compile" description="Build OpenGL LWJGL library">

‎java/libraries/net/build.xml‎

100644100755
Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,11 @@
1818
srcdir="src" destdir="bin"
1919
encoding="UTF-8"
2020
includeAntRuntime="false"
21-
classpath="../../../core/library/core.jar" />
21+
classpath="../../../core/library/core.jar"
22+
nowarn="true"
23+
compiler="org.eclipse.jdt.core.JDTCompilerAdapter">
24+
<compilerclasspath path="../../mode/ecj.jar" />
25+
</javac>
2226
</target>
2327

2428
<target name="build" depends="compile" description="Build net library">

‎java/libraries/pdf/build.xml‎

100644100755
Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,11 @@
1818
srcdir="src" destdir="bin"
1919
encoding="UTF-8"
2020
includeAntRuntime="false"
21-
classpath="../../../core/library/core.jar; library/itext.jar" />
21+
classpath="../../../core/library/core.jar; library/itext.jar"
22+
nowarn="true"
23+
compiler="org.eclipse.jdt.core.JDTCompilerAdapter">
24+
<compilerclasspath path="../../mode/ecj.jar" />
25+
</javac>
2226
</target>
2327

2428
<target name="build" depends="compile" description="Build PDF library">

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL