Changeset 21652

Show
Ignore:
Timestamp:
27.01.2010 09:59:08 (9 years ago)
Author:
oranfry
Message:

got properties target working for all kits, plus some fixes

Location:
main/trunk/release-kits
Files:
11 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/release-kits/bin/rk

    r21394 r21652  
    2727elif [ "$rk_name" == "rk3" ]; then 
    2828        rk_fullname="Release Kit for Greenstone3" 
     29elif [ "$rk_name" == "sork2" ]; then 
     30        rk_fullname="Source Code Release Kit for Greenstone2" 
     31elif [ "$rk_name" == "sork3" ]; then 
     32        rk_fullname="Source Code Release Kit for Greenstone3" 
     33elif [ "$rk_name" == "cdrk2" ]; then 
     34        rk_fullname="CD-ROM Release Kit for Greenstone2" 
     35elif [ "$rk_name" == "derk" ]; then 
     36        rk_fullname="Documented Examples Release Kit" 
    2937else 
    3038    show_help 
    31     exit 
    32 fi 
    33  
    34  
    35 #cd up a level or two if needed 
    36 if [ -e "$rk_name-build.properties" ]; then 
    37     pushd . &>/dev/null 
    38 elif [ -e "../$rk_name-build.properties" ]; then 
    39     pushd .. &>/dev/null 
    40 elif [ -e "../../$rk_name-build.properties" ]; then 
    41     pushd ../.. &>/dev/null 
    42 else 
    43     echo "couldn't find file $rk_name-build.properties" 
    44     echo "it should exist in the top level of the release" 
    4539    exit 
    4640fi 
     
    7670fi 
    7771 
    78 #go back to original dir 
    79 popd &>/dev/null 
  • main/trunk/release-kits/kits/cdrk2/ant-scripts/build.xml

    r21651 r21652  
    201201 
    202202    <target name="properties" depends="core-properties"> 
    203         <echo>Optional Properties:</echo> 
    204         <echo>software.archive.linux                      the URL to the linux archive of components</echo> 
    205         <echo>software.archive.windows                    the URL to the windows archive of components</echo> 
    206         <echo>software.archive.mac                        the URL to the mac archive of components</echo> 
    207         <echo>software.archive.documented-examples        the URL to the archive of documented examples</echo> 
    208         <echo/> 
     203        <echo>software.archive.linux                      (optional)  the URL to the linux archive of components</echo> 
     204        <echo>software.archive.windows                    (optional)  the URL to the windows archive of components</echo> 
     205        <echo>software.archive.mac                        (optional)  the URL to the mac archive of components</echo> 
     206        <echo>software.archive.documented-examples        (optional)  the URL to the archive of documented examples</echo> 
    209207    </target> 
    210208 
  • main/trunk/release-kits/kits/rk2/ant-scripts/build.xml

    r21650 r21652  
    2626 
    2727    <!-- target to show properties in rk2-build.properties --> 
    28     <target name="properties" depends="core-properties"/> 
     28    <target name="properties" depends="core-properties,gs2-properties"/> 
    2929 
    3030</project> 
  • main/trunk/release-kits/kits/rk2/ant-scripts/compile.xml

    r21648 r21652  
    270270 
    271271        <!-- tidy up gli --> 
    272         <antcall target="gli-tidy-for-dist"><param name="glibasedir" value="compiled/gli"/></target> 
     272        <antcall target="gli-tidy-for-dist"><param name="glibasedir" value="compiled/gli"/></antcall> 
    273273 
    274274        <!-- mac and linux: insert export to cdrom package --> 
  • main/trunk/release-kits/kits/rk3/ant-scripts/build.xml

    r21650 r21652  
    1414    <!-- IMPORT OTHER ANT SCRIPTS --> 
    1515    <import file="${rk.home}/shared/core/ant-scripts/shared.xml"/> 
    16     <import file="${rk.home}/shared/greenstone2/ant-scripts/greenstone3-shared.xml"/> 
     16    <import file="${rk.home}/shared/greenstone3/ant-scripts/greenstone3-shared.xml"/> 
    1717 
    1818    <import file="compile.xml"/> 
     
    2929 
    3030    <!-- target to show properties in rk3-build.properties --> 
    31     <target name="properties" depends="core-properties"/> 
     31    <target name="properties" depends="core-properties,gs3-properties"/> 
    3232 
    3333    <!-- create the property set to be forwarded to greenstone3 --> 
  • main/trunk/release-kits/kits/rk3/ant-scripts/compile.xml

    r21630 r21652  
    99            <arg value="${svn.root}/main/${branch.path}/greenstone3"/> 
    1010            <arg value="compiled"/> 
    11             <arg value="-r"><arg value="${branch.revision}"/> 
     11            <arg value="-r"/><arg value="${branch.revision}"/> 
    1212        </exec> 
    1313 
  • main/trunk/release-kits/kits/sork2/ant-scripts/build.xml

    r21650 r21652  
    123123    </target> 
    124124 
    125     <target name="properties" depends="core-properties"/> 
     125    <target name="properties" depends="core-properties,gs2-properties"/> 
    126126 
    127127</project> 
  • main/trunk/release-kits/kits/sork3/ant-scripts/build.xml

    r21650 r21652  
    99 
    1010<project name="sork3-build" default="sork3"> 
    11  
    12     <!-- CONSTANTS --> 
    13  
    14     <!-- for the benefit of the shared scripts, set release-kit home --> 
    15     <property name="rk.name" value="sork3"/> 
    16     <property name="rk.home" value="${sork3.home}" /> 
    17     <property name="rk.os" value="multi" /> 
    18     <property name="os.suffix" value="AnyPlatform"/> 
    1911     
    2012    <!-- IMPORT OTHER ANT SCRIPTS --> 
     
    2315 
    2416    <!-- THE MAIN TARGET --> 
    25     <target name="sork3" depends="init"> 
     17    <target name="sork3" depends="init,gs3-init"> 
    2618 
    2719        <!-- store the name of the distribution --> 
     
    7567    </target> 
    7668 
    77     <target name="properties" depends="core-properties"/> 
     69    <target name="properties" depends="core-properties,gs3-properties"/> 
    7870 
    7971</project> 
  • main/trunk/release-kits/shared/core/ant-scripts/shared.xml

    r21648 r21652  
    193193    <!-- show the core properties of all release-kits --> 
    194194    <target name="core-properties"> 
    195         <echo>Required Properties:</echo> 
    196         <echo>version             the version string for the release</echo> 
    197         <echo/> 
    198         <echo>Optional Properties:</echo> 
    199         <echo>branch.path         the branch of Greenstone to make a release of. Eg: tags/2.81. Default: trunk.</echo> 
    200         <echo>branch.revision     the revision of Greenstone to make a release of. Eg: 18273. Default: HEAD.</echo> 
    201         <echo/> 
     195        <echo>version             (required)  the version string for the release</echo> 
     196        <echo>branch.path         (optional)  the branch of Greenstone to make a release of. Eg: tags/2.81. Default: trunk.</echo> 
     197        <echo>branch.revision     (optional)  the revision of Greenstone to make a release of. Eg: 18273. Default: HEAD.</echo> 
    202198    </target> 
    203199 
  • main/trunk/release-kits/shared/greenstone2/ant-scripts/greenstone2-shared.xml

    r21648 r21652  
    1414    </target> 
    1515 
     16    <target name="gs2-properties"> 
     17        <echo>server.exe.location          (optional)  the version string for the release</echo> 
     18    </target> 
     19 
    1620</project> 
    1721     
  • main/trunk/release-kits/shared/greenstone3/ant-scripts/greenstone3-shared.xml

    r21648 r21652  
    2525        <echoproperties><propertyset refid="forward.properties"/></echoproperties> 
    2626 
     27    </target> 
     28 
     29    <target name="gs3-properties"> 
     30        <echo>forward.* (eg, forward.proxy.host)    (optional)  any property to forward to greenstone3 during build</echo> 
    2731    </target> 
    2832