DPML Notify

[mcconnell at BerliOS <mcconnell AT mail.berlios.de>]

Author: mcconnell
Date: 2007-08-28 19:39:09 +0200 (Tue, 28 Aug 2007)
New Revision: 2011

Modified:
   trunk/main/bootstrap
   trunk/main/bootstrap.xml
   trunk/main/metro/part/etc/bin/depot
Log:
ubuntu shell script updates

Modified: trunk/main/bootstrap
===================================================================
--- trunk/main/bootstrap        2007-08-28 17:36:21 UTC (rev 2010)
+++ trunk/main/bootstrap        2007-08-28 17:39:09 UTC (rev 2011)
@@ -8,7 +8,7 @@
 # $ bootstrap
 #
 
-build()
+executeAnt()
 {
     STATUS=99
     while [ "$STATUS" -eq 99 ] ; do
@@ -22,12 +22,6 @@
     fi
 }
 
-antlibCleanup()
-{
-    # need something in here to delete dpml content in .ant/lib
-    cd .
-}
-
 xmlSetup()
 {
     ant -f bootstrap.xml xml
@@ -35,50 +29,43 @@
 
 dpmlLangLibrary()
 {
-    cd lang/library
-    build -f bootstrap.xml clean install
+    cd depot/library
+    executeAnt -f bootstrap.xml clean install
     cd ../..
 }
 
 dpmlPart()
 {
-    cd lang/part
-    build -f bootstrap.xml clean install
+    cd metro/part
+    executeAnt -f bootstrap.xml clean install
     cd ../..
 }
 
-dpmlPartRebuild()
-{
-    cd lang/part
-    build clean install
-    cd ../..
-}
-
 transitMain()
 {
     cd transit/core
-    build -f bootstrap.xml clean install
+    executeAnt -f bootstrap.xml clean install
     cd ../..
 }
 
-transitTools()
+depotBuild()
 {
-    cd transit/tools
-    build -f bootstrap.xml clean install
+    cd depot/library
+    executeAnt -f bootstrap.xml clean install
     cd ../..
 }
 
-dpmlLibrary()
+depotTools()
 {
-    cd depot/library
-    build -f bootstrap.xml clean install
+    cd depot/tools
+    executeAnt -f bootstrap.xml clean install
     cd ../..
 }
 
-depotAntBuilder()
+utilCli()
 {
-    cd depot/tools
-    build -f bootstrap.xml clean install
+    cd util/cli
+    executeAnt clean install
     cd ../..
 }
 
@@ -89,13 +76,6 @@
     cd ..
 }
 
-utilCli()
-{
-    cd util/cli
-    build clean install
-    cd ../..
-}
-
 depotBuild()
 {
     cd depot/build
@@ -103,22 +83,12 @@
     cd ../..
 }
 
-depotCore()
-{
-    cd depot/core
-    build -f bootstrap.xml clean install
-    cd ../..
-}
-
-antlibCleanup
 transitMain
-dpmlLangLibrary
 dpmlPart
-transitTools
-dpmlLibrary
-depotAntBuilder
-externalModules
+dpmlLangLibrary
 utilCli
 depotBuild
-dpmlPartRebuild
-depotCore
+depotTools
+externalModules
+
+echo BOOTSTRAP SUCCESSFUL
\ No newline at end of file

Modified: trunk/main/bootstrap.xml
===================================================================
--- trunk/main/bootstrap.xml    2007-08-28 17:36:21 UTC (rev 2010)
+++ trunk/main/bootstrap.xml    2007-08-28 17:39:09 UTC (rev 2011)
@@ -200,12 +200,12 @@
 
   <target name="setup-path" depends="init">
     <path id="project.main.path">
-      <pathelement location="${ENV.ANT_HOME}/lib/ant.jar"/>
+      <pathelement location="${ant.home}/lib/ant.jar"/>
       <pathelement location="${target.classes.dir}"/>
     </path>
     <path id="project.test.path">
       <path refid="project.main.path"/>
-      <pathelement location="${ENV.ANT_HOME}/lib/ant-junit.jar"/>
+      <pathelement location="${ant.home}/lib/ant-junit.jar"/>
       <pathelement 
location="${dpml.local.cache}/junit/jars/${junit.filename}"/>
     </path>
   </target>

Modified: trunk/main/metro/part/etc/bin/depot
===================================================================
--- trunk/main/metro/part/etc/bin/depot 2007-08-28 17:36:21 UTC (rev 2010)
+++ trunk/main/metro/part/etc/bin/depot 2007-08-28 17:39:09 UTC (rev 2011)
@@ -63,7 +63,7 @@
 fi
 export DEPOT_ENDORSED_DIRECTORY
 
-DEPOT_BASE_JVM_OPTS="-Djava.ext.dirs=$DPML_SYSTEM/lib/ext:$JAVA_HOME/lib/ext 
-Djava.endorsed.dirs=$DPML_SYSTEM/lib/endorsed 
-Djava.system.class.loader=@DEPOT-CLASSLOADER-CLASS@ 
-Djava.rmi.server.randomIDs=true 
-Djava.rmi.server.RMIClassLoaderSpi=dpml.util.FederatingClassLoader 
-Djava.protocol.handler.pkgs=dpml.transit" -Dcom.sun.management.jmxremote 
-Ddpml.class.path=link:jar:dpml/metro/dpml-metro-part
+DEPOT_BASE_JVM_OPTS="-Djava.ext.dirs=$DPML_SYSTEM/lib/ext:$JAVA_HOME/lib/ext 
-Djava.endorsed.dirs=$DPML_SYSTEM/lib/endorsed 
-Djava.system.class.loader=@DEPOT-CLASSLOADER-CLASS@ 
-Djava.rmi.server.randomIDs=true 
-Djava.rmi.server.RMIClassLoaderSpi=dpml.util.FederatingClassLoader 
-Djava.protocol.handler.pkgs=dpml.transit -Dcom.sun.management.jmxremote 
-Ddpml.class.path=link:jar:dpml/metro/dpml-metro-part"
 
 
 if [ "$DEPOT_JVM_OPTS" = "" ] ; then