From a863dc99fc5e1967264c286f2adf2b27b50585ef Mon Sep 17 00:00:00 2001
From: Dan Buch <daniel.buch@gmail.com>
Date: Mon, 2 Jan 2012 01:11:50 -0500
Subject: [PATCH] Abandoning the architecture nonsense now that jars are not
 tracked.

---
 .gitignore               | 1 +
 bin/processing-commander | 3 +--
 build.xml                | 7 +++----
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index ec6e61a..3df404d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 *.class
+lib/*
 lib/preferences.txt
diff --git a/bin/processing-commander b/bin/processing-commander
index 78b1e46..89b50d8 100755
--- a/bin/processing-commander
+++ b/bin/processing-commander
@@ -2,7 +2,6 @@
 set -e
 
 TOP="$(dirname $(dirname $(readlink -f -- "$0")))"
-
 $TOP/bin/prochome-check >/dev/null
 
 if [ ! -f "$TOP/lib/preferences.txt" ]; then
@@ -10,7 +9,7 @@ if [ ! -f "$TOP/lib/preferences.txt" ]; then
 fi
 
 CP="$CLASSPATH"
-CP="$TOP/lib/$(uname -m)/mbh-processing-practice.jar:$CP"
+CP="$TOP/lib/mbh-processing-practice.jar:$CP"
 for procjar in "lib/core" "lib/pde" "java/lib/tools" "java/lib/rt"
 do
     CP="$PROCESSING_HOME/$procjar.jar:$CP"
diff --git a/build.xml b/build.xml
index a46bfcb..2f860ad 100644
--- a/build.xml
+++ b/build.xml
@@ -1,16 +1,15 @@
 <project name="practicing-processing" basedir="." default="jar">
   <property environment="env" />
 
-  <target name="prochome-check">
+  <target name="envcheck">
     <exec executable="./bin/prochome-check" failonerror="true" />
   </target>
 
   <target name="jar" depends="build" description="Jar Up All The Things">
-    <jar destfile="lib/${os.arch}/mbh-processing-practice.jar"
-      basedir="build" />
+    <jar destfile="lib/mbh-processing-practice.jar" basedir="build" />
   </target>
 
-  <target name="build" depends="prochome-check" description="Build All The Things">
+  <target name="build" depends="envcheck" description="Build All The Things">
     <javac srcdir="src" destdir="build" includeantruntime="false" debug="on">
       <classpath>
         <pathelement location="${env.PROCESSING_HOME}/lib/pde.jar" />