Changeset 23612 for main/trunk


Ignore:
Timestamp:
2011-01-19T14:27:14+13:00 (13 years ago)
Author:
sjm84
Message:

Various fixes and tidying up

Location:
main/trunk/release-kits/kits
Files:
6 edited

Legend:

Unmodified
Added
Removed

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

    r21652 r23612  
    11<?xml version="1.0" encoding="utf-8" ?>
    22<!--
    3         .......................................................... 
     3        ..........................................................
    44        September 2009
    55        Release Kit for Greenstone2 (rk2)

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

    r23610 r23612  
    104104            <!-- unzip expat if the version is less that 2.84 -->
    105105            <if><bool><and>
    106                   <equals arg1="${post.2.83.version}" arg2="false"/>
     106                <equals arg1="${post.2.83.version}" arg2="false"/>
    107107            </and></bool>
    108108                <unzip src="${basedir}/compiled/common-src/packages/windows/expat/expat.zip" dest="${basedir}/compiled/common-src/packages/windows/expat"/>
    … …  
    116116            <if><bool><not><available file="${basedir}/compiled/bin/windows"/></not></bool>
    117117                <if><bool><and>
    118                       <equals arg1="${post.2.83.version}" arg2="true"/>
     118                    <equals arg1="${post.2.83.version}" arg2="true"/>
    119119                </and></bool>
    120120                   

  • main/trunk/release-kits/kits/rk2/installer/build.xml

    r23593 r23612  
    124124        <echo>Filling in concrete values in config files</echo>
    125125        <copy file="${installDir}/cgi-bin/gsdlsite.cfg.in" tofile="${installDir}/cgi-bin/gsdlsite.cfg"/>
    126         <rsr file="${installDir}/cgi-bin/gsdlsite.cfg" pattern="&quot;?\*\*GSDLHOME\*\*&quot;?" replacement="&quot;${installDir.local}&quot;"/>
     126        <rsr file="${installDir}/cgi-bin/gsdlsite.cfg" pattern="&quot;?\*\*GSDLHOME\*\*&quot;?" replacement="&quot;${installDir.local}&quot;"/>
    127127
    128128        <echo>Correcting perl shebangs in perl scripts</echo>

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

    r21748 r23612  
    11<?xml version="1.0" encoding="utf-8" ?>
    22<!--
    3         .......................................................... 
     3        ..........................................................
    44        August 2009
    55        Release Kit for Greenstone3 (rk3)

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

    r23051 r23612  
    4646                <isgreaterthan arg1="${branch.tag.version}" arg2="2.83"/>
    4747            </or></bool>
    48                 <echo>COMPILING GNOME LIB EXTENSION</echo>
     48                <echo>EXPORTING GNOME LIB EXTENSION</echo>
    4949                <exec executable="svn">
    50                     <arg value="checkout"/>
    51                     <arg value="${svn.root}/gs2-extensions/gnome-lib/trunk/src"/>
    52                     <arg value="${basedir}/compiled/ext/gnome-lib"/>
     50                    <arg value="export"/>
     51                    <arg value="${svn.root}/gs2-extensions/gnome-lib/trunk/gnome-lib-minimal-${os.shell}${extension-x64}.tar.gz"/>
     52                    <arg value="${basedir}/compiled/ext/gnome-lib-${os.shell}.tar.gz"/>
    5353                </exec>
    54                 <exec executable="/bin/bash" dir="${basedir}/compiled/ext/gnome-lib">
     54
     55                <exec executable="tar" dir="${basedir}/compiled/ext">
     56                    <arg value="xvzf"/>
     57                    <arg value="gnome-lib-${os.shell}.tar.gz"/>
     58                </exec>
     59
     60                <exec executable="/bin/bash" dir="${basedir}/compiled/ext/gnome-lib-minimal">
    5561                    <arg value="-c"/>
    56                     <arg value="./CASCADE-MAKE.sh"/>
     62                    <arg value="source devel.bash"/>
    5763                </exec>
    5864                <echo>DONE COMPILING GNOME LIB EXTENSION</echo>

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

    r21648 r23612  
    88
    99        <!-- core -->
    10         <antcall target="create-component"><param name="component" value="core"/></antcall>
     10        <antcall target="create-component">
     11            <param name="component" value="core"/>
     12            <param name="ext-x64" value=""/>
     13        </antcall>
    1114
    1215        <!-- tomcat -->
    13         <antcall target="create-component"><param name="component" value="tomcat"/></antcall>
     16        <antcall target="create-component">
     17            <param name="component" value="tomcat"/>
     18            <param name="ext-x64" value=""/>
     19        </antcall>
    1420
    1521        <!-- imageagick -->
    16         <antcall target="create-component"><param name="component" value="imagemagick"/></antcall>
     22        <antcall target="create-component">
     23            <param name="component" value="imagemagick"/>
     24            <param name="ext-x64" value=""/>
     25        </antcall>
    1726
    1827        <!-- (windows and mac only) -->
    1928        <if><bool><or><equals arg1="${rk.os}" arg2="windows"/><equals arg1="${rk.os}" arg2="mac"/></or></bool>
    2029            <!-- ghostscript -->
    21             <antcall target="create-component"><param name="component" value="ghostscript"/></antcall>
     30            <antcall target="create-component">
     31                <param name="component" value="ghostscript"/>
     32                <param name="ext-x64" value=""/>
     33            </antcall>
    2234        </if>
    2335
Note: See TracChangeset for help on using the changeset viewer.