Changeset 15812

Show
Ignore:
Timestamp:
30.05.2008 10:27:32 (11 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:
2 modified

Legend:

Unmodified
Added
Removed
  • release-kits/wirk3/ant-scripts/create-distribution.xml

    r15095 r15812  
    2222        <addressedcall target="insert-user-manual"/> 
    2323        <addressedcall target="insert-compiled-binaries"/> 
     24        <addressedcall target="rename-build-xml-for-transit"/> 
    2425    </target> 
    2526 
     
    9091    <target name="insert-compiled-binaries"> 
    9192        <if><bool><istrue value="${execute}"/></bool> 
    92  
     93             
    9394            <delete dir="distribution/greenstone3/lib/jni"/> 
    9495            <copy todir="distribution/greenstone3/lib/jni"><fileset dir="greenstone3/lib/jni"/></copy> 
     
    9697            <delete dir="distribution/greenstone3/gs2build/bin/windows"/> 
    9798            <copy todir="distribution/greenstone3/gs2build/bin/windows"><fileset dir="greenstone3/gs2build/bin/windows"/></copy> 
    98                          
     99             
    99100            <delete dir="distribution/greenstone3/gs2build/bin/java"/> 
    100101            <copy todir="distribution/greenstone3/gs2build/bin/java"><fileset dir="greenstone3/gs2build/bin/java"/></copy> 
    101  
     102         
    102103        </if> 
    103104    </target> 
    104105 
    105  
    106  
     106    <target name="rename-build-xml-for-transit"> 
     107        <if><bool><istrue value="${execute}"/></bool> 
     108            <move file="distribution/greenstone3/build.xml" tofile="distribution/greenstone3/greenstone3-build.xml"/> 
     109        </if> 
     110    </target> 
    107111 
    108112</project> 
  • release-kits/wirk3/installer/build.xml

    r15691 r15812  
    6161        <echo/> 
    6262 
    63         <!-- 
    64         <echo message="Installing Packages (packages)"/> 
    65         <unzip src="${antinstaller.jar}" dest="${installDir}"><patternset><include name="packages/**/*"/></patternset></unzip> 
    66         <echo/> 
    67         --> 
    68  
    6963        <echo message="Installing Resources (resources)"/> 
    7064        <unzip src="${antinstaller.jar}" dest="${installDir}"><patternset><include name="resources/**/*"/></patternset></unzip> 
     
    7973        <unzip src="${antinstaller.jar}" dest="${installDir}"> 
    8074            <patternset> 
    81                 <include name="build.xml"/> 
     75                <include name="greenstone3-build.xml"/> 
    8276                <include name="build.properties"/> 
    8377                <include name="gs3-server.bat"/> 
     
    8983        </unzip> 
    9084        <echo/> 
    91  
     85         
     86        <!-- rename greenstone3-build.xml back to build.xml --> 
     87        <move file="${installDir}/greenstone3-build.xml" tofile="${installDir}/build.xml" overwrite="true"/> 
     88         
    9289        <!-- change the tomcat ports in build.properties --> 
    9390        <echo message="Changing tomcat ports in build.properties"/> 
     
    9693        <echo message="Changing tomcat ports in resources/tomcat/server.xml"/> 
    9794        <copy file="${installDir}/resources/tomcat/server.xml" tofile="${installDir.local}/packages/tomcat/conf/server.xml" overwrite="true"/> 
     95         
     96        <!-- set gsdlhome in gs2build setup.bat --> 
     97        <echo message="Setting %GSDLHOME% in gs2build\setup.bat"/> 
     98        <rsr file="${installDir}/gs2build/setup.bat" pattern="@gsdlhome@" replacement="${installDir.local}\gs2build" /> 
    9899 
     100         
    99101        <!-- copy the greenstone3.xml file to tomcat --> 
    100102        <echo message="Copying greenstone3.xml to tomcat directory"/>