From 4975c8b693b2bcb8b9830ebc4a679bc820afd63a Mon Sep 17 00:00:00 2001
From: benfry <fry@processing.org>
Date: Sun, 7 Feb 2010 13:54:02 +0000
Subject: [PATCH] add encoding and disable ant libs on build scripts, working
 to fix up windows version

---
 build/build.xml  | 11 ++++++++---
 core/build.xml   |  5 ++++-
 dxf/build.xml    |  2 ++
 net/build.xml    |  2 ++
 opengl/build.xml |  2 ++
 pdf/build.xml    |  2 ++
 serial/build.xml |  5 ++++-
 video/build.xml  |  5 ++++-
 8 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/build/build.xml b/build/build.xml
index aeb285912..cc030d036 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -332,8 +332,12 @@
   <!-- Windows       -->
   <!-- - - - - - - - -->
   
-  <target name="windows-clean" depends="subprojects-clean" description="Clean windows version">
-    <delete dir="windows/work" />
+  <target name="windows-clean" depends="subprojects-clean"
+	  description="Clean windows version">
+    <delete dir="windows">
+      <include name="work" />
+      <include name="processing-*" />
+    </delete>
   </target>
   
   <target name="windows-checkos" unless="windows">
@@ -420,7 +424,8 @@
   <!-- Run It!       -->
   <!-- - - - - - - - -->
   
-  <target name="clean" description="Perform a spring cleaning" depends="linux-clean, windows-clean, macosx-clean, subprojects-clean">
+  <target name="clean" description="Perform a spring cleaning" 
+	  depends="linux-clean, windows-clean, macosx-clean, subprojects-clean">
   </target>
 
 </project>
diff --git a/core/build.xml b/core/build.xml
index 1e292bb26..facb7aa38 100644
--- a/core/build.xml
+++ b/core/build.xml
@@ -13,7 +13,10 @@
     <preproc dir="${basedir}/src/processing/core" />
 
     <mkdir dir="bin" />
-    <javac target="1.5" srcdir="src" destdir="bin"/>
+    <javac target="1.5" 
+	   encoding="UTF-8"
+	   includeAntRuntime="false"
+	   srcdir="src" destdir="bin"/>
   </target>		
 
   <target name="build" depends="compile" description="Build core library">
diff --git a/dxf/build.xml b/dxf/build.xml
index 3965fc98e..3de8ab6c7 100644
--- a/dxf/build.xml
+++ b/dxf/build.xml
@@ -15,6 +15,8 @@
     <mkdir dir="bin" />
     <javac target="1.5" 
 	   srcdir="src" destdir="bin" 
+	   encoding="UTF-8"
+	   includeAntRuntime="false"
 	   classpath="../core/core.jar" />
   </target>
   
diff --git a/net/build.xml b/net/build.xml
index d77b26cba..803dd8e4f 100644
--- a/net/build.xml
+++ b/net/build.xml
@@ -15,6 +15,8 @@
     <mkdir dir="bin" />
     <javac target="1.5" 
 	   srcdir="src" destdir="bin" 
+	   encoding="UTF-8"
+	   includeAntRuntime="false"
 	   classpath="../core/core.jar" />
   </target>
 
diff --git a/opengl/build.xml b/opengl/build.xml
index 0e636a5fb..910cd8b45 100644
--- a/opengl/build.xml
+++ b/opengl/build.xml
@@ -15,6 +15,8 @@
     <mkdir dir="bin" />
     <javac target="1.5" 
 	   srcdir="src" destdir="bin" 
+	   encoding="UTF-8"
+	   includeAntRuntime="false"
 	   classpath="../core/core.jar; library/jogl.jar" />
   </target>
 
diff --git a/pdf/build.xml b/pdf/build.xml
index b0a0d9a27..18067b121 100644
--- a/pdf/build.xml
+++ b/pdf/build.xml
@@ -15,6 +15,8 @@
     <mkdir dir="bin" />
     <javac target="1.5" 
 	   srcdir="src" destdir="bin" 
+	   encoding="UTF-8"
+	   includeAntRuntime="false"
 	   classpath="../core/core.jar; library/itext.jar" />
   </target>
   
diff --git a/serial/build.xml b/serial/build.xml
index 72fcb9caa..c893b1d9d 100644
--- a/serial/build.xml
+++ b/serial/build.xml
@@ -13,7 +13,10 @@
     <fail unless="core-built" message="Please build the core library first and make sure it sits in ../core/core.jar" />
 
     <mkdir dir="bin" />
-    <javac target="1.5" srcdir="src" destdir="bin" 
+    <javac target="1.5" 
+	   srcdir="src" destdir="bin" 
+	   encoding="UTF-8"
+	   includeAntRuntime="false"
 	   classpath="../core/core.jar; library/RXTXcomm.jar" />
   </target>
   
diff --git a/video/build.xml b/video/build.xml
index 143232232..5ff0693c9 100644
--- a/video/build.xml
+++ b/video/build.xml
@@ -13,7 +13,10 @@
     <fail unless="core-built" message="Please build the core library first and make sure it sits in ../core/core.jar" />
 
     <mkdir dir="bin" />
-    <javac target="1.5" srcdir="src" destdir="bin" 
+    <javac target="1.5" 
+	   srcdir="src" destdir="bin" 
+	   encoding="UTF-8"
+	   includeAntRuntime="false"
 	   classpath="../core/core.jar; QTJava.zip" />
   </target>