From 141b4d98d4fa814e1445bba51d78c4e6b7a5e4f2 Mon Sep 17 00:00:00 2001
From: benfry <fry@processing.org>
Date: Mon, 29 Mar 2010 14:43:35 +0000
Subject: [PATCH] starting revision 0183

---
 android/done.txt                 |   5 +
 android/todo.txt                 |   4 +-
 app/build.xml                    | 198 +++++++++++++++----------------
 app/src/processing/app/Base.java |   4 +-
 build/build.xml                  |  21 +++-
 core/done.txt                    |  11 ++
 core/todo.txt                    |  10 +-
 done.txt                         |  36 ++++++
 todo.txt                         |  35 +-----
 9 files changed, 174 insertions(+), 150 deletions(-)

diff --git a/android/done.txt b/android/done.txt
index fced1c46c..ac6872130 100644
--- a/android/done.txt
+++ b/android/done.txt
@@ -1,3 +1,8 @@
+0182 android (pre-release)
+X added skewX/Y implementation
+X   http://dev.processing.org/bugs/show_bug.cgi?id=1448
+
+
 0181 android (pre-release)
 X some changes to A3D
 
diff --git a/android/todo.txt b/android/todo.txt
index 30d892909..44b5b89cc 100644
--- a/android/todo.txt
+++ b/android/todo.txt
@@ -1,6 +1,4 @@
-0182 android
-X added skewX/Y implementation
-X   http://dev.processing.org/bugs/show_bug.cgi?id=1448
+0183 android
 
 
 _ for libraries that don't work with android, don't let them export
diff --git a/app/build.xml b/app/build.xml
index a85fc35d6..088a96097 100644
--- a/app/build.xml
+++ b/app/build.xml
@@ -1,119 +1,119 @@
 <?xml version="1.0"?>
 <project name="Processing PDE" default="build">
 
-	<property name="generated" value="${basedir}/generated/processing/app/antlr" />
-	<property name="grammars" value="${basedir}/grammars" />
-	<property name="antlrjar" value="${basedir}/lib/antlr.jar" />
+  <property name="generated" value="${basedir}/generated/processing/app/antlr" />
+  <property name="grammars" value="${basedir}/grammars" />
+  <property name="antlrjar" value="${basedir}/lib/antlr.jar" />
 
-	<classloader taskname="antlr">
-		<classpath path="lib/antlr.jar" />
-	</classloader>
+  <classloader taskname="antlr">
+    <classpath path="lib/antlr.jar" />
+  </classloader>
 
-	<target name="clean" description="Clean the build directories">
+  <target name="clean" description="Clean the build directories">
 
-		<!-- THIS SECTION SHOULD BE REMOVED AFTER A MONTH OR TWO -->
-		<!-- jdf sez: clean up after old layout of generated resources -->
-		<delete failonerror="false">
-			<fileset dir="${basedir}/src/antlr/java">
-				<include name="*.java" />
-				<include name="*.tokens" />
-				<include name="*.txt" />
-				<include name="*.g" />
-				<include name="*.smap" />
-			</fileset>
-		</delete>
-		<delete failonerror="false">
-			<!-- jdf sez: don't name anything FooRecognizer or FooLexer in this package -->
-			<fileset dir="${basedir}/src/processing/app/preproc">
-				<include name="*Recognizer.java" />
-				<include name="*Lexer.java" />
-				<include name="*.tokens" />
-				<include name="*.txt" />
-				<include name="*.g" />
-				<include name="*.smap" />
-			</fileset>
-		</delete>
-		<!-- END SECTION TO CLEAN UP AFTER OLD PROJECT LAYOUT -->
+    <!-- THIS SECTION SHOULD BE REMOVED AFTER A MONTH OR TWO -->
+    <!-- jdf sez: clean up after old layout of generated resources -->
+    <delete failonerror="false">
+      <fileset dir="${basedir}/src/antlr/java">
+	<include name="*.java" />
+	<include name="*.tokens" />
+	<include name="*.txt" />
+	<include name="*.g" />
+	<include name="*.smap" />
+      </fileset>
+    </delete>
+    <delete failonerror="false">
+      <!-- jdf sez: don't name anything FooRecognizer or FooLexer in this package -->
+      <fileset dir="${basedir}/src/processing/app/preproc">
+	<include name="*Recognizer.java" />
+	<include name="*Lexer.java" />
+	<include name="*.tokens" />
+	<include name="*.txt" />
+	<include name="*.g" />
+	<include name="*.smap" />
+      </fileset>
+    </delete>
+    <!-- END SECTION TO CLEAN UP AFTER OLD PROJECT LAYOUT -->
 
