Changeset 16204

Timestamp:

2008-06-26T12:50:39+12:00 (15 years ago)

Author:

oranfry

Message:

made wirk2 work under the new shared code scheme

Location:

release-kits/wirk2

Files:

• ant-scripts/build.xml (modified) (2 diffs)
• ant-scripts/wrap.xml (modified) (3 diffs)
• bin/wirk2.exe (modified) ( previous)
• src/wirk2.cpp (modified) (2 diffs)

release-kits/wirk2/ant-scripts/build.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8" ?>
-
 <!--
         .......................................................... 
@@ -8 +7 @@
         ..........................................................
 -->
-
 <project name="wirk2-build" default="wirk2">
 
     <!-- CONSTANTS -->
 
-    <!-- create a localised basedir property -->
-    <path id="basedir.path"><pathelement location="${basedir}"/></path>
-    <property name="basedir.local" refid="basedir.path"/>
+    <!-- the size of the resourse chunks to be put in the wrapped installer -->
+    <property name="resources.chunksize" value="8388608"/><!-- 8MiB -->
 
     <!-- for the benefit of the shared scripts, set release-kit home -->
-    <property name="rk.home" value="${lirk2.home}" />
+    <property name="rk.home" value="${wirk2.home}" />
 
 

release-kits/wirk2/ant-scripts/wrap.xml

@@ -18 +18 @@
             
             <!-- copy source files -->
-            <copy todir="${basedir}/wrapped-installer/build" file="${wirk2.home}/wrapper/wrapper.cpp"/>
+            <copy todir="${basedir}/wrapped-installer/build" file="${wirk2.home}/windows/wrapper/wrapper.cpp"/>
             <copy todir="${basedir}/wrapped-installer/build" file="${wirk2.home}/packages/search4j/libsearch4j.cpp"/>
             <copy todir="${basedir}/wrapped-installer/build" file="${wirk2.home}/packages/search4j/libsearch4j.h"/>
@@ -57 +57 @@
                 
                 <echo>getting the template resource script</echo>
-                <copy todir="${basedir}/wrapped-installer/build" file="${wirk2.home}/wrapper/wrapper.rc" overwrite="true"/>
+                <copy todir="${basedir}/wrapped-installer/build" file="${wirk2.home}/windows/wrapper/wrapper.rc" overwrite="true"/>
                 
                 <echo>copying the small resource files into place</echo>
@@ -63 +63 @@
                     <fileset dir="${wirk2.home}/windows/wrapper" includes="*.bmp"/>
                     <fileset dir="${wirk2.home}/greenstone2/wrapper" includes="*.bmp"/>
-                    <fileset dir="${wirk2.home}/greenstone2/icon" includes="gs2.ico"/>
+                    <fileset dir="${wirk2.home}/greenstone2/icon" includes="icon.ico"/>
                 </copy>
                 

release-kits/wirk2/src/wirk2.cpp

@@ -37 +37 @@
     
     //set the classpath
