From ac227569fd5113d84ec8a003dc52e550cb20fb3f Mon Sep 17 00:00:00 2001
From: Francisco Ryan Tolmasky I <francisco@280north.com>
Date: Thu, 4 Sep 2008 04:53:55 -0700
Subject: [PATCH] Reorganized the Tools product and got rid of Jars.

Reviewd by me.
---
 Tools/Install/build.xml                            |  10 +++-------
 Tools/{Jars => Utilities}/ant-apache-bsf-1.7.0.jar | Bin
 Tools/{Jars => Utilities}/bsf.jar                  | Bin
 Tools/Utilities/build.xml                          |   6 +++++-
 Tools/{Jars => Utilities}/commons-logging-1.1.jar  | Bin
 Tools/{Jars => Utilities}/js.jar                   | Bin
 Tools/build.xml                                    |   4 ----
 common.xml                                         |  10 ++++------
 8 files changed, 12 insertions(+), 18 deletions(-)
 rename Tools/{Jars => Utilities}/ant-apache-bsf-1.7.0.jar (100%)
 rename Tools/{Jars => Utilities}/bsf.jar (100%)
 rename Tools/{Jars => Utilities}/commons-logging-1.1.jar (100%)
 rename Tools/{Jars => Utilities}/js.jar (100%)

diff --git a/Tools/Install/build.xml b/Tools/Install/build.xml
index d4dc9ad45..64ed04831 100644
--- a/Tools/Install/build.xml
+++ b/Tools/Install/build.xml
@@ -24,14 +24,10 @@
         
         <antcall target = "prepare-release" />
     
-        <copy file = "${Build.Products}/install-tools" tofile = "${Build.Cappuccino.Tools.Objects}/install-tools" />
+        <copy file = "${Build.Products}/install-tools" tofile = "${Build.Cappuccino.Tools}/install-tools" />
         
-        <chmod file = "${Build.Cappuccino.Tools.Objects}/install-tools" perm = "+x" />
-        
-        <copy todir = "${Build.Cappuccino.Tools.Objects}/Jars">
-            <fileset dir = "${basedir}/../Jars" />
-        </copy>
-    
+        <chmod file = "${Build.Cappuccino.Tools}/install-tools" perm = "+x" />
+            
     </target>
     
     
diff --git a/Tools/Jars/ant-apache-bsf-1.7.0.jar b/Tools/Utilities/ant-apache-bsf-1.7.0.jar
similarity index 100%
rename from Tools/Jars/ant-apache-bsf-1.7.0.jar
rename to Tools/Utilities/ant-apache-bsf-1.7.0.jar
diff --git a/Tools/Jars/bsf.jar b/Tools/Utilities/bsf.jar
similarity index 100%
rename from Tools/Jars/bsf.jar
rename to Tools/Utilities/bsf.jar
diff --git a/Tools/Utilities/build.xml b/Tools/Utilities/build.xml
index 5e790434e..ee2864b37 100644
--- a/Tools/Utilities/build.xml
+++ b/Tools/Utilities/build.xml
@@ -13,8 +13,12 @@
     
         <antcall target = "prepare-release"/>
         
-        <copy file = "${basedir}/cat" todir = "${Build.Cappuccino.Tools.Lib}" />
+        <copy file = "${basedir}/ant-apache-bsf-1.7.0.jar" todir = "${Build.Cappuccino.Tools.Lib}" />
+        <copy file = "${basedir}/bsf.jar" todir = "${Build.Cappuccino.Tools.Lib}" />
+        <copy file = "${basedir}/commons-logging-1.1.jar" todir = "${Build.Cappuccino.Tools.Lib}" />
+        <copy file = "${basedir}/js.jar" todir = "${Build.Cappuccino.Tools.Lib}" />
         
+        <copy file = "${basedir}/cat" todir = "${Build.Cappuccino.Tools.Lib}" />
         <chmod file = "${Build.Cappuccino.Tools.Lib}/cat" perm = "+x" />
         
     </target>
diff --git a/Tools/Jars/commons-logging-1.1.jar b/Tools/Utilities/commons-logging-1.1.jar
similarity index 100%
rename from Tools/Jars/commons-logging-1.1.jar
rename to Tools/Utilities/commons-logging-1.1.jar
diff --git a/Tools/Jars/js.jar b/Tools/Utilities/js.jar
similarity index 100%
rename from Tools/Jars/js.jar
rename to Tools/Utilities/js.jar
diff --git a/Tools/build.xml b/Tools/build.xml
index a363ec65b..1ee910bd1 100644
--- a/Tools/build.xml
+++ b/Tools/build.xml
@@ -33,10 +33,6 @@
     
         <antcall target = "prepare-release"/>
         
-        <copy todir = "${Build.Cappuccino.Tools.Lib}">
-            <fileset dir = "Jars"/>
-        </copy>
-        
         <iterate target = "release" >
             <files>
                 <filelist refid = "Projects" />
diff --git a/common.xml b/common.xml
index a6c340149..e28c94b79 100644
--- a/common.xml
+++ b/common.xml
@@ -11,15 +11,14 @@
     <property name = "Build.Cappuccino.Starter.Frameworks" location = "${Build.Cappuccino.Starter}/Frameworks" />
     
     <property name = "Build.Cappuccino.Tools" location = "${Build}/Cappuccino/Tools" />
-    <property name = "Build.Cappuccino.Tools.Objects" location = "${Build.Cappuccino.Tools}/Objects" />
     <property name = "Build.Cappuccino.Tools.Frameworks" location = "${Build.Cappuccino.Tools}/Frameworks" />
     
     
-    <property name = "Build.Cappuccino.Tools.Objj" location = "${Build.Cappuccino.Tools.Objects}/objj" />
+    <property name = "Build.Cappuccino.Tools.Objj" location = "${Build.Cappuccino.Tools}/objj" />
     
-    <property name = "Build.Cappuccino.Tools.Bin" location = "${Build.Cappuccino.Tools.Objects}/objj/bin" />
-    <property name = "Build.Cappuccino.Tools.Lib" location = "${Build.Cappuccino.Tools.Objects}/objj/lib" />
-    <property name = "Build.Cappuccino.Tools.Lib.Frameworks" location = "${Build.Cappuccino.Tools.Objects}/objj/lib/Frameworks" />
+    <property name = "Build.Cappuccino.Tools.Bin" location = "${Build.Cappuccino.Tools}/objj/bin" />
+    <property name = "Build.Cappuccino.Tools.Lib" location = "${Build.Cappuccino.Tools}/objj/lib" />
+    <property name = "Build.Cappuccino.Tools.Lib.Frameworks" location = "${Build.Cappuccino.Tools}/objj/lib/Frameworks" />
     
     <property environment = "environment" />
     <property name = "environment.OBJJ_HOME" value = "/usr/local/share/objj" />
@@ -34,7 +33,6 @@
         <mkdir dir = "${Build.Cappuccino.Starter.Frameworks}" />
         
         <mkdir dir = "${Build.Cappuccino.Tools}" />
-        <mkdir dir = "${Build.Cappuccino.Tools.Objects}" />
         <mkdir dir = "${Build.Cappuccino.Tools.Frameworks}" />
         
         <mkdir dir = "${Build.Cappuccino.Tools.Objj}" />