-		<delete dir="bin" />
-		<delete file="pde.jar" />
-		<delete>
-			<fileset dir="${generated}">
-				<include name="*.java" />
-				<include name="*.tokens" />
-				<include name="*.txt" />
-				<include name="*.g" />
-				<include name="*.smap" />
-			</fileset>
-		</delete>
-	</target>
+    <delete dir="bin" />
+    <delete file="pde.jar" />
+    <delete>
+      <fileset dir="${generated}">
+	<include name="*.java" />
+	<include name="*.tokens" />
+	<include name="*.txt" />
+	<include name="*.g" />
+	<include name="*.smap" />
+      </fileset>
+    </delete>
+  </target>
 
-	<target name="preproc" depends="clean" description="Compile ANTLR grammar">
-		<antlr target="${grammars}/java15.g" outputdirectory="${generated}">
-			<classpath path="${antlrjar}" />
-		</antlr>
-		<antlr target="${grammars}/pde.g" outputdirectory="${generated}" glib="${grammars}/java15.g">
-			<classpath path="${antlrjar}" />
-		</antlr>
-	</target>
+  <target name="preproc" depends="clean" description="Compile ANTLR grammar">
+    <antlr target="${grammars}/java15.g" outputdirectory="${generated}">
+      <classpath path="${antlrjar}" />
+    </antlr>
+    <antlr target="${grammars}/pde.g" outputdirectory="${generated}" glib="${grammars}/java15.g">
+      <classpath path="${antlrjar}" />
+    </antlr>
+  </target>
 
-	<target name="compile" depends="preproc" description="Compile sources">
-		<condition property="core-built">
-			<available file="../core/core.jar" />
-		</condition>
-		<fail unless="core-built" 
-			message="Please build the core library first and make sure it sits in ../core/core.jar" />
+  <target name="compile" depends="preproc" description="Compile sources">
+    <condition property="core-built">
+      <available file="../core/core.jar" />
+    </condition>
+    <fail unless="core-built" 
+	  message="Please build the core library first and make sure it sits in ../core/core.jar" />
 
-		<mkdir dir="bin" />
+    <mkdir dir="bin" />
 
-		<!-- ant seems to nuke ${java.home} for some reason, pointing at the JRE
+    <!-- ant seems to nuke ${java.home} for some reason, pointing at the JRE
 	 subfolder instead of the actual JDK found at JAVA_HOME. 
 	 To avoid this, we grab the actual JAVA_HOME environment variable 
 	 and use that to specify the location of tools.jar. -->
+    <!-- if someone is better with ant please help clean this up -->
 
-		<!-- if someone is better with ant please help clean this up -->
-		<property environment="env" />
-		<property name="java_home" value="${env.JAVA_HOME}" />
+    <property environment="env" />
+    <property name="java_home" value="${env.JAVA_HOME}" />
 
-		<condition property="linux">
-			<os family="unix" />
-		</condition>
-		<fail if="linux" unless="java_home" 
-			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." />
+    <condition property="linux">
+      <os family="unix" />
+    </condition>
+    <fail if="linux" unless="java_home" 
+	  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." />
 
-		<condition property="windows">
-			<os family="windows" />
-		</condition>
-		<fail if="windows" unless="java_home" 
-			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." />
+    <condition property="windows">
+      <os family="windows" />
+    </condition>
+    <fail if="windows" unless="java_home" 
+	  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." />
 
