Skip to content

Commit 6ece11c

Browse files
benfrybenfry
committed
starting revision 0183
1 parent f300973 commit 6ece11c

9 files changed

Lines changed: 174 additions & 150 deletions

File tree

‎android/done.txt‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
0182 android (pre-release)
2+
X added skewX/Y implementation
3+
X http://dev.processing.org/bugs/show_bug.cgi?id=1448
4+
5+
16
0181 android (pre-release)
27
X some changes to A3D
38

‎android/todo.txt‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
0182 android
2-
X added skewX/Y implementation
3-
X http://dev.processing.org/bugs/show_bug.cgi?id=1448
1+
0183 android
42

53

64
_ for libraries that don't work with android, don't let them export

‎app/build.xml‎

Lines changed: 99 additions & 99 deletions
Original file line numberDiff line numberDiff line change
@@ -1,119 +1,119 @@
11
<?xml version="1.0"?>
22
<project name="Processing PDE" default="build">
33

4-
<property name="generated" value="${basedir}/generated/processing/app/antlr" />
5-
<property name="grammars" value="${basedir}/grammars" />
6-
<property name="antlrjar" value="${basedir}/lib/antlr.jar" />
4+
<property name="generated" value="${basedir}/generated/processing/app/antlr" />
5+
<property name="grammars" value="${basedir}/grammars" />
6+
<property name="antlrjar" value="${basedir}/lib/antlr.jar" />
77

8-
<classloader taskname="antlr">
9-
<classpath path="lib/antlr.jar" />
10-
</classloader>
8+
<classloader taskname="antlr">
9+
<classpath path="lib/antlr.jar" />
10+
</classloader>
1111

12-
<target name="clean" description="Clean the build directories">
12+
<target name="clean" description="Clean the build directories">
1313

14-
<!-- THIS SECTION SHOULD BE REMOVED AFTER A MONTH OR TWO -->
15-
<!-- jdf sez: clean up after old layout of generated resources -->
16-
<delete failonerror="false">
17-
<fileset dir="${basedir}/src/antlr/java">
18-
<include name="*.java" />
19-
<include name="*.tokens" />
20-
<include name="*.txt" />
21-
<include name="*.g" />
22-
<include name="*.smap" />
23-
</fileset>
24-
</delete>
25-
<delete failonerror="false">
26-
<!-- jdf sez: don't name anything FooRecognizer or FooLexer in this package -->
27-
<fileset dir="${basedir}/src/processing/app/preproc">
28-
<include name="*Recognizer.java" />
29-
<include name="*Lexer.java" />
30-
<include name="*.tokens" />
31-
<include name="*.txt" />
32-
<include name="*.g" />
33-
<include name="*.smap" />
34-
</fileset>
35-
</delete>
36-
<!-- END SECTION TO CLEAN UP AFTER OLD PROJECT LAYOUT -->
14+
<!-- THIS SECTION SHOULD BE REMOVED AFTER A MONTH OR TWO -->
15+
<!-- jdf sez: clean up after old layout of generated resources -->
16+
<delete failonerror="false">
17+
<fileset dir="${basedir}/src/antlr/java">
18+
<include name="*.java" />
19+
<include name="*.tokens" />
20+
<include name="*.txt" />
21+
<include name="*.g" />
22+
<include name="*.smap" />
23+
</fileset>
24+
</delete>
25+
<delete failonerror="false">
26+
<!-- jdf sez: don't name anything FooRecognizer or FooLexer in this package -->
27+
<fileset dir="${basedir}/src/processing/app/preproc">
28+
<include name="*Recognizer.java" />
29+
<include name="*Lexer.java" />
30+
<include name="*.tokens" />
31+
<include name="*.txt" />
32+
<include name="*.g" />
33+
<include name="*.smap" />
34+
</fileset>
35+
</delete>
36+
<!-- END SECTION TO CLEAN UP AFTER OLD PROJECT LAYOUT -->
3737

38-
<delete dir="bin" />
39-
<delete file="pde.jar" />
40-
<delete>
41-
<fileset dir="${generated}">
42-
<include name="*.java" />
43-
<include name="*.tokens" />
44-
<include name="*.txt" />
45-
<include name="*.g" />
46-
<include name="*.smap" />
47-
</fileset>
48-
</delete>
49-
</target>
38+
<delete dir="bin" />
39+
<delete file="pde.jar" />
40+
<delete>
41+
<fileset dir="${generated}">
42+
<include name="*.java" />
43+
<include name="*.tokens" />
44+
<include name="*.txt" />
45+
<include name="*.g" />
46+
<include name="*.smap" />
47+
</fileset>
48+
</delete>
49+
</target>
5050

