Ignore:
Timestamp:
2009-12-22T14:52:32+13:00 (14 years ago)
Author:
oranfry
Message:

moving specific stuff out of general area

Location:
main/trunk/release-kits/kits
Files:
8 edited
2 moved

Legend:

Unmodified
Added
Removed

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

    r21388 r21394  
    1010<project name="rk2-build" default="rk2">
    1111
    12     <!-- CONSTANTS -->
    13 
    14     <!-- for the benefit of the shared scripts, set release-kit home -->
    15     <property name="rk.name" value="rk2"/>
    16     <property name="rk.home" value="${rk2.home}" />
    17 
    1812    <!-- IMPORT OTHER ANT SCRIPTS -->
    19     <import file="../../../shared/core/ant-scripts/init.xml"/>
    20     <import file="../../../shared/core/ant-scripts/operations-on-gli.xml"/>
    21     <import file="../../../shared/greenstone2/ant-scripts/rk2-targets.xml"/>
     13    <import file="${rk.home}/shared/core/ant-scripts/init.xml"/>
     14    <import file="${rk.home}/shared/core/ant-scripts/operations-on-gli.xml"/>
     15    <import file="${rk.home}/shared/greenstone2/ant-scripts/rk2-targets.xml"/>
    2216
    2317    <import file="compile.xml"/>
    … …  
    3125
    3226    <!-- THE MAIN TARGET -->
    33     <target name="rk2" depends="init,gs2-init">
    34         <antcall target="compile"/>
    35         <antcall target="create-distribution"/>
    36         <antcall target="create-components"/>
    37         <antcall target="create-installer"/>
    38         <antcall target="wrap"/>
    39         <antcall target="create-cdrom-components"/>
    40     </target>
     27    <target name="rk2" depends="init,gs2-init,compile,create-distribution,create-components,create-installer,wrap,create-cdrom-components"/>
    4128
    4229    <target name="properties">
    … …  
    5037    </target>
    5138
     39    <!-- 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>
     59
     60    <target name="create-binary-zip-unix">
     61        <property name="binzip.dir" value="distributions/Greenstone-${version}-${os.suffix}-binary"/>
     62
     63        <delete dir="${binzip.dir}"/>
     64        <exec dir="${basedir}" executable="cp"><arg line="-r distributions/web ${binzip.dir}"/></exec>
     65
     66        <!-- delete sourcecode -->
     67        <delete dir="${binzip.dir}/common-src"/>
     68        <delete dir="${binzip.dir}/build-src"/>
     69        <delete dir="${binzip.dir}/runtime-src"/>
     70
     71        <!-- delete loose files -->
     72        <delete>
     73            <fileset
     74                dir="${binzip.dir}"
     75                includes="README*.txt,Uninstall.sh,uninst.jar,acconfig.h,aclocal.m4,config.guess,config.sub,configtest.pl,configure,configure.in,install-sh,Makefile.in,micotest.cpp,config.h.in"
     76                excludes="READMEen.txt"/>
     77        </delete>
     78
     79    </target>
     80
     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
     113    <target name="dist-unzip-packages">
     114        <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"/>
     115        <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
     148    </target>
     149
     150    <target name="copy-greenstone2-installer-files">
     151        <!-- the installer descriptors -->
     152        <copy todir="installer" file="${rk.home}/kits/rk2/installer/antinstall-config.xml" overwrite="true"/>
     153        <copy todir="installer" file="${rk.home}/kits/rk2/installer/installer/build.xml" overwrite="true"/>
     154    </target>
     155
    52156</project>

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

    r21319 r21394  
    22<project name="rk2-compile">
    33
    4     <target name="compile">
     4    <target name="compile" depends="init,gs2-init">
    55
    66        <antcall target="checkout-gsdl-gli" />
    … …  
    144144        <!-- linux, mac -->
    145145        <if><bool><equals arg1="${rk.os}" arg2="linux"/></bool>
    146             <exec dir="${basedir}/compiled" executable="${rk2.home}/resources/build-demo.sh" failonerror="true"/>
     146            <exec dir="${basedir}/compiled" executable="${rk.home}/kits/rk2/resources/build-demo.sh" failonerror="true"/>
    147147
    148148        <!-- windows -->
    … …  
    194194
    195195    <target name="compile-c-code">
    196         <copy file="${wirk2.home}/resources/compile.bat" todir="${basedir}/compiled" overwrite="true"/>
     196        <copy file="${rk.home}/kits/rk2/resources/compile.bat" todir="${basedir}/compiled" overwrite="true"/>
    197197        <exec dir="${basedir}/compiled" executable="nmake"><arg value="/f"/><arg value="win32.mak"/><arg value="clean"/></exec>
    198198        <exec dir="${basedir}/compiled" executable="nmake"><arg value="/f"/><arg value="win32.mak"/><arg value="APACHE_HTTPD=1"/></exec>
    … …  
    203203    </target>
    204204
     205    <target name="drop-in-docs">
     206        <echo level="info">Dropping gsdl docs into distribution</echo>
     207        <copy todir="${gsdl.basedir}" overwrite="true">
     208            <fileset dir="${rk.home}/shared/greenstone2/docs" excludes="READMEar.txt,READMEes.txt,READMEfr.txt,READMEru.txt"/>
     209        </copy>
     210    </target>
     211
     212
    205213</project>

  • main/trunk/release-kits/kits/rk2/ant-scripts/create-cdrom-components.xml

    r21311 r21394  
    106106            <mkdir dir="cdrom/dist/Java/Linux"/>
    107107            <exec executable="cp">
    108                 <arg value="${rk2.home}/linux/jre_bin"/>
     108                <arg value="${rk.home}/shared/linux/jre_bin"/>
    109109                <arg value="cdrom/dist/Java/Linux"/>
    110110            </exec>
    111111            <!--
    112112            don't extract to save space
    113             <exec dir="cdrom/dist/Java/Linux" executable="${rk2.home}/linux/jre_bin"/>
     113            <exec dir="cdrom/dist/Java/Linux" executable="${rk.home}/shared/linux/jre_bin"/>
    114114            <exec dir="cdrom/dist/Java/Linux" executable="tar"><arg value="-xf"/><arg value="jre.tar"/></exec>
    115115            <delete file="cdrom/dist/Java/Linux/jre.tar"/>
    … …  
    118118        <else><if><bool><or><equals arg1="${rk.os}" arg2="windows"/></or></bool>
    119119            <mkdir dir="cdrom/dist/Java/Windows"/>
    120             <exec dir="cdrom/dist/Java/Windows" executable="${rk2.home}/windows/wrapper/jre.exe"/>
     120            <exec dir="cdrom/dist/Java/Windows" executable="${rk.home}/shared/windows/wrapper/jre.exe"/>
    121121
    122122        </if></else></if>
    … …  
    163163            <mkdir dir="wrapped-installer/cdrom"/>
    164164            <!-- create app for cdrom installer -->
    165             <copy todir="cdrom/dist/Greenstone-${version}-MacOS.app"><fileset dir="${rk2.home}/mac/Wrapper.app"/></copy>
    166             <copy todir="cdrom/dist/Greenstone-${version}-MacOS.app/Contents/Resources" file="${rk2.home}/greenstone2/icon/icon.icns"/>
     165            <copy todir="cdrom/dist/Greenstone-${version}-MacOS.app"><fileset dir="${rk.home}/shared/mac/Wrapper.app"/></copy>
     166            <copy todir="cdrom/dist/Greenstone-${version}-MacOS.app/Contents/Resources" file="${rk.home}/shared/greenstone2/icon/icon.icns"/>
    167167            <chmod file="cdrom/dist/Greenstone-${version}-MacOS.app/Contents/MacOS/JavaApplicationStub" perm="+x"/>
    168168

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

    r21311 r21394  
    22<project name="rk2-create-components">
    33
    4     <target name="create-components">
     4    <target name="create-components" depends="init,gs2-init">
    55
    66        <antcall target="prepare-component"><param name="component" value="core"/></antcall>

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

    r21393 r21394  
    22<project name="rk2-create-distribution">
    33
    4     <target name="create-distribution">
     4    <target name="create-distribution" depends="init,gs2-init">
    55
    66        <antcall target="copy-compiled-to-dist"/>

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

    r21311 r21394  
    22<project name="rk2-create-installer">
    33
    4     <target name="create-installer">
     4    <target name="create-installer" depends="init,gs2-init">
    55        <antcall target="copy-installer-files"/>
    66        <antcall target="make-installer-files-concrete"/>
    … …  
    1111
    1212        <copy todir="installer/classes" overwrite="true" file="distributions/web/LICENSE.txt"/>
    13         <unjar src="${rk2.home}/core/ant-tasks/greenstone/anttasks.jar" dest="installer/classes"/>
    14         <unjar src="${rk2.home}/core/lib/crypt.jar" dest="installer/classes"/>
     13        <unjar src="${rk.home}/shared/core/ant-tasks/greenstone/anttasks.jar" dest="installer/classes"/>
     14        <unjar src="${rk.home}/shared/core/lib/crypt.jar" dest="installer/classes"/>
    1515
    1616        <!-- windows -->
    1717        <if><bool><equals arg1="${rk.os}" arg2="windows"/></bool>
    18             <fileset dir="${rk2.home}/windows/7za" includes="7za.exe"/>
     18            <fileset dir="${rk.home}/shared/windows/7za" includes="7za.exe"/>
    1919        <!-- linux and mac -->
    2020        <else><if><bool><or><equals arg1="${rk.os}" arg2="linux"/><equals arg1="${rk.os}" arg2="mac"/></or></bool>
    21             <unjar src="${rk2.home}/core/ant-tasks/7z-ant/7z.jar" dest="installer/classes"/>
     21            <unjar src="${rk.home}/shared/core/ant-tasks/7z-ant/7z.jar" dest="installer/classes"/>
    2222        </if></else></if>
    2323

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

    r21311 r21394  
    22<project name="rk2-wrap" default="wrap">
    33
    4     <target name="wrap">
     4    <target name="wrap" depends="init,gs2-init">
    55
    66        <mkdir dir="products"/>
    … …  
    1313
    1414            <!-- copy wrapper source into place -->
    15             <antcall target="get-copy-of-wrapper-source"><param name="todir" value="wrapped-installer"/></antcall>
     15            <copy todir="wrapped-installer" overwrite="true">
     16                <fileset dir="${rk.home}/shared/windows/wrapper"/>
     17                <fileset dir="${rk.home}/shared/greenstone2/wrapper" includes="*.bmp"/>
     18                <fileset dir="${rk.home}/shared/greenstone2/icon" includes="icon.ico"/>
     19                <fileset dir="${rk.home}/shared/core/search4j" includes="libsearch4j.cpp,libsearch4j.h"/>
     20            </copy>
    1621
    1722            <!-- tweak files for wrapping -->
    … …  
    2429
    2530            <!-- split the resources into chunks, creating a resource script of the chunks -->
    26             <copy todir="${basedir}/wrapped-installer" file="${rk2.home}/windows/wrapper/wrapper.rc" overwrite="true"/>
     31            <copy todir="${basedir}/wrapped-installer" file="${rk.home}/shared/windows/wrapper/wrapper.rc" overwrite="true"/>
    2732            <rsplit
    28                 resource="${rk2.home}/windows/wrapper/${windows-java.installer}"
     33                resource="${rk.home}/shared/windows/wrapper/${windows-java.installer}"
    2934                outputDir="${basedir}/wrapped-installer"                   
    3035                resourceScript="${basedir}/wrapped-installer/wrapper.rc"
    … …  
    6469            <!-- create and setup the build directory -->
    6570            <mkdir dir="${basedir}/wrapped-installer"/>
    66             <copy todir="${basedir}/wrapped-installer" file="${rk2.home}/linux/wrapper.cpp"/>
    67             <copy todir="${basedir}/wrapped-installer" file="${rk2.home}/core/search4j/libsearch4j.cpp"/>
    68             <copy todir="${basedir}/wrapped-installer" file="${rk2.home}/core/search4j/libsearch4j.h"/>
     71            <copy todir="${basedir}/wrapped-installer" file="${rk.home}/shared/linux/wrapper.cpp"/>
     72            <copy todir="${basedir}/wrapped-installer" file="${rk.home}/shared/core/search4j/libsearch4j.cpp"/>
     73            <copy todir="${basedir}/wrapped-installer" file="${rk.home}/shared/core/search4j/libsearch4j.h"/>
    6974
    7075            <!-- copy bundled files -->
    71             <copy todir="${basedir}/wrapped-installer" file="${rk2.home}/linux/${linux-java.installer}"/>
     76            <copy todir="${basedir}/wrapped-installer" file="${rk.home}/shared/linux/${linux-java.installer}"/>
    7277            <copy tofile="${basedir}/wrapped-installer/greenstone2.jar" file="${basedir}/installer/Greenstone-${version}-linux.jar"/>
    7378
    … …  
    117122
    118123            <!-- create app for main installer -->
    119             <copy todir="${basedir}/wrapped-installer/Greenstone${version}.app"><fileset dir="${rk2.home}/mac/Wrapper.app"/></copy>
    120             <copy todir="${basedir}/wrapped-installer/Greenstone${version}.app/Contents/Resources" file="${rk2.home}/greenstone2/icon/icon.icns"/>
     124            <copy todir="${basedir}/wrapped-installer/Greenstone${version}.app"><fileset dir="${rk.home}/shared/mac/Wrapper.app"/></copy>
     125            <copy todir="${basedir}/wrapped-installer/Greenstone${version}.app/Contents/Resources" file="${rk.home}/shared/greenstone2/icon/icon.icns"/>
    121126            <chmod file="${basedir}/wrapped-installer/Greenstone${version}.app/Contents/MacOS/JavaApplicationStub" perm="ug+x"/>
    122127

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

    r21202 r21394  
    136136    </target>
    137137
     138    <target name="export-gsdl-gli">
     139        <delete dir="${dest}"/>
     140        <exec executable="svn">
     141            <arg value="export"/>
     142            <arg value="${svn.root}/main/${branch.path}/greenstone2"/>
     143            <arg value="${dest}"/>
     144        </exec>
     145        <exec executable="svn">
     146            <arg value="export"/>
     147            <arg value="${svn.root}/main/${branch.path}/gli"/>
     148            <arg value="${dest}/gli"/>
     149        </exec>
     150    </target>
     151
    138152
    139153</project>
Note: See TracChangeset for help on using the changeset viewer.