Changeset 15812 for release-kits/wirk3/installer/build.xml

Timestamp:

2008-05-30T10:27:32+12:00 (16 years ago)

Author:

oranfry

Message:

rename build.xml on its way into the jar, and then back to the original name on its way back out. This stops a naming conflict with ant-installers own build.xml file. Also, now put the concrete value of @gsdlhome@ into gs2build\setup.bat at install time.

File:

• release-kits/wirk3/installer/build.xml (modified) (4 diffs)

release-kits/wirk3/installer/build.xml

@@ -61 +61 @@
         <echo/>
 
-        <!--
-        <echo message="Installing Packages (packages)"/>
-        <unzip src="${antinstaller.jar}" dest="${installDir}"><patternset><include name="packages/**/*"/></patternset></unzip>
-        <echo/>
-        -->
-
         <echo message="Installing Resources (resources)"/>
         <unzip src="${antinstaller.jar}" dest="${installDir}"><patternset><include name="resources/**/*"/></patternset></unzip>
@@ -79 +73 @@
         <unzip src="${antinstaller.jar}" dest="${installDir}">
             <patternset>
-                <include name="build.xml"/>
+                <include name="greenstone3-build.xml"/>
                 <include name="build.properties"/>
                 <include name="gs3-server.bat"/>
@@ -89 +83 @@
         </unzip>
         <echo/>
-
+        
+        <!-- rename greenstone3-build.xml back to build.xml -->
+        <move file="${installDir}/greenstone3-build.xml" tofile="${installDir}/build.xml" overwrite="true"/>
+        
         <!-- change the tomcat ports in build.properties -->
         <echo message="Changing tomcat ports in build.properties"/>
@@ -96 +93 @@
         <echo message="Changing tomcat ports in resources/tomcat/server.xml"/>
         <copy file="${installDir}/resources/tomcat/server.xml" tofile="${installDir.local}/packages/tomcat/conf/server.xml" overwrite="true"/>
+        
+        <!-- set gsdlhome in gs2build setup.bat -->
+        <echo message="Setting %GSDLHOME% in gs2build\setup.bat"/>
+        <rsr file="${installDir}/gs2build/setup.bat" pattern="@gsdlhome@" replacement="${installDir.local}\gs2build" />
 
+        
         <!-- copy the greenstone3.xml file to tomcat -->
         <echo message="Copying greenstone3.xml to tomcat directory"/>