51-
<target name="preproc" depends="clean" description="Compile ANTLR grammar">
52-
<antlr target="${grammars}/java15.g" outputdirectory="${generated}">
53-
<classpath path="${antlrjar}" />
54-
</antlr>
55-
<antlr target="${grammars}/pde.g" outputdirectory="${generated}" glib="${grammars}/java15.g">
56-
<classpath path="${antlrjar}" />
57-
</antlr>
58-
</target>
51+
<target name="preproc" depends="clean" description="Compile ANTLR grammar">
52+
<antlr target="${grammars}/java15.g" outputdirectory="${generated}">
53+
<classpath path="${antlrjar}" />
54+
</antlr>
55+
<antlr target="${grammars}/pde.g" outputdirectory="${generated}" glib="${grammars}/java15.g">
56+
<classpath path="${antlrjar}" />
57+
</antlr>
58+
</target>
5959

60-
<target name="compile" depends="preproc" description="Compile sources">
61-
<condition property="core-built">
62-
<available file="../core/core.jar" />
63-
</condition>
64-
<fail unless="core-built"
65-
message="Please build the core library first and make sure it sits in ../core/core.jar" />
60+
<target name="compile" depends="preproc" description="Compile sources">
61+
<condition property="core-built">
62+
<available file="../core/core.jar" />
63+
</condition>
64+
<fail unless="core-built"
65+
message="Please build the core library first and make sure it sits in ../core/core.jar" />
6666

67-
<mkdir dir="bin" />
67+
<mkdir dir="bin" />
6868

69-
<!-- ant seems to nuke ${java.home} for some reason, pointing at the JRE
69+
<!-- ant seems to nuke ${java.home} for some reason, pointing at the JRE
7070
subfolder instead of the actual JDK found at JAVA_HOME.
7171
To avoid this, we grab the actual JAVA_HOME environment variable
7272
and use that to specify the location of tools.jar. -->
73+
<!-- if someone is better with ant please help clean this up -->
7374

74-
<!-- if someone is better with ant please help clean this up -->
75-
<property environment="env" />
76-
<property name="java_home" value="${env.JAVA_HOME}" />
75+
<property environment="env" />
76+
<property name="java_home" value="${env.JAVA_HOME}" />
7777

78-
<condition property="linux">
79-
<os family="unix" />
80-
</condition>
81-
<fail if="linux" unless="java_home"
82-
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." />
78+
<condition property="linux">
79+
<os family="unix" />
80+
</condition>
81+
<fail if="linux" unless="java_home"
82+
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." />
8383

84-
<condition property="windows">
85-
<os family="windows" />
86-
</condition>
87-
<fail if="windows" unless="java_home"
88-
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_18." />
84+
<condition property="windows">
85+
<os family="windows" />
86+
</condition>
87+
<fail if="windows" unless="java_home"
88+
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_18." />
8989

