From 69b07cda6527258118ecb4216a6e6216ee7120d4 Mon Sep 17 00:00:00 2001
From: dchandler <dchandler>
Date: Mon, 3 Feb 2003 06:24:52 +0000
Subject: [PATCH] Added some utility targets pour moi.

Better error checking.

There's now a nightly builds HTML page, for use with a script like the
following:

#! /bin/sh
JSKAD=/www/nightly/Jskad
DEST=/www/nightly/builds
HISTORY=/www/nightly/history
DATE=`date`
if test ! -d $DEST; then \
     echo "$DEST does not exist ($DATE)." >> history; exit 1; fi
(rm -fr ${DEST}/* && cd $JSKAD && cvs -f -z3 update -dP && ant dc-nightly-build \
 && cp dist/nightlyBuild.zip $DEST && cd $DEST && unzip nightlyBuild.zip \
 && rm nightlyBuild.zip && \
  (cd docs \
   && mv private-javadocs-*.zip private-javadocs-today.zip \
   && mv public-javadocs-*.zip public-javadocs-today.zip \
   && mkdir public && mkdir private && \
    (cd public \
     && unzip ../public-javadocs-today.zip) && \
    (cd private \
     && unzip ../private-javadocs-today.zip)) \
 && \
  (cd source \
   && mv THDL-Tools-src-*.zip THDL-Tools-src-today.zip))
if test $? != 0; then echo "NIGHTLY BUILD FAILED on $DATE" >> $HISTORY; exit 2; fi
(cd $JSKAD && ant check)
DDATE=`date`
if test $? != 0; then echo "'ant check' FAILED on $DATE" >> $HISTORY; exit 3; fi
DDDATE=`date`
echo "Success on start=$DATE build=$DDATE check=$DDDATE" >> $HISTORY
exit 0
---
 .cvsignore              |  7 ++--
 build.xml               | 60 +++++++++++++++++++++-----
 dist/.cvsignore         |  3 +-
 dist/NightlyBuilds.html | 93 +++++++++++++++++++++++++++++++++++++++++
 4 files changed, 149 insertions(+), 14 deletions(-)
 create mode 100644 dist/NightlyBuilds.html

diff --git a/.cvsignore b/.cvsignore
index 96f1235..b42632e 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,6 +1,7 @@
+*~
+NightlyBuildStore
+TEST*
 bin
 jskad.log
-savant.log
 qd.log
-TEST*
-*~
+savant.log
diff --git a/build.xml b/build.xml
index 278bf9a..8574e99 100644
--- a/build.xml
+++ b/build.xml
@@ -216,7 +216,7 @@
     <antcall target="src-dist"/>
     <zip destfile="${dist}/nightlyBuild.zip">
       <zipfileset dir="${dist}"
-                  excludes="nightlyBuild.zip,lib-jws/**,*.jnlp,README.txt"
+                  excludes="nightlyBuild.zip,lib-jws/**,*.jnlp,README.TXT,releases"
                   prefix="."/>
     </zip>
   </target>
@@ -944,6 +944,36 @@
   </target>
 
 
+  <!-- DC uses this to update the javadocs on thdltools.sf.net. -->
+  <target name="copy-over-javadocs"
+          depends="clean,public-javadocs-dist,private-javadocs-dist"
+          description="Uses scp to copy zip files of two flavors of Javadocs to thdltools.sf.net.  After that, ssh in and follow the instructions given in http://thdltools.sourceforge.net/BuildSystems.html.">
+    <apply executable="scp" parallel="true">
+      <srcfile/>
+      <fileset dir="dist/docs"/>
+      <arg value="dchandler@thdltools.sourceforge.net:/home/groups/t/th/thdltools/htdocs"/>
+    </apply>
+  </target>
+
+  <!-- DC uses this to do nightly builds. The passwords are included
+       in this publically-available file because the keystore is basically
+       a dummy keystore. -->
+  <target name="dc-nightly-build"
+          description="How Chandler r0x0rs the nightly build's b0x0rs">
+    <antcall target="nightly-build">
+      <param name="keystore" value="file:///home/chandler/thdl/sandboxes/Jskad/NightlyBuildStore"/>
+      <param name="key.alias" value="me"/>
+      <param name="dgkey.password" value="nightly"/>
+      <param name="keystore.password" value="nightly"/>
+    </antcall>
+  </target>
+
+
+  <!-- -*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-* -->
+  <!-- UTILITY TARGETS - targets of antcalls, targets not usually
+       directly called. -->
+  <!-- -*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-* -->
+
   <target name="ttsc-init" depends="init"
           description="used internally to set a property when the J2EE SDK or Tomcat's servlet.jar is installed in a place where we can find it.  In that case, we can build servlets.">
     <condition property="found.servlet.classes">
@@ -954,12 +984,6 @@
     </condition>
   </target>
 
-
-  <!-- -*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-* -->
-  <!-- UTILITY TARGETS - targets of antcalls, targets not usually
-       directly called. -->
-  <!-- -*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-* -->
-
   <!-- Utility target called by private-javadocs and public-javadocs -->
   <target name="our-javadocs" depends="init"
           description="INTERNAL TASK: makes Javadoc documentation; usually not called directly" >
@@ -992,7 +1016,7 @@
       <doctitle><![CDATA[<h1>THDL Tools</h1>]]></doctitle>
 
       <!-- Note: We must show the SF.net logo in order to get hit counts. -->
-      <bottom>These API docs were created ${javadoc.creation.time}.<![CDATA[<br><i>Copyright &#169; 2001-2002 Tibetan and Himalayan Digital Library. All Rights Reserved.</i><br>Hosted by <a href="http://sourceforge.net/"><img src="http://sourceforge.net/sflogo.php?group_id=61934&amp;type=1" width="88" height="31" border="0" alt="SourceForge_Logo"></a>]]></bottom>
+      <bottom>These API docs were created ${javadoc.creation.time}.<![CDATA[<br><i>Copyright &#169; 2001-2003 Tibetan and Himalayan Digital Library. All Rights Reserved.</i><br>Hosted by <a href="http://sourceforge.net/"><img src="http://sourceforge.net/sflogo.php?group_id=61934&amp;type=1" width="88" height="31" border="0" alt="SourceForge_Logo"></a>]]></bottom>
 
       <group title="Tibetan Text Packages" packages="org.thdl.tib.text.**"/>
       <group title="Tibetan Input Packages" packages="org.thdl.tib.input.**"/>
@@ -1376,9 +1400,25 @@ public class ThdlVersion {
   <target name="copy-SQD-jars"
           description="Unpacks the JARs/WARs/ZIP files that Savant and QuillDriver use to the chosen bin/ directory">
     <unjar src="${ext}/jdom.jar" dest="${unjardest}"/>
+
+    <available file="${ext}/xml-apis.jar"
+               property="found.xml-apis.jar"/>
+    <fail message="Can't find extensions/xml-apis.jar; please download it."
+          unless="found.xml-apis.jar"/>
     <unjar src="${ext}/xml-apis.jar" dest="${unjardest}"/>
-    <unjar src="${ext}/xalan.jar" dest="${unjardest}"/> <!-- DLC FIXME: this isn't needed for Savant. -->
+
+    <available file="${ext}/xalan.jar"
+               property="found.xalan.jar"/>
+    <fail message="Can't find extensions/xalan.jar; please download it."
+          unless="found.xalan.jar"/>
+    <unjar src="${ext}/xalan.jar" dest="${unjardest}"/> <!-- Note: this isn't actually needed for Savant. -->
+
+    <available file="${ext}/xercesImpl.jar"
+               property="found.xercesImpl.jar"/>
+    <fail message="Can't find extensions/xercesImpl.jar; please download it."
+          unless="found.xercesImpl.jar"/>
     <unjar src="${ext}/xercesImpl.jar" dest="${unjardest}"/>
+
     <!-- One or more of the above may have a META-INF directory.  We don't
          want theirs to overwrite our own, so we delete it. -->
     <delete dir="${unjardest}/META-INF"/>
@@ -1389,7 +1429,7 @@ public class ThdlVersion {
           description="Unpacks the JARs/WARs/ZIP files that Savant and QuillDriver use to the chosen bin/ directory">
     <available file="Fonts/TibetanMachineWeb"
                property="found.the.fonts"/>
-    <fail message="Can't find the Fonts module at Jskad/Fonts/TibetanMachineWeb.  Did you do 'cvs checkout Fonts' from inside the Jskad directory?"
+    <fail message="Can't find the Fonts module at Jskad/Fonts/TibetanMachineWeb.  Did you do 'cvs -f checkout -P Fonts' from inside the Jskad directory?"
           unless="found.the.fonts"/>
     <copy todir="${my.bin}/Fonts/TibetanMachineWeb">
       <fileset dir="Fonts/TibetanMachineWeb"/>
diff --git a/dist/.cvsignore b/dist/.cvsignore
index 567cbf7..5d861da 100644
--- a/dist/.cvsignore
+++ b/dist/.cvsignore
@@ -1,6 +1,7 @@
 docs
 java-web-start
-lib-vanilla
 lib-jws
+lib-vanilla
+nightlyBuild.zip
 releases
 source
diff --git a/dist/NightlyBuilds.html b/dist/NightlyBuilds.html
new file mode 100644
index 0000000..216b83b
--- /dev/null
+++ b/dist/NightlyBuilds.html
@@ -0,0 +1,93 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+  <head>
+    <title>THDL Tools Nightly Builds</title>
+  </head>
+
+  <body>
+    <h1>THDL Tools Nightly Builds</h1>
+
+<p>
+  Here you'll find last night's latest and greatest builds of the THDL tools.
+</p>
+
+<ul>
+  <li>
+    Today's Javadocs: [<a href="docs/public">public</a> <a href="public-javadocs-today.zip">(zip file)</a>]
+                      [<a href="docs/private">private</a> <a href="private-javadocs-today.zip">(zip file)</a>]
+  </li>
+  <li>
+    Today's source distribution (for all the tools combined): <a href="source/THDL-Tools-src-today.zip">zip file</a>
+  </li>
+  <li>
+    Today's Java Web Start binaries (signed with a throwaway key, so
+    you have to trust that my server hasn't been compromised and click
+    through the warnings):
+    <ul>
+      <li>
+        <a href="java-web-start/DictionarySearchAppletAndJavaWebStart.jnlp">Translation Tool</a>
+      </li>
+      <li>
+        <a href="java-web-start/Jskad.jnlp">Jskad</a>
+      </li>
+      <li>
+        <a href="java-web-start/QuillDriver.jnlp">QuillDriver</a>
+      </li>
+      <li>
+        <a href="java-web-start/Savant.jnlp">Savant</a> [Legacy]
+      </li>
+    </ul>
+  </li>
+  <li>
+    Self-contained (minus QuickTime for Java, minus Java
+    Media Framework) JARs that are not signed:
+    <ul>
+      <li>
+        All-in-one <a href="lib-vanilla/Jskad-self-contained.jar">Jskad</a>
+      </li>
+      <li>
+        All-in-one <a href="lib-vanilla/QuillDriver-self-contained.jar">QuillDriver</a>
+      </li>
+      <li>
+        All-in-one <a href="lib-vanilla/Savant-self-contained.jar">Savant</a> [Legacy]
+      </li>
+    </ul>
+  </li>
+  <li>
+    Plain Jane, bare-minimum JARs that are not signed:
+    <ul>
+      <li>
+        <a href="lib-vanilla/Tibbibl.jar">Tibbibl</a>
+      </li>
+      <li>
+        <a href="lib-vanilla/Jskad.jar">Jskad</a>
+      </li>
+      <li>
+        <a href="lib-vanilla/QuillDriver.jar">QuillDriver</a>
+      </li>
+      <li>
+        <a href="lib-vanilla/DictionarySearchStandalone.jar">Standalone Translation Tool</a>
+      </li>
+      <li>
+        <a href="lib-vanilla/DictionarySearchHandheld.jar">Translation Tool for Handheld Devices</a>
+      </li>
+      <li>
+        <a href="lib-vanilla/DictionarySearchAppletAndJavaWebStart.jar">Translation Tool for Applets</a>
+      </li>
+      <li>
+        <a href="lib-vanilla/Savant.jar">Savant</a> [Legacy]
+      </li>
+    </ul>
+  </li>
+</ul>
+
+
+
+    <hr>
+    <address><a href="mailto:dchandler@users.sourceforge.net">David Chandler</a></address>
+<!-- Created: Mon Feb  3 00:21:24 EST 2003 -->
+<!-- hhmts start -->
+Last modified: Mon Feb  3 00:45:24 EST 2003
+<!-- hhmts end -->
+  </body>
+</html>