Add script to deploy doc to website; add retroweaver jars.

git-svn-id: https://olap4j.svn.sourceforge.net/svnroot/olap4j/trunk@5 c6a108a4-781c-0410-a6c6-c2d559e19af0

build.xml

@@ -34,6 +34,7 @@
   <property name="jar-jdk14.file" value="${lib.dir}/${name}-jdk14.jar" />
   <property name="dist.bin.file" value="${dist.dir}/${dist.name}.zip" />
   <property name="dist.src.file" value="${dist.dir}/${dist.name}-src.zip" />
+  <property name="dist.doc.file" value="${dist.dir}/doc.tar.gz" />
 
   <path id="project.classpath">
     <pathelement location="${classes.dir}"/>
@@ -180,7 +181,7 @@ ${doc.dir}/api/src-html/**/*"/>
   </target>
 
   <target name="doczip"
-      depends="javadoc"
+      depends="version,javadoc"
       description="Builds a zipfile of the documentation, which can then be
                    deployed to sf.net. See also doc/deployDoc.sh.">
     <mkdir dir="${dist.dir}" />
@@ -227,7 +228,7 @@ META-INF/**"/>
   </target>
 
   <!-- create a retrowoven jar file which will work under jdk1.4 -->
-  <target name="jar-jdk14" depends="version,compile">
+  <target name="jar-jdk14" depends="version,compile,retroweave">
     <mkdir dir="${lib.dir}" />
     <zip
         zipfile="${jar-jdk14.file}"
@@ -279,20 +280,19 @@ META-INF/**"/>
 
   <target name="test" />
 
-  <!--
   <taskdef name="retroweaver"
       classname="com.rc.retroweaver.ant.RetroWeaverTask">
     <classpath>
-      <fileset dir="${retroweaver.dir}/lib" includes="**/*" />
-      <pathelement location="${retroweaver.dir}/release/retroweaver-1.2.4.jar" />
-      <pathelement location="${retroweaver.dir}/release/retroweaver-rt-1.2.4.jar" />
+      <pathelement location="${lib.dir}/asm-2.2.3.jar" />
+      <pathelement location="${lib.dir}/asm-commons-2.2.3.jar" />
+      <pathelement location="${lib.dir}/retroweaver-1.2.4.jar" />
+      <pathelement location="${lib.dir}/retroweaver-rt-1.2.4.jar" />
     </classpath>
   </taskdef>
 
   <target name="retroweave">
     <retroweaver srcdir="${classes.dir}" />
   </target>
-  -->
 
 </project>
 

doc/deployDoc.sh

@@ -0,0 +1,58 @@
+#!/bin/sh
+# $Id: //open/mondrian/doc/deployDoc.sh#3 $
+# This software is subject to the terms of the Common Public License
+# Agreement, available at the following URL:
+# http://www.opensource.org/licenses/cpl.html.
+# Copyright (C) 2005-2005 Julian Hyde
+# All Rights Reserved.
+# You must accept the terms of that agreement to use this software.
+#
+# This is a script to deploy olap4j's website.
+# Only the release manager (jhyde) should run this script.
+
+set -e
+set -v
+
+generate=true
+if [ "$1" == --nogen ]; then
+  shift
+  generate=
+fi
+
+# Prefix is usually "release" or "head"
+prefix="$1"
+# Directory at sf.net
+docdir=
+case "$prefix" in
+0.6) export docdir=htdocs;;
+head) export docdir=head;;
+*) echo "Bad prefix '$prefix'"; exit 1;;
+esac
+
+cd $(dirname $0)/..
+if [ "$generate" ]; then
+  ant doczip
+else
+  echo Skipping generation...
+fi
+
+scp dist/doc.tar.gz [email protected]:
+
+GROUP_DIR=/home/groups/o/ol/olap4j
+
+ssh -T [email protected] <<EOF
+set -e
+set -v
+rm -f $GROUP_DIR/doc.tar.gz
+mv doc.tar.gz $GROUP_DIR
+cd $GROUP_DIR
+tar xzf doc.tar.gz
+rm -rf old
+if [ -d $docdir ]; then mv $docdir old; fi
+mv doc $docdir
+rm -rf old
+rm -f doc.tar.gz
+./makeLinks
+EOF
+
+# End deployDoc.sh