Changeset 16631 for release-kits/wirk3/ant-scripts

Timestamp:

2008-08-01T15:41:30+12:00 (16 years ago)

Author:

oranfry

Message:

changes afer splitting gsdl into common, build and runtime

File:

• release-kits/wirk3/ant-scripts/operations-on-gs3home.xml (modified) (5 diffs)

release-kits/wirk3/ant-scripts/operations-on-gs3home.xml

@@ -35 +35 @@
         <antcall target="update-winbin"/>
         <antcall target="get-windows-binaries"/>
-        <antcall target="rename-gs2build-files-windows"/>
         <antcall target="compile-gs2build"/>
         <antcall target="compile-packages"/>
@@ -49 +48 @@
         <delete file="${gli.home}/gems.bat"/>
         <delete file="${gli.home}/gems.sh"/>
-        <antcall target="rename-gs2build-files-dist"/>    
-        <delete dir="${gs2build-extra.home}"/>
-
+        
         <!-- <antcall target="unzip-windows-packages"/> do we need this? -->
         <antcall target="prepare-tomcat"/>
@@ -84 +81 @@
         <!-- compile the java stuff -->
         <antcall target="compile-web"/>
-        
-        <!-- we can get this from the main greenstone3 directory
-        <antcall target="compile-packages-and-indexers"/>-->
         <antcall target="compile-packages-and-indexers-javaonly"/>
-        
+        <antcall target="distclean-packages"/>
         <antcall target="compile-core"/>
         <antcall target="compile-gli"/>
@@ -102 +96 @@
         <move file="${gs2build.home}/win32.mak" tofile="${gs2build.home}/source/win32.mak"/>
         <!--<move file="${gs2build.home}/setup.bat" tofile="${gs2build.home}/source/setup.bat"/>-->
-        <move file="${gs2build.home}/WIN32cfg.h" tofile="${gs2build.home}/source/WIN32cfg.h"/>
+        <!--<move file="${gs2build.home}/win32cfg.h" tofile="${gs2build.home}/source/win32cfg.h"/>-->
 
         <!-- clean up -->
@@ -147 +141 @@
         <xslt in="${basedir}/build.xml" out="${basedir}/modified-build.xml" style="${wirk3.home}/greenstone3/xsl/convert-build-xml.xsl"/>
     </target>
-  
-    <target name="rename-gs2build-files-dist" depends="init">
-        <mkdir dir="${gs2build.home}/gs2build-extra/lib"/>
-        <copy file="${gs2build.home}/gs2build-extra/lib.win32.mak" tofile="${gs2build.home}/lib/win32.mak"/>
-        <copy file="${gs2build.home}/gs2build-extra/win32.mak" tofile="${gs2build.home}/win32.mak"/>
-        <copy file="${gs2build.home}/gs2build-extra/setup.bat" tofile="${gs2build.home}/setup.bat"/>
-    </target>   
 
     <target name="compile-packages-and-indexers-javaonly" depends="init">
         <echo>Getting Indexer Jars</echo>
         <!-- install the jar files -->
-        <copy file="${basedir}/../../greenstone3/gs2build/indexers/mg/mg.jar" todir="${lib.jni}"/>
-        <copy file="${basedir}/../../greenstone3/gs2build/indexers/mgpp/mgpp.jar" todir="${lib.jni}"/>
-        <copy file="${basedir}/../../greenstone3/gs2build/indexers/lucene-gs/LuceneWrapper.jar" todir="${web.lib}"/>
+        <copy file="${basedir}/../../greenstone3/gs2build/common-src/indexers/mg/mg.jar" todir="${lib.jni}"/>
+        <copy file="${basedir}/../../greenstone3/gs2build/common-src/indexers/mgpp/mgpp.jar" todir="${lib.jni}"/>
+        <copy file="${basedir}/../../greenstone3/gs2build/common-src/indexers/lucene-gs/LuceneWrapper.jar" todir="${web.lib}"/>
         <!-- javagdbm -->
         <!-- install the jar file -->
-        <copy file="${basedir}/../../greenstone3/src/packages/javagdbm/javagdbm.jar" todir="${lib.jni}"/>
+        <copy file="${basedir}/../../greenstone3/src/packages/javagdbm/javagdbm.jar" todir="${lib.jni}" />
     </target>