-    classpath = pwd + "\\installer\\classes;" + JAVA_HOME + "\\lib\\tools.jar;" + WIRK2_HOME + "\\lib\\serializer.jar;" + WIRK2_HOME + "\\lib\\xalan.jar;" + WIRK2_HOME + "\\lib\\xercesImpl.jar;" + WIRK2_HOME + "\\lib\\xml-apis.jar;" + WIRK2_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-antlr.jar;" + WIRK2_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-apache-bcel.jar;" + WIRK2_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-apache-bsf.jar;" + WIRK2_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-apache-log4j.jar;" + WIRK2_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-apache-oro.jar;" + WIRK2_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-apache-regexp.jar;" + WIRK2_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-apache-resolver.jar;" + WIRK2_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-commons-logging.jar;" + WIRK2_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-commons-net.jar;" + WIRK2_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-icontract.jar;" + WIRK2_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-jai.jar;" + WIRK2_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant.jar;" + WIRK2_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-javamail.jar;" + WIRK2_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-jdepend.jar;" + WIRK2_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-jmf.jar;" + WIRK2_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-jsch.jar;" + WIRK2_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-junit.jar;" + WIRK2_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-launcher.jar;" + WIRK2_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-netrexx.jar;" + WIRK2_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-nodeps.jar;" + WIRK2_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-starteam.jar;" + WIRK2_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-stylebook.jar;" + WIRK2_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-swing.jar;" + WIRK2_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-trax.jar;" + WIRK2_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-vaj.jar;" + WIRK2_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-weblogic.jar;" + WIRK2_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-xalan1.jar;" + WIRK2_HOME + "\\bin\\apache-ant-1.6.5\\lib\\ant-xslp.jar;" + WIRK2_HOME + "\\bin\\apache-ant-1.6.5\\lib\\xercesImpl.jar;" + WIRK2_HOME + "\\bin\\apache-ant-1.6.5\\lib\\xml-apis.jar;" + WIRK2_HOME + "\\bin\\ant-installer\\lib\\ai-icons-amaranth.jar;" + WIRK2_HOME + "\\bin\\ant-installer\\lib\\ai-icons-bluecurve.jar;" + WIRK2_HOME + "\\bin\\ant-installer\\lib\\ai-icons-crystalsvg.jar;" + WIRK2_HOME + "\\bin\\ant-installer\\lib\\ai-icons-eclipse.jar;" + WIRK2_HOME + "\\bin\\ant-installer\\lib\\ai-icons-krystaline.jar;" + WIRK2_HOME + "\\bin\\ant-installer\\lib\\ant-installer-ext.jar;" + WIRK2_HOME + "\\bin\\ant-installer\\lib\\ant-installer.jar;" + WIRK2_HOME + "\\bin\\ant-installer\\lib\\jgoodies-edited-1_2_2.jar;" + WIRK2_HOME + "\\bin\\ant-installer\\lib\\xercesImpl.jar;" + WIRK2_HOME + "\\bin\\ant-installer\\lib\\xml-apis.jar;" + WIRK2_HOME + "\\bin\\ant-installer\\classes";
+    classpath = pwd + "\\installer\\classes;" + JAVA_HOME + "\\lib\\tools.jar;" + WIRK2_HOME + "\\lib\\serializer.jar;" + WIRK2_HOME + "\\lib\\xalan.jar;" + WIRK2_HOME + "\\lib\\xercesImpl.jar;" + WIRK2_HOME + "\\lib\\xml-apis.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-antlr.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-apache-bcel.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-apache-bsf.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-apache-log4j.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-apache-oro.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-apache-regexp.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-apache-resolver.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-commons-logging.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-commons-net.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-icontract.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-jai.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-javamail.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-jdepend.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-jmf.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-jsch.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-junit.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-launcher.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-netrexx.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-nodeps.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-starteam.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-stylebook.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-swing.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-trax.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-vaj.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-weblogic.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-xalan1.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\ant-xslp.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\xercesImpl.jar;" + WIRK2_HOME + "\\packages\\ant\\lib\\xml-apis.jar;" + WIRK2_HOME + "\\packages\\ant-installer\\lib\\ai-icons-amaranth.jar;" + WIRK2_HOME + "\\packages\\ant-installer\\lib\\ai-icons-bluecurve.jar;" + WIRK2_HOME + "\\packages\\ant-installer\\lib\\ai-icons-crystalsvg.jar;" + WIRK2_HOME + "\\packages\\ant-installer\\lib\\ai-icons-eclipse.jar;" + WIRK2_HOME + "\\packages\\ant-installer\\lib\\ai-icons-krystaline.jar;" + WIRK2_HOME + "\\packages\\ant-installer\\lib\\ant-installer-ext.jar;" + WIRK2_HOME + "\\packages\\ant-installer\\lib\\ant-installer.jar;" + WIRK2_HOME + "\\packages\\ant-installer\\lib\\jgoodies-edited-1_2_2.jar;" + WIRK2_HOME + "\\packages\\ant-installer\\lib\\xercesImpl.jar;" + WIRK2_HOME + "\\packages\\ant-installer\\lib\\xml-apis.jar;" + WIRK2_HOME + "\\packages\\ant-installer\\classes";
     putenv( ("CLASSPATH=" + classpath).c_str() );
 
@@ -45 +45 @@
     
     //create the command
-    command = WIRK2_HOME + "\\bin\\apache-ant-1.6.5\\bin\\ant.bat -f " + WIRK2_HOME + "\\ant-scripts\\build.xml -Dwirk2.home=" + WIRK2_HOME;
+    command = WIRK2_HOME + "\\packages\\ant\\bin\\ant.bat -f " + WIRK2_HOME + "\\ant-scripts\\build.xml -Dwirk2.home=" + WIRK2_HOME;
     //pass on the arguments
     string a;