90-
<!--
91-
<dirname property="blah" file="${java.home}" />
92-
<echo message="here! ${java.home}/lib/tools.jar or there: ${blah}" />
93-
<echo message="override ${env.JAVA_HOME}/lib/tools.jar" />
94-
<fail />
95-
-->
96-
<javac target="1.5"
97-
destdir="bin"
98-
excludes="**/tools/format/**"
99-
encoding="UTF-8"
100-
includeAntRuntime="false"
101-
classpath="../core/core.jar; ${env.JAVA_HOME}/lib/tools.jar; lib/ant.jar; lib/ant-launcher.jar; lib/antlr.jar; lib/apple.jar; lib/ecj.jar; lib/jna.jar"
102-
debug="on"
103-
>
104-
<src path="src" />
105-
<src path="generated" />
106-
</javac>
107-
<javac target="1.5"
108-
srcdir="../android/tool/src"
109-
destdir="bin"
110-
encoding="UTF-8"
111-
includeAntRuntime="false"
112-
classpath="../core/core.jar; ${env.JAVA_HOME}/lib/tools.jar; lib/ant.jar; lib/ant-launcher.jar; lib/antlr.jar; lib/apple.jar; lib/ecj.jar; lib/jna.jar"
113-
/>
114-
</target>
90+
<!--
91+
<dirname property="blah" file="${java.home}" />
92+
<echo message="here! ${java.home}/lib/tools.jar or there: ${blah}" />
93+
<echo message="override ${env.JAVA_HOME}/lib/tools.jar" />
94+
<fail />
95+
-->
96+
<javac target="1.5"
97+
destdir="bin"
98+
excludes="**/tools/format/**"
99+
encoding="UTF-8"
100+
includeAntRuntime="false"
101+
classpath="../core/core.jar; ${env.JAVA_HOME}/lib/tools.jar; lib/ant.jar; lib/ant-launcher.jar; lib/antlr.jar; lib/apple.jar; lib/ecj.jar; lib/jna.jar"
102+
debug="on"
103+
>
104+
<src path="src" />
105+
<src path="generated" />
106+
</javac>
107+
<javac target="1.5"
108+
srcdir="../android/tool/src"
109+
destdir="bin"
110+
encoding="UTF-8"
111+
includeAntRuntime="false"
112+
classpath="../core/core.jar; ${env.JAVA_HOME}/lib/tools.jar; lib/ant.jar; lib/ant-launcher.jar; lib/antlr.jar; lib/apple.jar; lib/ecj.jar; lib/jna.jar"
113+
/>
114+
</target>
115115

116-
<target name="build" depends="compile" description="Build PDE">
117-
<jar basedir="bin" destfile="pde.jar" />
118-
</target>
116+
<target name="build" depends="compile" description="Build PDE">
117+
<jar basedir="bin" destfile="pde.jar" />
118+
</target>
119119
</project>

‎app/src/processing/app/Base.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@
4040
* files and images, etc) that comes from that.
4141
*/
4242
public class Base {
43-
static final int REVISION = 182;
43+
static final int REVISION = 183;
4444
/** This might be replaced by main() if there's a lib/version.txt file. */
45-
static public String VERSION_NAME = "0182";
45+
static public String VERSION_NAME = "0183";
4646
/** Set true if this a proper release rather than a numbered revision. */
4747
static public boolean RELEASE = false;
4848

‎build/build.xml‎

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
<!-- Basic Assembly -->
8181
<!-- - - - - - - - - -->
8282

83-
<target name="assemble">
83+
<target name="assemble" depends="version-clear, version-write">
8484
<fail unless="target.path"
8585
message="Do not call assemble from the command line." />
8686

@@ -118,10 +118,25 @@
118118
<unzip dest="${target.path}" src="shared/examples.zip" overwrite="false"/>
119119
<unzip dest="${target.path}" src="shared/reference.zip" overwrite="false"/>
120120

121-
<!-- Write the revision file! -->
122-
<echo file="${target.path}/lib/version.txt" message="${version}" />
121+
<!-- Write the revision file -->
122+
<!-- is there a good way to do this? -->
123+
<!--
124+
<echo file="${target.path}/lib/version.txt"
125+
message="${version}"
126+
if="${version}" />
127+
<delete file="${target.path}/lib/version.txt"
128+
unless="${version}" />
129+
-->
123130
</target>
124131

132+
<target name="version-clear">
133+
<delete file="${target.path}/lib/version.txt" />
134+
</target>
135+
136+
<target name="version-write" if="version">
137+
<echo file="${target.path}/lib/version.txt" message="${version}"/>
138+
</target>
139+
125140

126141
<!-- - - - - - - - - -->
127142
<!-- Revision check -->

‎core/done.txt‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
0182 core (pre-release)
2+
X fix problem with textMode(SHAPE) when using createFont()
3+
X fix other problems with font use in PDF
4+
X remove debug message from PDF
5+
X add skewX/skewY
6+
o do them as shearX/Y?
7+
X http://dev.processing.org/bugs/show_bug.cgi?id=1448
8+
X PImage.copy() not including the bottom and rightmost pixels of srcImage
9+
X http://dev.processing.org/bugs/show_bug.cgi?id=1174
10+
11+
112
0181 core (pre-release)
213
X no changes for 0181
314

‎core/todo.txt‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,4 @@
1-
0182 core
2-
X fix problem with textMode(SHAPE) when using createFont()
3-
X fix other problems with font use in PDF
4-
X remove debug message from PDF
5-
X add skewX/skewY
6-
o do them as shearX/Y?
7-
X http://dev.processing.org/bugs/show_bug.cgi?id=1448
8-
X PImage.copy() not including the bottom and rightmost pixels of srcImage
9-
X http://dev.processing.org/bugs/show_bug.cgi?id=1174
1+
0183 core
102

113

124
stop() mess

‎done.txt‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,39 @@
1+
0182 pde (pre-release)
2+
3+
preprocessor fixes
4+
J Compile errors for greater than/less than with parentheses
5+
J http://dev.processing.org/bugs/show_bug.cgi?id=1525
6+
7+
autoformat fixes
8+
o install astyle formatter
9+
o build on each platform, then "lipo -create astyle.* -output astyle"
10+
o break out as its own plugin
11+
J removes code with extra parens or braces
12+
J (an extra } brace deleting everything after it)
13+
J http://dev.processing.org/bugs/show_bug.cgi?id=109
14+
J progressively eats code w/ certain brace settings
15+
J http://dev.processing.org/bugs/show_bug.cgi?id=235
16+
J Auto Format hangs when a non-terminated ' is included
17+
J http://dev.processing.org/bugs/show_bug.cgi?id=236
18+
J hex colors don't get formatted
19+
J http://dev.processing.org/bugs/show_bug.cgi?id=303
20+
J another code example that crashes
21+
J http://dev.processing.org/bugs/show_bug.cgi?id=363
22+
J arrays are reformatted on each autoformat
23+
J http://dev.processing.org/bugs/show_bug.cgi?id=259
24+
J Auto Format says "too many right parentheses" when last line is a comment
25+
J http://dev.processing.org/bugs/show_bug.cgi?id=754
26+
J japanese characters in comments cause trouble with auto-format
27+
J (this may have been fixed in recent releases, not checked)
28+
J http://processing.org/discourse/yabb_beta/YaBB.cgi?board=SoftwareBugs;action=display;num=1153505384
29+
J "too many right parens" error when there are not
30+
J http://dev.processing.org/bugs/show_bug.cgi?id=867
31+
J code without a new line at end crashes
32+
J http://dev.processing.org/bugs/show_bug.cgi?id=880
33+
J autoformat screws up with color arrays
34+
J http://dev.processing.org/bugs/show_bug.cgi?id=760
35+
36+
137
0181 pde (pre-release)
238

