Changeset 15812 for release-kits/wirk3

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.

Location:

release-kits/wirk3

Files:

• ant-scripts/create-distribution.xml (modified) (3 diffs)
• installer/build.xml (modified) (4 diffs)

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

@@ -22 +22 @@
         <addressedcall target="insert-user-manual"/>
         <addressedcall target="insert-compiled-binaries"/>
+        <addressedcall target="rename-build-xml-for-transit"/>
     </target>
 
@@ -90 +91 @@
     <target name="insert-compiled-binaries">
         <if><bool><istrue value="${execute}"/></bool>
-
+            
             <delete dir="distribution/greenstone3/lib/jni"/>
             <copy todir="distribution/greenstone3/lib/jni"><fileset dir="greenstone3/lib/jni"/></copy>
@@ -96 +97 @@
             <delete dir="distribution/greenstone3/gs2build/bin/windows"/>
             <copy todir="distribution/greenstone3/gs2build/bin/windows"><fileset dir="greenstone3/gs2build/bin/windows"/></copy>
-                        
+            
             <delete dir="distribution/greenstone3/gs2build/bin/java"/>
             <copy todir="distribution/greenstone3/gs2build/bin/java"><fileset dir="greenstone3/gs2build/bin/java"/></copy>
-
+        
         </if>
     </target>
 
-
-
+    <target name="rename-build-xml-for-transit">
+        <if><bool><istrue value="${execute}"/></bool>
+            <move file="distribution/greenstone3/build.xml" tofile="distribution/greenstone3/greenstone3-build.xml"/>
+        </if>
+    </target>
 
 </project>

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"/>