Changeset 17996 for release-kits


Ignore:
Timestamp:
2008-12-02T11:38:30+13:00 (15 years ago)
Author:
oranfry
Message:

sorting out the binary zip release

Location:
release-kits
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • release-kits/lirk2/ant-scripts/build.xml

    r17898 r17996  
    1616    <property name="rk.home" value="${lirk2.home}" />
    1717    <property name="rk.os" value="linux" />
     18    <property name="shell.os" value="linux"/>
    1819    <property name="os.suffix" value="linux"/>
    1920   

  • release-kits/lirk2/ant-scripts/create-distribution.xml

    r17993 r17996  
    1212        <antcall target="drop-in-demo-collection" />
    1313        <antcall target="insert-export-to-cd-package"><param name="gsdl.basedir" value="distributions/web"/></antcall> <!-- from rk2-targets -->
    14         <antcall target="remove-unneeded-files-1" />
    15 
    1614        <antcall target="drop-in-binaries" />
    1715        <antcall target="export-imagemagick-linux-binaries" />
    1816        <antcall target="compile-gli" />
    19         <antcall target="remove-unneeded-files-2" />
     17        <antcall target="remove-unneeded-files" />
     18
     19        <antcall target="create-binary-zip-linux"/>
    2020
    2121    </target>
    … …  
    5151            <fileset dir="${lirk2.home}/greenstone2/docs"/>
    5252        </copy>
    53     </target>
    54 
    55     <target name="remove-unneeded-files-1">
    56         <delete file="${basedir}/distributions/web/gli/.greenstonestore" />
    57         <!-- delete non-linux source stuff -->
    58         <delete><fileset dir="${basedir}/distributions/web" includes="win32.mak,WIN32cfg.h,Install.txt"/></delete>
    5953    </target>
    6054
    … …  
    9993    </target>
    10094
    101     <target name="remove-unneeded-files-2">
     95    <target name="remove-unneeded-files">
     96        <delete file="${basedir}/distributions/web/gli/.greenstonestore" />
     97        <delete><fileset dir="${basedir}/distributions/web" includes="win32.mak,WIN32cfg.h,Install.sh"/></delete>
    10298        <delete file="${basedir}/distributions/web/bin/java/SignedGatherer.jar" />
    10399        <delete><fileset dir="${basedir}/distributions/web/gli" includes="*.bat"/></delete>

  • release-kits/mark2/ant-scripts/build.xml

    r17898 r17996  
    1919    <property name="rk.home" value="${mark2.home}" />
    2020    <property name="rk.os" value="linux" />
     21    <property name="shell.os" value="darwin" />
    2122    <!-- os.suffix set dynamically below -->
    2223

  • release-kits/mark2/ant-scripts/create-distribution.xml

    r17995 r17996  
    1010        <antcall target="tweak-files" />
    1111        <antcall target="insert-uninstaller"><param name="script-format" value="sh"/></antcall> <!-- from rk2-targets -->
    12         <antcall target="remove-unneeded-files-1" />
    13 
    1412        <antcall target="drop-in-binaries" />
    1513        <antcall target="drop-in-demo-collection" />
    … …  
    1816        <antcall target="export-ghostscript-darwin-binaries" />
    1917        <antcall target="compile-gli" />
    20         <antcall target="remove-unneeded-files-2" />
     18        <antcall target="remove-unneeded-files" />
     19
     20        <antcall target="create-binary-zip-linux"/>
    2121
    2222    </target>
    … …  
    9999    </target>
    100100
    101     <target name="remove-unneeded-files-1">
     101    <target name="remove-unneeded-files">
    102102        <delete file="${basedir}/distributions/web/gli/.greenstonestore" />
    103         <!-- delete non-linux source stuff -->
    104         <delete><fileset dir="${basedir}/distributions/web" includes="win32.mak,WIN32cfg.h,Install.txt"/></delete>
    105     </target>
    106 
    107     <target name="remove-unneeded-files-2">
     103        <delete><fileset dir="${basedir}/distributions/web" includes="win32.mak,WIN32cfg.h,Install.sh"/></delete>
    108104        <delete><fileset dir="${basedir}/distributions/web/gli" includes="*.bat"/></delete>
    109105        <delete><fileset dir="${basedir}/distributions/web" includes="*.bat"/></delete>

  • release-kits/shared/ant-scripts/init.xml

    r17981 r17996  
    379379        <if>
    380380            <bool><equals arg1="zip" arg2="${format}"/></bool>
    381             <zip destfile="products/Greenstone-${version}-${os.suffix}-binary.zip" basedir="distributions/web" compress="true"/>
     381            <zip destfile="products/Greenstone-${version}-${os.suffix}-binary.zip" basedir="distributions/Greenstone-${version}-${os.suffix}-binary" compress="true"/>
    382382            <else>
    383383                <exec dir="distributions" executable="tar">
    384                     <arg line="-czf ../products/Greenstone-${version}-${os.suffix}-binary.tar.gz web"/>
     384                    <arg line="-czf ../products/Greenstone-${version}-${os.suffix}-binary.tar.gz Greenstone-${version}-${os.suffix}-binary"/>
    385385                </exec>
    386386            </else>

  • release-kits/shared/greenstone2/ant-scripts/rk2-targets.xml

    r17958 r17996  
    3838    </target>
    3939
     40    <target name="create-binary-zip-linux">
     41        <property name="binzip.dir" value="distributions/Greenstone-${version}-${os.suffix}-binary"/>
     42        <!--
     43        <exec dir="${basedir}" executable="cp"><arg line="-r distributions/web ${binzip.dir}"/></exec>
     44        <exec dir="${basedir}" executable="cp"><arg line="${binzip.dir}/bin/linux/library distributions/Greenstone-${version}-${os.suffix}-binary/cgi-bin"/></exec>
     45        <exec dir="${basedir}" executable="cp"><arg line="${binzip.dir}/bin/linux/oaiserver distributions/Greenstone-${version}-${os.suffix}-binary/cgi-bin"/></exec>
     46        -->
     47
     48        <!-- delete sourcecode -->
     49        <delete dir="${binzip.dir}/common-src"/>
     50        <delete dir="${binzip.dir}/build-src"/>
     51        <delete dir="${binzip.dir}/runtime-src"/>
     52
     53        <!-- delete loose files -->
     54        <delete>
     55            <fileset dir="${binzip.dir}" includes="README*.txt,Uninstall.sh,uninst.jar" excludes="READMEen.txt"/>
     56        </delete>
     57
     58    </target>
     59
     60    <target name="create-binary-zip-windows">
     61        <copy todir="distributions/Greenstone-${version}-${os.suffix}-binary">
     62            <fileset dir="distributions/web"/>
     63        </copy>
     64        <copy todir="distributions/Greenstone-${version}-${os.suffix}-binary/cgi-bin">
     65            <fileset dir="distributions/Greenstone-${version}-${os.suffix}-binary/bin/${shell.os}">
     66                <includes name="library,oaiservr"/>
     67            </fileset>
     68        </copy>
     69        <delete>
     70            <fileset dir="distributions/Greenstone-${version}-${os.suffix}-binary">
     71                <include name="common-src/**/*"/>
     72                <include name="common-src"/>
     73                <include name="build-src/**/*"/>
     74                <include name="build-src"/>
     75                <include name="runtime-src/**/*"/>
     76                <include name="runtime-src"/>
     77                <include name="README*.txt"/>
     78                <exclude name="READMEen.txt"/>
     79                <include name="Uninstaller.bat"/>
     80                <include name="uninst.bat"/>
     81                <include name="uninst.jar"/>
     82            </fileset>
     83        </delete>
     84    </target>
     85
    4086</project>

  • release-kits/shared/linux/rk

    r17633 r17996  
    3636
    3737#cd up a level or two if needed
    38 if [ ! -e "build.properties" ]; then
    39     if [ -e "../build.properties" ]; then
     38if [ ! -e "$rk_name-build.properties" ]; then
     39    if [ -e "../$rk_name-build.properties" ]; then
    4040        RKOLDPWD=`pwd`
    4141        cd ..
    42     elif [ -e "../../build.properties" ]; then
     42    elif [ -e "../../$rk_name-build.properties" ]; then
    4343        RKOLDPWD=`pwd`
    4444        cd ../..

  • release-kits/wirk2/ant-scripts/build.xml

    r17898 r17996  
    1919    <property name="rk.home" value="${wirk2.home}" />
    2020    <property name="rk.os" value="windows" />
     21    <property name="shell.os" value="windows" />
    2122    <property name="os.suffix" value="win32"/>
    2223   

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

    r17967 r17996  
    1010        <antcall target="tweak-files" />
    1111        <antcall target="insert-uninstaller"><param name="script-format" value="bat"/></antcall> <!-- from rk2-targets -->
    12         <antcall target="remove-unneeded-files-1" />
    1312        <antcall target="dist-unzip-packages"/>
    14        
    1513        <antcall target="drop-in-binaries" />
    1614        <antcall target="drop-in-demo-collection" />
    … …  
    1816        <antcall target="drop-in-misc" />
    1917        <antcall target="compile-gli" />
    20         <antcall target="remove-unneeded-files-2" />
     18        <antcall target="remove-unneeded-files" />
    2119
    2220    </target>
    … …  
    9088    </target>
    9189
    92     <target name="remove-unneeded-files-1">
     90    <target name="remove-unneeded-files">
    9391        <delete file="${basedir}/distributions/web/gli/.greenstonestore" />
    94         <!-- delete non-windows source stuff -->
    9592        <delete><fileset dir="${basedir}/distributions/web" includes="*.bash,*.sh,*.csh,install-sh,configure,configure.in,config.sub,config.guess,config.h.in,configtest.pl,Makefile.in,aclocal.m4,acconfig.h,micotest.cpp"/></delete>
    96     </target>
    97 
    98     <target name="remove-unneeded-files-2">
    9993        <delete dir="${basedir}/distributions/web/bin/linux" />
    100         <delete><fileset dir="${basedir}/distributions/web" includes="*.bash,*.sh,*.csh,install-sh,configure,configure.in,config.sub,config.guess,config.h.in,configtest.pl,Makefile.in,aclocal.m4,acconfig.h,micotest.cpp,win32.mak,WIN32cfg.h,Install.txt"/></delete>
     94        <delete><fileset dir="${basedir}/distributions/web" includes="*.bash,*.sh,*.csh,install-sh,configure,configure.in,config.sub,config.guess,config.h.in,configtest.pl,Makefile.in,aclocal.m4,acconfig.h,micotest.cpp,win32.mak,WIN32cfg.h,Install.sh"/></delete>
    10195        <delete><fileset dir="${basedir}/distributions/web/gli" includes="*.sh,*4gs3.bat"/></delete>
    10296        <delete file="${basedir}/distributions/web/bin/java/SignedGatherer.jar" />
Note: See TracChangeset for help on using the changeset viewer.