-		<!--
-    <dirname property="blah" file="${java.home}" />
-    <echo message="here! ${java.home}/lib/tools.jar or there: ${blah}" />
-    <echo message="override ${env.JAVA_HOME}/lib/tools.jar" />
-    <fail />
--->
-		<javac target="1.5" 
-				destdir="bin" 
-				excludes="**/tools/format/**" 
-				encoding="UTF-8" 
-				includeAntRuntime="false" 
-				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"
-				debug="on"
-				>
-			<src path="src" />
-			<src path="generated" />
-		</javac>
-		<javac target="1.5" 
-			srcdir="../android/tool/src" 
-			destdir="bin" 
-			encoding="UTF-8" 
-			includeAntRuntime="false" 
-			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" 
-		/>
-	</target>
+    <!--
+	<dirname property="blah" file="${java.home}" />
+	<echo message="here! ${java.home}/lib/tools.jar or there: ${blah}" />
+	<echo message="override ${env.JAVA_HOME}/lib/tools.jar" />
+	<fail />
+	-->
+    <javac target="1.5" 
+	   destdir="bin" 
+	   excludes="**/tools/format/**" 
+	   encoding="UTF-8" 
+	   includeAntRuntime="false" 
+	   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"
+	   debug="on"
+	   >
+      <src path="src" />
+      <src path="generated" />
+    </javac>
+    <javac target="1.5" 
+	   srcdir="../android/tool/src" 
+	   destdir="bin" 
+	   encoding="UTF-8" 
+	   includeAntRuntime="false" 
+	   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" 
+	   />
+  </target>
 
-	<target name="build" depends="compile" description="Build PDE">
-		<jar basedir="bin" destfile="pde.jar" />
-	</target>
+  <target name="build" depends="compile" description="Build PDE">
+    <jar basedir="bin" destfile="pde.jar" />
+  </target>
 </project>
diff --git a/app/src/processing/app/Base.java b/app/src/processing/app/Base.java
index 30c1e286d..fb82b1252 100644
--- a/app/src/processing/app/Base.java
+++ b/app/src/processing/app/Base.java
@@ -40,9 +40,9 @@ import processing.core.*;
  * files and images, etc) that comes from that.
  */
 public class Base {
-  static final int REVISION = 182;
+  static final int REVISION = 183;
   /** This might be replaced by main() if there's a lib/version.txt file. */
-  static public String VERSION_NAME = "0182";
+  static public String VERSION_NAME = "0183";
   /** Set true if this a proper release rather than a numbered revision. */
   static public boolean RELEASE = false;
 
diff --git a/build/build.xml b/build/build.xml
index 9db9feaaa..467ebcda6 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -80,7 +80,7 @@
   <!-- Basic Assembly  -->
   <!-- - - - - - - - - -->
   
-  <target name="assemble">
+  <target name="assemble" depends="version-clear, version-write">
     <fail unless="target.path" 
 	  message="Do not call assemble from the command line." />
     
@@ -118,10 +118,25 @@
     <unzip dest="${target.path}" src="shared/examples.zip" overwrite="false"/>
     <unzip dest="${target.path}" src="shared/reference.zip" overwrite="false"/>
     
-    <!-- Write the revision file! -->
-    <echo file="${target.path}/lib/version.txt" message="${version}" />
+    <!-- Write the revision file -->
+    <!-- is there a good way to do this? -->
+    <!--
+    <echo file="${target.path}/lib/version.txt" 
+	  message="${version}" 
+	  if="${version}" />
+    <delete file="${target.path}/lib/version.txt"
+	    unless="${version}" />
+    -->
   </target>
 
+  <target name="version-clear">
+    <delete file="${target.path}/lib/version.txt" />
+  </target> 
+
+  <target name="version-write" if="version">
+    <echo file="${target.path}/lib/version.txt" message="${version}"/>
+  </target> 
+
   
   <!-- - - - - - - - - -->
   <!-- Revision check  -->
diff --git a/core/done.txt b/core/done.txt
index 71dd5c92b..5e3f0818f 100644
--- a/core/done.txt
+++ b/core/done.txt
@@ -1,3 +1,14 @@
+0182 core (pre-release)
+X fix problem with textMode(SHAPE) when using createFont()
+X fix other problems with font use in PDF
+X remove debug message from PDF
+X add skewX/skewY
+o   do them as shearX/Y?
+X   http://dev.processing.org/bugs/show_bug.cgi?id=1448
+X PImage.copy() not including the bottom and rightmost pixels of srcImage
+X   http://dev.processing.org/bugs/show_bug.cgi?id=1174
+
+
 0181 core (pre-release)
 X no changes for 0181 
 
diff --git a/core/todo.txt b/core/todo.txt
index 60a9592c2..ac53de94b 100644
--- a/core/todo.txt
+++ b/core/todo.txt
@@ -1,12 +1,4 @@
-0182 core
-X fix problem with textMode(SHAPE) when using createFont()
-X fix other problems with font use in PDF
-X remove debug message from PDF
-X add skewX/skewY
-o   do them as shearX/Y?
-X   http://dev.processing.org/bugs/show_bug.cgi?id=1448
-X PImage.copy() not including the bottom and rightmost pixels of srcImage
-X   http://dev.processing.org/bugs/show_bug.cgi?id=1174
+0183 core
 
 
 stop() mess
diff --git a/done.txt b/done.txt
index 89ee93ffe..158ef2cc4 100644
--- a/done.txt
+++ b/done.txt
@@ -1,3 +1,39 @@
+0182 pde (pre-release)
+
+preprocessor fixes
+J Compile errors for greater than/less than with parentheses
+J   http://dev.processing.org/bugs/show_bug.cgi?id=1525
+
+autoformat fixes
+o install astyle formatter
+o   build on each platform, then "lipo -create astyle.* -output astyle"
+o break out as its own plugin
+J removes code with extra parens or braces
+J   (an extra } brace deleting everything after it)
+J   http://dev.processing.org/bugs/show_bug.cgi?id=109
+J progressively eats code w/ certain brace settings
+J   http://dev.processing.org/bugs/show_bug.cgi?id=235
+J Auto Format hangs when a non-terminated ' is included
+J   http://dev.processing.org/bugs/show_bug.cgi?id=236
+J hex colors don't get formatted
+J   http://dev.processing.org/bugs/show_bug.cgi?id=303
+J another code example that crashes
+J   http://dev.processing.org/bugs/show_bug.cgi?id=363
+J arrays are reformatted on each autoformat
+J   http://dev.processing.org/bugs/show_bug.cgi?id=259
+J Auto Format says "too many right parentheses" when last line is a comment
+J   http://dev.processing.org/bugs/show_bug.cgi?id=754
+J japanese characters in comments cause trouble with auto-format
+J   (this may have been fixed in recent releases, not checked)
+J   http://processing.org/discourse/yabb_beta/YaBB.cgi?board=SoftwareBugs;action=display;num=1153505384
+J "too many right parens" error when there are not
+J   http://dev.processing.org/bugs/show_bug.cgi?id=867
+J code without a new line at end crashes
+J   http://dev.processing.org/bugs/show_bug.cgi?id=880
+J autoformat screws up with color arrays
+J   http://dev.processing.org/bugs/show_bug.cgi?id=760
+
+
 0181 pde (pre-release)
 
 preprocessor
