Ignore:
Timestamp:
2010-01-26T12:52:31+13:00 (14 years ago)
Author:
oranfry
Message:

working on final cleanup of release-kits

File:
1 edited

Legend:

Unmodified
Added
Removed

  • main/trunk/release-kits/kits/rk2/ant-scripts/build.xml

    r21593 r21623  
    1616
    1717    <import file="compile.xml"/>
    18     <import file="create-distribution.xml"/>
    1918    <import file="create-components.xml"/>
    20     <import file="create-installer.xml"/>
     19    <import file="${rk.home}/shared/core/ant-scripts/create-installer.xml"/>
    2120    <import file="wrap.xml"/>
    2221    <import file="create-cdrom-components.xml"/>
    … …  
    2524
    2625    <!-- THE MAIN TARGET -->
    27     <target name="rk2" depends="init,gs2-init,compile,create-distribution,create-components,create-installer,wrap,create-cdrom-components"/>
     26    <target name="rk2" depends="init,gs2-init,compile,create-components,create-installer,wrap,create-cdrom-components"/>
    2827
    2928    <target name="properties">
    … …  
    3837
    3938    <!-- TODO: Move the targets below to the xml file that calls it -->
    40     <target name="checkout-gsdl-gli">
    41         <exec executable="svn">
    42             <arg value="checkout"/>
    43             <arg value="${svn.root}/main/${branch.path}/greenstone2"/>
    44             <arg value="${basedir}/compiled"/>
    45         </exec>
    46                 <exec executable="svn">
    47             <arg value="checkout"/>
    48             <arg value="${svn.root}/main/${branch.path}/gli"/>
    49             <arg value="${basedir}/compiled/gli"/>
    50         </exec>
    51     </target>
    52 
    53     <target name="insert-export-to-cd-package">
    54         <mkdir dir="${gsdl.basedir}/bin/windows"/>
    55         <get src="${server.exe.location}" dest="${gsdl.basedir}/bin/windows/server.exe"/>
    56         <get src="${svn.root}/main/${branch.path}/binaries/windows/bin/Setup.exe" dest="${gsdl.basedir}/bin/windows/Setup.exe"/>
    57         <get src="${svn.root}/main/${branch.path}/binaries/windows/bin/gssetup.exe" dest="${gsdl.basedir}/bin/windows/gssetup.exe"/>
    58     </target>
    5939
    6040    <target name="create-binary-zip-unix">
    … …  
    7959    </target>
    8060
    81     <target name="create-binary-zip-windows">
    82         <property name="binzip.dir" value="distributions/Greenstone-${version}-${os.suffix}-binary"/>
    83         <copy todir="${binzip.dir}">
    84             <fileset dir="distributions/web"/>
    85         </copy>
    86 
    87         <!-- delete sourcecode -->
    88         <delete dir="${binzip.dir}/common-src"/>
    89         <delete dir="${binzip.dir}/build-src"/>
    90         <delete dir="${binzip.dir}/runtime-src"/>
    91 
    92         <!-- delete loose files -->
    93         <delete>
    94             <fileset dir="${binzip.dir}" includes="README*.txt,Uninstall.bat,Uninst.bat,uninst.jar,win32.mak,win32cfg.h,makegs2.bat" excludes="READMEen.txt"/>
    95         </delete>
    96     </target>
    97 
    98     <target name="dist-clean-sourcecode">
    99 
    100         <!-- delete the sourcecode -->
    101         <delete>
    102             <fileset dir="distributions/web" includes="Makefile,config.cache,config.h,config.log,stamp-h,config.status"/>
    103         </delete>
    104         <delete dir="distributions/web/common-src"/>
    105         <delete dir="distributions/web/build-src"/>
    106         <delete dir="distributions/web/runtime-src"/>
    107         <delete>
    108             <fileset dir="distributions/web" includes="Install.txt,acconfig.h,aclocal.m4,config.guess,config.sub,configtest.pl,configure,configure.in,install-sh,Makefile.in,micotest.cpp,config.h.in,win32.mak,win32cfg.h"/>
    109         </delete>
    110 
    111         </target>
    112 
    11361    <target name="dist-unzip-packages">
    11462        <untar src="${basedir}/distributions/web/common-src/packages/sqlite/sqlite-amalgamation-3.5.9.tar.gz" dest="${basedir}/distributions/web/common-src/packages/sqlite" compression="gzip"/>
    11563        <delete file="${basedir}/distributions/web/common-src/packages/sqlite/sqlite-amalgamation-3.5.9.tar.gz"/>
    116     </target>
    117 
    118     <target name="make-common-src">
    119         <exec dir="${basedir}/compiled/common-src" executable="make" failonerror="true"/>
    120         <!--<exec dir="${basedir}/compiled/common-src" executable="make" failonerror="true"><arg value="install"/></exec>-->
    121     </target>
    122 
    123     <target name="compile-gli">
    124 
    125         <if><bool><or><equals arg1="${rk.os}" arg2="linux"/><equals arg1="${rk.os}" arg2="mac"/></or></bool>
    126             <property name="script.format" value="sh"/>
    127         <else><if><bool><equals arg1="${rk.os}" arg2="windows"/></bool>
    128             <property name="script.format" value="bat"/>
    129         </if></else></if>
    130        
    131         <echo>Compiling gli...</echo>
    132         <exec dir="${glibasedir}" executable="${glibasedir}/makegli.${script.format}"/>
    133 
    134         <echo>Creating jar...</echo>
    135         <exec dir="${glibasedir}" executable="${glibasedir}/makejar.${script.format}"/>
    136 
    137         <echo>Cleaning up intermediate files...</echo>
    138         <delete dir="${glibasedir}/jar"/>
    139         <delete dir="${glibasedir}/classes/org"/>
    140 
    141         <if><bool><isset property="gsdlbasedir"/></bool>
    142             <echo>Putting gli server jar in a better place</echo>
    143             <exec executable="mv" failonerror="true">
    144                 <arg line="${glibasedir}/GLIServer.jar ${gsdlbasedir}/bin/java" />
    145             </exec>
    146         </if>
    147 
    14864    </target>
    14965
Note: See TracChangeset for help on using the changeset viewer.