Changeset 16631 for release-kits/wirk3

Timestamp:

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

Author:

oranfry

Message:

changes afer splitting gsdl into common, build and runtime

Location:

release-kits/wirk3

Files:

• ant-scripts/operations-on-gs3home.xml (modified) (5 diffs)
• installer/build.xml (modified) (3 diffs)
• src/wirk3.cpp (modified) (1 diff)

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>
 

release-kits/wirk3/installer/build.xml

@@ -23 +23 @@
     </path>
     <property name="installDir.local" refid="installDir.path"/>
+
+    <!-- load windows properties -->
+    <winprops/>
     
     
     <target name="install-core-components">
-        <!-- load windows properties -->
-        <winprops/>
 
         <!-- create the installation directory -->
@@ -154 +155 @@
     <target name="install-start-menu-shortcuts">
 
-        <mkdir dir="${win32.personal.programs_menu}\Greenstone-@version@\documentation"/>
-        
+        <mkdir dir="${win32.personal.programs_menu}\Greenstone-@version@\Documentation"/>
         
         <shortcut
@@ -179 +179 @@
 
         <shortcut
-            file="${win32.personal.programs_menu}\Greenstone-@version@\documentation\README.lnk"
+            file="${win32.personal.programs_menu}\Greenstone-@version@\Documentation\README.lnk"
             execute="${installDir}\README.txt" />
 
         <shortcut
-            file="${win32.personal.programs_menu}\Greenstone-@version@\documentation\Greenstone3 Users' Guide.lnk"
+            file="${win32.personal.programs_menu}\Greenstone-@version@\Documentation\Greenstone3 Users' Guide.lnk"
             execute="${installDir}\documentation\manual\manual.pdf" />
 
         <shortcut
-            file="${win32.personal.programs_menu}\Greenstone-@version@\documentation\Greenstone2 Users' Guide.lnk"
+            file="${win32.personal.programs_menu}\Greenstone-@version@\Documentation\Greenstone2 Users' Guide.lnk"
             execute="${installDir}\documentation\manual\gs2_user_en.pdf" />
 

release-kits/wirk3/src/wirk3.cpp

@@ -59 +59 @@
 
         } else if ( a.compare("-descend") == 0 ) {
-            command += " -Dresume.mode=descend";
-            
+            command = command + " -Dresume.descend=" + argv[++i];
         } else if ( a.compare("-from") == 0 ) {
             command = command + " -Dresume.from=" + argv[++i];
-            //from=`echo $2 | sed 's/compile/1/g' | sed 's/create-distributions/2/g' | sed 's/create-installer/3/g' | sed 's/wrap/4/g'`
-            //toexec=$toexec$from
         } else if ( a.compare("-to") == 0 ) {
             command = command + " -Dresume.to=" + argv[++i];
-            //to=`echo $2 | sed 's/compile/1/g' | sed 's/create-distributions/2/g' | sed 's/create-installer/3/g' | sed 's/wrap/4/g'`
-            //toexec=$toexec$to
         } else {
             command = command + " " + a;