diff --git a/todo.txt b/todo.txt
index a56a36e41..b53169756 100644
--- a/todo.txt
+++ b/todo.txt
@@ -1,37 +1,4 @@
-0182 pde
-
-preprocessor fixes
-J Compile errors for greater than/less than with parentheses
-J   http://dev.processing.org/bugs/show_bug.cgi?id=1525
-
-autoformat fixes
-o install astyle formatter
-o   build on each platform, then "lipo -create astyle.* -output astyle"
-o break out as its own plugin
-J removes code with extra parens or braces
-J   (an extra } brace deleting everything after it)
-J   http://dev.processing.org/bugs/show_bug.cgi?id=109
-J progressively eats code w/ certain brace settings
-J   http://dev.processing.org/bugs/show_bug.cgi?id=235
-J Auto Format hangs when a non-terminated ' is included
-J   http://dev.processing.org/bugs/show_bug.cgi?id=236
-J hex colors don't get formatted
-J   http://dev.processing.org/bugs/show_bug.cgi?id=303
-J another code example that crashes
-J   http://dev.processing.org/bugs/show_bug.cgi?id=363
-J arrays are reformatted on each autoformat
-J   http://dev.processing.org/bugs/show_bug.cgi?id=259
-J Auto Format says "too many right parentheses" when last line is a comment
-J   http://dev.processing.org/bugs/show_bug.cgi?id=754
-J japanese characters in comments cause trouble with auto-format
-J   (this may have been fixed in recent releases, not checked)
-J   http://processing.org/discourse/yabb_beta/YaBB.cgi?board=SoftwareBugs;action=display;num=1153505384
-J "too many right parens" error when there are not
-J   http://dev.processing.org/bugs/show_bug.cgi?id=867
-J code without a new line at end crashes
-J   http://dev.processing.org/bugs/show_bug.cgi?id=880
-J autoformat screws up with color arrays
-J   http://dev.processing.org/bugs/show_bug.cgi?id=760
+0183 pde
 
 
 need examples