Changeset 13378

Timestamp:

2006-11-29T16:58:47+13:00 (17 years ago)

Author:

kjdon

Message:

some targets in here now used in final distribution build.xml file (imported via xslt)

File:

• trunk/gsdl3/dist-resources/dist-build.xml (modified) (3 diffs)

trunk/gsdl3/dist-resources/dist-build.xml

@@ -185 +185 @@
     </move>
 
+    <!-- generate modified build.xml file -->
+    <antcall target="run-xslt-binary"/>
 
     <!-- clean up -->
-    <xslt in="${basedir}/build.xml" out="${basedir}/dist-build.xml" style="${basedir}/dist-resources/convert-build-xml.xsl"/>
     <delete dir="${basedir}/build"/>
     <delete dir="${basedir}/lib/jni"/>
@@ -214 +215 @@
     <!-- delete old axis dir -->
     <delete dir="${packages.home}/axis"/>
+    <mkdir dir="${web.home}/applet"/>
+    <mkdir dir="${web.home}/logs"/>
+
     <!-- download the mac XML parser just in case: it will only be unpacked if on a mac  -->
     <get src="http://www.greenstone.org/gs3files/XML-Parser.tar.gz"
       dest="${gs2build.home}/perllib/cpan/XML-Parser.tar.gz"
       usetimestamp="true"/>
+
+    <!-- generate modified build.xml file -->
+    <antcall target="run-xslt-source"/>
+    <!--<delete dir="${basedir}/dist-resources"/>-->
+
+  </target>
+
+  <target name="run-xslt-source" depends="init">
     <xslt in="${basedir}/build.xml" out="${basedir}/dist-build.xml" style="${basedir}/dist-resources/convert-build-xml-source.xsl"/>
-    <!--<delete dir="${basedir}/dist-resources"/>-->
-    
-  </target>
-
-  <!-- this target must be run once source dist unpacked -->
-  <target name="prepare-for-source-dist" depends="init">
-    <antcall target="unzip-windows-packages"/>
-    <!-- install tomcat compat package if necessary -->
-    <condition property="need.tomcat.compat">
-      <equals arg1="1.4" arg2="${ant.java.version}"/>
-    </condition>
-    <antcall target="install-tomcat-compat"/>
-    <condition property="need.xml.jars">
-      <equals arg1="1.5" arg2="${ant.java.version}"/>
-    </condition>
-    <antcall target="rename-xml-jars"/>
-    
-    <!-- set gsdlhome in setup.bat -->
-    <antcall target="gs2build-edit-setup-bat"/>
-    <antcall target="prepare-web"/>
-  </target>
-
+  </target>
+  
+  <target name="run-xslt-binary" depends="init">
+    <xslt in="${basedir}/build.xml" out="${basedir}/dist-build.xml" style="${basedir}/dist-resources/convert-build-xml.xsl"/>
+  </target>
+  
   <target name="rename-gs2build-files-dist" depends="init,rename-gs2build-files-unix">
     <copy file="${gs2build-extra.home}/lib.win32.mak" tofile="${gs2build.home}/lib/win32.mak"/>
@@ -313 +309 @@
   </target>
 
+  <!-- new targets to go in distribution build.xml files -->
+
+  <!-- new usage target for binary release -->
+  <target name="usage-for-binary-dist" description="Print a help message">
+    <echo message="  Execute 'ant -projecthelp' for a list of targets."/>
+    <echo message="  Execute 'ant -help' for Ant help."/>
+  </target>
+    
+
+  <!-- new install target for source distribution -->
+  <target name="install-for-source-dist" depends="init" description="install the source distribution. Includes configuring and compiling">
+    <antcall target="unzip-windows-packages"/>
+    <!-- install tomcat compat package if necessary -->
+    <condition property="need.tomcat.compat">
+      <equals arg1="1.4" arg2="${ant.java.version}"/>
+    </condition>
+    <antcall target="install-tomcat-compat"/>
+    <condition property="need.xml.jars">
+      <equals arg1="1.5" arg2="${ant.java.version}"/>
+    </condition>
+    <antcall target="rename-xml-jars"/>
+    <antcall target="install-macos-extra"/>
+    <!-- set gsdlhome in setup.bat -->
+    <antcall target="gs2build-edit-setup-bat"/>
+    <antcall target="configure"/>
+    <antcall target="configure-c++"/>
+    <antcall target="compile"/>
+  </target>
+
 </project>