Changeset 16774

Timestamp:

2008-08-14T09:04:15+12:00 (16 years ago)

Author:

oranfry

Message:

fixes to wirk2

Location:

release-kits/wirk2

Files:

• ant-scripts/create-distribution.xml (modified) (1 diff)
• ant-scripts/wrap.xml (modified) (1 diff)
• bin/wirk2.exe (modified) ( previous)
• installer/build.xml (modified) (2 diffs)
• src/wirk2.cpp (modified) (1 diff)

release-kits/wirk2/ant-scripts/create-distribution.xml

@@ -53 +53 @@
 
     <target name="copy-server-to-root">
-        <copy todir="${basedir}/distributions/web" overwrite="true">
-            <fileset dir="${basedir}/bin/windows/server.exe"/>
-        </copy>
-
+        <copy
+            todir="${basedir}/distributions/web"
+            file="${basedir}/distributions/web/bin/windows/server.exe"
+            overwrite="true"/>
     </target>
     

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

@@ -34 +34 @@
                 <not>
                     <uptodate targetfile="${basedir}/wrapped-installer/build/wrapper.RES">
-                        <srcfiles dir="${wirk2.home}/greenstone2/icon" includes="gs2.ico"/>
+                        <srcfiles dir="${wirk2.home}/greenstone2/icon" includes="icon.ico"/>
                         <srcfiles dir="${wirk2.home}/windows/wrapper" includes="${windows-java.installer}"/>
                         <srcfiles dir="${wirk2.home}/windows/wrapper" includes="*.bmp"/>
                         <srcfiles dir="${wirk2.home}/greenstone2/wrapper" includes="*.bmp"/>
                         <srcfiles dir="${wirk2.home}/windows/wrapper" includes="*.rc"/>
-                        <srcfiles dir="${basedir}/installer" includes="greenstone2.jar"/>
+                        <srcfiles dir="${basedir}/installer" includes="greenstone-${version}-win32.jar"/>
                     </uptodate>
                 </not>

release-kits/wirk2/installer/build.xml

@@ -66 +66 @@
         
         <!-- delete unneeded files -->      
-        <echo message="Deleting some extraneous files"/>
+        <echo message="Deleting some unneeded files"/>
         <delete dir="${installDir}/resources/icons"/>
         <delete file="${installDir}/resources/*.png"/>
-        
+
+        <echo message="Setting GSDLHOME in setup.bat"/>
+        <rsr
+            file="${installDir}/setup.bat"
+            pattern="\*\*GSDLHOME\*\*"
+            replacement="${installDir}"/>
+                    
         <echo message="Finished"/>
         
@@ -94 +100 @@
         <shortcut
             file="${win32.personal.programs_menu}\Greenstone-@version@\Greenstone2 Server.lnk"
-            execute="${installDir}\bin\windows\server.exe"
+            execute="${installDir}\server.exe"
             workingDirectory="${installDir}"
             iconFile="${installDir}\images\icon.ico"

release-kits/wirk2/src/wirk2.cpp

@@ -45 +45 @@
     
     //create the command
-    command = WIRK2_HOME + "\\packages\\ant\\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 -addressing -Dwirk2.home=" + WIRK2_HOME;
     //pass on the arguments
     string a;