Changeset 14760 for other-projects


Ignore:
Timestamp:
2007-11-02T09:43:26+13:00 (16 years ago)
Author:
oranfry
Message:

fixed a bug where copies did not have their permissions preserved

Location:
other-projects/trunk/gs3-release-maker
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • other-projects/trunk/gs3-release-maker/build.properties

    r14627 r14760  
    11#version stuff
    2 version:3.03
     2version:3.03a
    33#implied: version.major=3
    4 version.minor=03
     4version.minor=03a
    55
    66
    77#where to store data
    8 release.dir:/research/oranfry/releases/3.03
    9 mac.release.dir:/Users/oranfry/releases/3.03
    10 windows.release.dir:c:\\research\\oranfry\\releases\\3.03
     8release.dir:/research/oranfry/releases/3.03a
     9mac.release.dir:/Users/oranfry/releases/3.03a
     10windows.release.dir:c:\\research\\oranfry\\releases\\3.03a
    1111
    1212
    1313#ssh
    1414username:oranfry
    15 
    16 

  • other-projects/trunk/gs3-release-maker/build.xml

    r14677 r14760  
    185185        <!-- check branches exist -->
    186186        <property name="svn.greenstone3" value="${svn.root}/greenstone3/${branch.path}"/>
     187        <property name="svn.gsdl" value="${svn.root}/gsdl/${branch.path}"/>
    187188        <property name="svn.gli" value="${svn.root}/gli/${branch.path}"/>
    188189        <property name="svn.indexers" value="${svn.root}/indexers/${branch.path}"/>
    … …  
    208209        </if>
    209210
     211        <!-- greenstone3 branch -->
     212        <echo level="info">Checking that ${svn.gsdl} exists...</echo>
     213        <setloglevel level="error"/>
     214        <try>
     215            <get src="${svn.gsdl}" dest="${temp.file}"/>
     216            <catch>
     217                <echo level="error">No, it does not exist</echo>
     218                <property name="svn.gsdl.unavailable" value="true"/>
     219            </catch>
     220        </try>
     221        <setloglevel level="info"/>
     222        <if>
     223            <bool><not><istrue value="${svn.gsdl.unavailable}"/></not></bool>
     224            <echo level="info">Yes, it exists</echo>
     225        </if>
     226
     227
    210228        <!-- gli branch -->
    211229        <echo level="info">Checking that ${svn.gli} exists...</echo>
    … …  
    272290                <or>
    273291                    <istrue value="${svn.greenstone3.unavailable}"/>
     292                    <istrue value="${svn.gsdl.unavailable}"/>
    274293                    <istrue value="${svn.gli.unavailable}"/>
    275294                    <istrue value="${svn.indexers.unavailable}"/>
    … …  
    412431        <!-- create distribution -->
    413432        <addressedcall target="export-greenstone3" />
     433        <addressedcall target="dist-set-version-number-property" />
    414434        <addressedcall target="create-distributions-1" />
    415435        <addressedcall target="create-distributions-2" />
    … …  
    423443        <!-- create distribution -->
    424444        <addressedcall target="source-export-greenstone3" />
     445        <addressedcall target="source-set-version-number-property" />
    425446        <addressedcall target="source-create-distribution" />
    426447        <addressedcall target="source-copy-over-build-xml" />
    … …  
    436457        <if><bool><istrue value="${execute}"/></bool>
    437458
    438             <copy overwrite="true" todir="${release.dir}/installer">
    439                 <fileset dir="/home/nzdl/for-distributions/installers"><include name="greenstone3/**"/></fileset>
    440             </copy>
     459            <delete dir="${release.dir}/installer"/>
     460            <exec executable="cp"><arg line="-r /home/nzdl/for-distributions/installers/greenstone3 ${release.dir}/installer"/></exec>
    441461
    442462            <!-- Edit the <installer-dir>/greenstone3/Greenstone3 Digital Library Software.uip file and change any absolute paths as needed. Make sure you change all paths. -->
    … …  
    444464            <rsr file="${release.dir}/installer/greenstone3/Greenstone3 Digital Library Software.uip" pattern="@release\.dir@" replacement="${release.dir}" />
    445465            <rsr file="${release.dir}/installer/greenstone3/Greenstone3 Digital Library Software.uip" pattern="@version\.minor@" replacement="${version.minor}" />
    446 
     466            <rsr file="/home/nzdl/installshieldX/alias.properties" pattern="(GSDL3_DISTRIBUTION_SOURCE)=.*" replacement="$1=${release.dir}/dist/greenstone3" />
    447467            <if>
    448468                <bool><equals arg1="${version}" arg2="trunk"/></bool>
    … …  
    487507            <delete dir="${release.dir}/gs3-${version}-release" />
    488508            <mkdir dir="${release.dir}/gs3-${version}-release" />
    489             <copy file="${release.dir}/installer/greenstone3/linux-distribution/disk1/setupLinux.bin" tofile="${release.dir}/gs3-${version}-release/greenstone-3.${version.minor}-linux.bin" />
    490             <copy file="${release.dir}/installer/greenstone3/macOSx-distribution/disk1/setupMac.command" tofile="${release.dir}/gs3-${version}-release/greenstone-3.${version.minor}-macOSx.command" />
    491             <copy file="${release.dir}/installer/greenstone3/windows-distribution/disk1/setupwin32.exe" tofile="${release.dir}/gs3-${version}-release/greenstone-3.${version.minor}-win32.exe" />
    492             <copy file="${release.dir}/source-dist/greenstone-3.${version.minor}-src.tar.gz" todir="${release.dir}/gs3-${version}-release" />
     509            <exec executable="cp"><arg line="${release.dir}/installer/greenstone3/linux-distribution/disk1/setupLinux.bin ${release.dir}/gs3-${version}-release/greenstone-3.${version.minor}-linux.bin"/></exec>
     510            <exec executable="cp"><arg line="${release.dir}/installer/greenstone3/macOSx-distribution/disk1/setupMac.command ${release.dir}/gs3-${version}-release/greenstone-3.${version.minor}-macOSx.command"/></exec>
     511            <exec executable="cp"><arg line="${release.dir}/installer/greenstone3/windows-distribution/disk1/setupwin32.exe ${release.dir}/gs3-${version}-release/greenstone-3.${version.minor}-win32.exe"/></exec>
     512            <exec executable="cp"><arg line="${release.dir}/source-dist/greenstone-3.${version.minor}-src.tar.gz ${release.dir}/gs3-${version}-release"/></exec>
    493513        </if>
    494514    </target>
    … …  
    510530        <!-- preparation -->
    511531        <addressedcall target="checkout-greenstone3" />
     532        <addressedcall target="set-version-number-property" />
    512533        <addressedcall target="dist-prepare-unix" />
    513534        <addressedcall target="tweak-configure-scripts" />
    … …  
    567588    </target>
    568589
     590
     591
    569592    <!-- third level targets -->
    570593    <target name="checkout-greenstone3">
    … …  
    573596            <checkout url="${svn.root}/greenstone3/${branch.path}" destPath="${release.dir}/greenstone3"/>
    574597        </svn>
     598        </if>
     599    </target>
     600
     601    <target name="set-version-number-property">
     602        <if><bool><istrue value="${execute}"/></bool>
     603            <rsr file="${release.dir}/greenstone3/resources/java/global.properties.in" pattern="@gsdl3version@" replacement="${version}" />
    575604        </if>
    576605    </target>
    … …  
    751780    </target>
    752781
     782    <target name="dist-set-version-number-property">
     783        <if><bool><istrue value="${execute}"/></bool>
     784            <rsr file="${release.dir}/dist/greenstone3/resources/java/global.properties.in" pattern="@gsdl3version@" replacement="${version}" />
     785        </if>
     786    </target>
     787
    753788    <target name="create-distributions-1">
    754789        <if><bool><istrue value="${execute}"/></bool>
    … …  
    785820
    786821            <!-- windows -->
    787             <copy todir="${release.dir}/dist/greenstone3/Windows/lib/jni">
    788                 <fileset dir="${release.dir}/other-platforms/win-lib-jni" />
    789             </copy>
    790             <copy todir="${release.dir}/dist/greenstone3/gs2build/Windows/bin/windows">
    791                 <fileset dir="${release.dir}/other-platforms/win-gs2build-bin-windows" />
    792             </copy>
     822            <mkdir dir="${release.dir}/dist/greenstone3/Windows/lib/jni"/>
     823            <exec executable="cp"><arg line="${release.dir}/other-platforms/win-lib-jni/* ${release.dir}/dist/greenstone3/Windows/lib/jni"/></exec>
     824
     825            <mkdir dir="${release.dir}/dist/greenstone3/gs2build/Windows/bin/windows"/>
     826            <exec executable="cp"><arg line="${release.dir}/other-platforms/win-gs2build-bin-windows/* ${release.dir}/dist/greenstone3/gs2build/Windows/bin/windows"/></exec>
    793827
    794828            <!-- mac -->
    795             <copy todir="${release.dir}/dist/greenstone3/gs2build/Unix/bin/darwin">
    796                 <fileset dir="${release.dir}/other-platforms/mac-gs2build-bin-darwin" />
    797             </copy>
    798             <copy todir="${release.dir}/dist/greenstone3/Darwin/lib/jni">
    799                 <fileset dir="${release.dir}/other-platforms/mac-lib-jni" />
    800             </copy>
     829            <mkdir dir="${release.dir}/dist/greenstone3/Darwin/lib/jni"/>
     830            <exec executable="cp"><arg line="${release.dir}/other-platforms/mac-lib-jni/* ${release.dir}/dist/greenstone3/Darwin/lib/jni"/></exec>
     831
     832            <mkdir dir="${release.dir}/dist/greenstone3/gs2build/Unix/bin/darwin"/>
     833            <exec executable="cp"><arg line="${release.dir}/other-platforms/mac-gs2build-bin-darwin/* ${release.dir}/dist/greenstone3/gs2build/Unix/bin/darwin"/></exec>
    801834
    802835            <!-- linux -->
    803             <copy todir="${release.dir}/dist/greenstone3/Linux/lib/jni">
    804                 <fileset dir="${release.dir}/greenstone3/lib/jni" />
    805             </copy>
    806             <copy todir="${release.dir}/dist/greenstone3/gs2build/Unix/bin/linux">
    807                 <fileset dir="${release.dir}/greenstone3/gs2build/bin/linux" />
    808             </copy>
    809             <copy todir="${release.dir}/dist/greenstone3/gs2build/bin/java">
    810                 <fileset dir="${release.dir}/greenstone3/gs2build/bin/java" />
    811             </copy>
     836            <mkdir dir="${release.dir}/dist/greenstone3/Linux/lib/jni"/>
     837            <exec executable="cp"><arg line="${release.dir}/greenstone3/lib/jni/* ${release.dir}/dist/greenstone3/Linux/lib/jni"/></exec>
     838
     839            <mkdir dir="${release.dir}/dist/greenstone3/gs2build/Unix/bin/linux"/>
     840            <exec executable="cp"><arg line="${release.dir}/greenstone3/gs2build/bin/linux/* ${release.dir}/dist/greenstone3/gs2build/Unix/bin/linux"/></exec>
     841
     842            <mkdir dir="${release.dir}/dist/greenstone3/gs2build/bin/java"/>
     843            <exec executable="cp"><arg line="${release.dir}/greenstone3/gs2build/bin/java/* ${release.dir}/dist/greenstone3/gs2build/bin/java"/></exec>
    812844
    813845        </if>
    … …  
    820852                <export srcurl="${svn.root}/greenstone3/${branch.path}" destPath="${release.dir}/source-dist/greenstone3"/>
    821853            </svn>
     854        </if>
     855    </target>
     856
     857    <target name="source-set-version-number-property">
     858        <if><bool><istrue value="${execute}"/></bool>
     859            <rsr file="${release.dir}/source-dist/greenstone3/resources/java/global.properties.in" pattern="@gsdl3version@" replacement="${version}" />
    822860        </if>
    823861    </target>
    … …  
    901939            <bool>
    902940                <and>
     941                    <isset property="branch.path" />
    903942                    <not><equals arg1="${branch.path}" arg2=""/></not>
    904943                    <not><equals arg1="${branch.path}" arg2="trunk"/></not>
    … …  
    912951                <copy srcUrl="${svn.root}/gsdl/trunk" destUrl="${svn.root}/gsdl/${branch.path}" message="creating a branch for the ${version} release" />
    913952            </svn>
     953            <else><fail>please set the branch.path, e.g., -Dbranch.path=branches/3.03</fail></else>
    914954        </if>
    915955    </target>
Note: See TracChangeset for help on using the changeset viewer.