Skip to content

Commit 33a5369

Browse files
benfrybenfry
committed
remove methods binary, clean up tasks, remove demo stuff, notes on recent fixes
1 parent 64d01b7 commit 33a5369

8 files changed

Lines changed: 37 additions & 17433 deletions

File tree

‎core/build.xml‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,16 @@
55
<delete dir="bin" />
66
<delete file="library/core.jar" />
77
</target>
8-
9-
<target name="compile" description="Compile">
8+
9+
<target name="methods-check">
10+
<available file="methods/methods.jar" property="methods.present" />
11+
</target>
12+
13+
<target name="methods-build" depends="methods-check" unless="methods.present">
14+
<subant buildpath="methods" target="dist" />
15+
</target>
16+
17+
<target name="compile" description="Compile" depends="methods-build">
1018
<taskdef name="methods"
1119
classname="PAppletMethods"
1220
classpath="methods/methods.jar" />

‎core/methods/build.xml‎

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,42 @@
1-
<project name="methods" default="task-lib">
1+
<project name="methods" default="dist">
22

33
<target name="compile">
44
<mkdir dir="bin" />
5-
<!-- <javac target="1.5" srcdir="src" destdir="bin" classpath="../ant/ant.jar" debug="true"/>-->
6-
<!-- <javac target="1.5" srcdir="src" destdir="bin" classpath="/usr/share/ant/ant.jar" debug="true"/>-->
7-
<javac target="1.5"
8-
srcdir="src" destdir="bin"
5+
<javac source="1.7"
6+
target="1.7"
7+
srcdir="src"
8+
destdir="bin"
99
debug="true"
1010
includeantruntime="true"
1111
nowarn="true"
1212
compiler="org.eclipse.jdt.core.JDTCompilerAdapter">
13-
<compilerclasspath path="../../java/mode/ecj.jar" />
13+
<compilerclasspath path="../../java/mode/org.eclipse.jdt.core.jar;
14+
../../java/mode/jdtCompilerAdapter.jar" />
1415
</javac>
1516
</target>
1617

17-
<target name="task-lib" depends="compile">
18+
<target name="dist" depends="compile">
1819
<jar basedir="bin" destfile="methods.jar" />
1920
</target>
2021

21-
<target name="demo">
22+
<target name="demo" depends="dist">
23+
<mkdir dir="demo">
24+
25+
<copy todir="demo">
26+
<fileset file="../src/processing/core/PApplet.java" />
27+
<fileset file="../src/processing/core/PGraphics.java" />
28+
<fileset file="../src/processing/core/PImage.java" />
29+
</copy>
30+
2231
<taskdef name="methods"
2332
classname="PAppletMethods"
2433
classpath="methods.jar" />
25-
<preproc dir="demo"/>
34+
<methods dir="demo"/>
2635
</target>
2736

2837
<target name="clean">
2938
<delete dir="bin" />
3039
<delete file="methods.jar" />
3140
</target>
41+
3242
</project>

0 commit comments

Comments
 (0)