339
preprocessor

‎todo.txt‎

Lines changed: 1 addition & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,4 @@
1-
0182 pde
2-
3-
preprocessor fixes
4-
J Compile errors for greater than/less than with parentheses
5-
J http://dev.processing.org/bugs/show_bug.cgi?id=1525
6-
7-
autoformat fixes
8-
o install astyle formatter
9-
o build on each platform, then "lipo -create astyle.* -output astyle"
10-
o break out as its own plugin
11-
J removes code with extra parens or braces
12-
J (an extra } brace deleting everything after it)
13-
J http://dev.processing.org/bugs/show_bug.cgi?id=109
14-
J progressively eats code w/ certain brace settings
15-
J http://dev.processing.org/bugs/show_bug.cgi?id=235
16-
J Auto Format hangs when a non-terminated ' is included
17-
J http://dev.processing.org/bugs/show_bug.cgi?id=236
18-
J hex colors don't get formatted
19-
J http://dev.processing.org/bugs/show_bug.cgi?id=303
20-
J another code example that crashes
21-
J http://dev.processing.org/bugs/show_bug.cgi?id=363
22-
J arrays are reformatted on each autoformat
23-
J http://dev.processing.org/bugs/show_bug.cgi?id=259
24-
J Auto Format says "too many right parentheses" when last line is a comment
25-
J http://dev.processing.org/bugs/show_bug.cgi?id=754
26-
J japanese characters in comments cause trouble with auto-format
27-
J (this may have been fixed in recent releases, not checked)
28-
J http://processing.org/discourse/yabb_beta/YaBB.cgi?board=SoftwareBugs;action=display;num=1153505384
29-
J "too many right parens" error when there are not
30-
J http://dev.processing.org/bugs/show_bug.cgi?id=867
31-
J code without a new line at end crashes
32-
J http://dev.processing.org/bugs/show_bug.cgi?id=880
33-
J autoformat screws up with color arrays
34-
J http://dev.processing.org/bugs/show_bug.cgi?id=760
1+
0183 pde
352

363

374
need examples

0 commit comments

Comments
 (0)