Changeset 3237

Timestamp:

03/14/11 10:19:36

Author:

douglm

Message:

bwtools now detached

Files:

• trunk (modified) (1 prop)
• trunk/build.xml (modified) (7 diffs)
• trunk/build/buildfilters.xml (modified) (1 diff)
• trunk/build/quickstart/linux/bw (modified) (4 diffs)
• trunk/config/bwbuild/jboss-postgresql/cal.properties (modified) (1 diff)

trunk/build.xml

@@ -25 +25 @@
-  <property name="org.bedework.project.access"
-            location="${org.bedework.projects}/access" />
-
-  <property name="org.bedework.project.bwtools"
-            location="${org.bedework.projects}/bwtools" />
-
-  <property name="org.bedework.project.caldav"
@@ -193 +190 @@
-                                build.calendarapi,
-                                build.caldavimpl,
-bwtools,build.
+
-                                build.dumprestore"
-          description="builds the project">
-    <mkdir dir="${dist.home}/tools" />
-    <copy toDir="${dist.home}/tools" >
-      <fileset dir="${org.bedework.project.bwtools}/dist" includes="*.jar" />
-      <fileset dir="${org.bedework.project.bwtools}/lib" includes="*.jar" />
-    </copy>
-  </target>
-
@@ -216 +208 @@
-                                clean.webdav,clean.caldav,
-                                clean.caldavimpl,
-bwtools,clean.
+
-                                clean.dumprestore"
-          description="Remove all generated files.">
@@ -228 +220 @@
-                                           clean.webdav,clean.caldav,
-                                           clean.caldavimpl,
-bwtools,clean.
+
-                                               clean.dumprestore"
-          description="partial clean up for quickstart.">
@@ -356 +348 @@
-    </ant>
-
-    <ant antfile="${org.bedework.project.bwtools}/build.xml" inheritall="false"
-         target="javadoc" >
-      <property name="destdir"
-                location="${org.bedework.projectdocs.home}/bwtools/api" />
-    </ant>
-
-    <ant antfile="${org.bedework.project.indexer}/build.xml" inheritall="false"
-         target="javadoc" >
@@ -399 +385 @@
-  <target name="clean.build.access" depends="clean.access,build.access"
-          description="builds the access project"/>
-
-  <!-- .................................................................
-                          bwtools
-       .................................................................. -->
-  <target name="build.bwtools" depends="init"
-          description="builds the bwtools project">
-    <ant antfile="${org.bedework.project.bwtools}/build.xml" inheritall="false"
-           target="build-all"  >
-      <property name="org.bedework.libcache.dir"
-                location="${org.bedework.project.bedework}/libcache"/>
-    </ant>
-  </target>
-
-  <target name="clean.bwtools" depends="init"
-          description="clean the bwtools project">
-    <ant antfile="${org.bedework.project.bwtools}/build.xml" inheritall="false"
-           target="deep-clean" />
-  </target>
-
-  <target name="clean.build.bwtools" depends="clean.bwtools,build.bwtools"
-          description="builds the bwtools project"/>
-
-  <!-- .................................................................
@@ -620 +585 @@
-      <property name="build.jar.file" location="${org.bedework.build.jar}" />
-    </ant>
-  </target>
-
-  <!-- =================================================================
-       Run the cmdline utility
-       ================================================================= -->
-
-  <target name="cmdutil" depends="init"
-          description="run the cmdline utility">
-    <ant antfile="${org.bedework.project.bwtools}/build.xml" inheritall="false"
-         target="cmdutil" />
-  </target>
-

trunk/build/buildfilters.xml

@@ -113 +113 @@
-    <filter token="SCHEMA-DELIMITER"
-            value="${propval.app.schema.delimiter}" />
-
-      <filter token="CALDAVTEST-CLASS"
-              value="org.bedework.caldav.test.TestCalDav"/>
-
-      <filter token="DUMP-CLASS"
-              value="org.bedework.dumprestore.dump.Dump"/>
-      <filter token="RESTORE-CLASS"
-              value="org.bedework.dumprestore.restore.Restore"/>
-  </filterset>
-

trunk/build/quickstart/linux/bw

@@ -70 +70 @@
-  echo ""
-  echo "   PROJECT optionally defines the package to build and is none or more of"
+  echo "     -bwtools     Target is for the Bedework tools build"
-  echo "     -bwxml       Target is for the Bedework XML schemas build"
-  echo "     -caldavTest  Target is for the CalDAV Test build"
-  echo "     -carddav     Target is for the CardDAV build"
+  echo "     -client      Target is for the bedework client application build"
-  echo "     -exsynch     Target is for the Exchange synch build"
-  echo "     -client      Target is for the bedework client application build"
-  echo "     -monitor     Target is for the bedework monitor application"
-  echo "     -naming      Target is for the abstract naming api"
@@ -266 +267 @@
-bedework=
-bwxml=
+bwtools=
-carddav=
+caldav=
-caldavTest=
-caldav=
-client=
-exsynch=
@@ -376 +378 @@
-      ;;
-# ------------------------Projects
+    -bwtools)
+      bwtools="yes"
+      pkgdefault=
+      shift
+      ;;
-    -bwxml)
-      bwxml="yes"
@@ -476 +483 @@
-fi
-
+if [ "$bwtools" != "" ] ; then
+  cd $QUICKSTART_HOME/bwtools
+fi
+
-if [ "$caldav" != "" ] ; then
-  cd $QUICKSTART_HOME/bedework/projects/caldav

trunk/config/bwbuild/jboss-postgresql/cal.properties

@@ -539 +539 @@
-# --------------------------------------------------------------------
-#
+# bwtools
+#
+
+org.bedework.app.bwtools.runnable=yes
+org.bedework.app.bwtools.project=bwtools
+org.bedework.app.bwtools.sou.dir=
+org.bedework.app.bwtools.shellscr.name=bwrun
+org.bedework.app.bwtools.batscr.name=bwrun.bat
+org.bedework.app.bwtools.zip.name=bwtools
+org.bedework.app.bwtools.description=Bedework tools suite
+org.bedework.app.bwtools.schema.delimiter=;
+
+#
+# --------------------------------------------------------------------
+#
-# Dumprestore
-#