Skip to content

Commit 7871d36

Browse files
author
Jonathan Feinberg
committed
Remove a ton of cruft in favor of the much simpler techniques invented by github user kazimuth.
1 parent fcc923b commit 7871d36

File tree

13 files changed

+305
-1227
lines changed

13 files changed

+305
-1227
lines changed

.classpath

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
<classpath>
33
<classpathentry kind="src" path="runtime/src"/>
44
<classpathentry kind="src" path="testing/src"/>
5-
<classpathentry kind="src" path="runtime/generated"/>
65
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
76
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
87
<classpathentry kind="lib" path="buildtime/lib/jython/jython.jar" sourcepath="buildtime/lib/jython/jython-2.5.3-sources.jar"/>

.gitmodules

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
[submodule "externals/processing"]
22
path = externals/processing
33
url = [email protected]:processing/processing.git
4+
ignore = dirty
5+

build.xml

+1-26
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,10 @@
6565
</jar>
6666
</target>
6767

68-
<target name="build" depends="generate-driver,build-processing">
68+
<target name="build" depends="build-processing">
6969
<mkdir dir="bin"/>
7070
<javac destdir="bin" includeantruntime="false">
7171
<src path="runtime/src"/>
72-
<src path="runtime/generated"/>
7372
<classpath>
7473
<pathelement location="${jython}"/>
7574
<pathelement location="${corejar}"/>
@@ -109,27 +108,6 @@
109108
<ant dir="externals/processing/build" target="build"/>
110109
</target>
111110

112-
<target name="check-driver-required">
113-
<uptodate property="driver-is-generated"
114-
srcfile="buildtime/template/DriverImpl.java.cog"
115-
targetfile="runtime/generated/jycessing/DriverImpl.java"/>
116-
</target>
117-
<target name="generate-driver"
118-
depends="check-driver-required,build-processing"
119-
unless="driver-is-generated"
120-
description="Generate DriverImpl class">
121-
<java
122-
classpath="${jython}:${corejar}:${joglall}:${gluegenrt}"
123-
classname="org.python.util.jython"
124-
fork="true">
125-
<arg value="buildtime/py/cog.py"/>
126-
<arg value="-U"/>
127-
<arg value="-o"/>
128-
<arg value="runtime/generated/jycessing/DriverImpl.java"/>
129-
<arg value="buildtime/template/DriverImpl.java.cog"/>
130-
</java>
131-
</target>
132-
133111
<target name="clean">
134112
<ant dir="externals/processing/build" target="clean"/>
135113
<rm-rf target="bin"/>
@@ -140,9 +118,6 @@
140118
<delete>
141119
<fileset dir="buildtime/py" includes="*.class"/>
142120
</delete>
143-
<delete>
144-
<fileset dir="buildtime/lib/jython/Lib/cogapp" includes="*.class"/>
145-
</delete>
146121
<exec executable="find" failonerror="true">
147122
<arg line=". -name .DS_Store -depth -exec rm {} ;"/>
148123
</exec>

buildtime/lib/jython/Lib/cogapp/__init__.py

-7
This file was deleted.

0 commit comments

Comments
 (0)