Changeset 21658


Ignore:
Timestamp:
2010-01-27T13:11:36+13:00 (12 years ago)
Author:
oranfry
Message:

fixes

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

Legend:

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

    r21652 r21658  
    142142
    143143        <!-- build demo collection -->
    144         <!-- linux, mac -->
    145         <if><bool><or><equals arg1="${rk.os}" arg2="linux"/><equals arg1="${rk.os}" arg2="mac"/></or></bool>
    146             <exec dir="${basedir}/compiled" executable="/bin/bash" failonerror="true">
    147                 <arg value="-c"/>
    148                 <arg value="
    149                     source setup.bash &amp;&amp; \
    150                     import.pl --removeold demo &amp;&amp; \
    151                     buildcol.pl --removeold demo &amp;&amp; \
    152                     rm -rf collect/demo/index collect/demo/archives &amp;&amp; \
    153                     mv collect/demo/building collect/demo/index"/>
    154             </exec>
    155 
    156         <!-- windows -->
    157         <else><if><bool><equals arg1="${rk.os}" arg2="windows"/></bool>
    158             <!-- the envs on these execs simulate the environment when you run setup.bat -->
    159             <exec dir="${basedir}/compiled" executable="${basedir}/compiled/bin/windows/perl/bin/perl.exe">
    160                 <arg line="bin\script\import.pl --removeold demo"/>
    161                 <env key="GSDLHOME" value="${basedir}/compiled"/>
    162                 <env key="GSDLCOLLECTDIR" value="${basedir}/compiled/collect"/>
    163                 <env key="GSDLOS" value="windows"/>
    164                 <env key="PATH" value="${basedir}\compiled\bin\windows\perl\bin;${basedir}\compiled\bin\windows;${basedir}\compiled\bin\script"/>
    165             </exec>
    166             <exec dir="${basedir}/compiled" executable="${basedir}/compiled/bin/windows/perl/bin/perl.exe">
    167                 <arg line="bin\script\buildcol.pl --removeold demo"/>
    168                 <env key="GSDLHOME" value="${basedir}/compiled"/>
    169                 <env key="GSDLCOLLECTDIR" value="${basedir}/compiled/collect"/>
    170                 <env key="GSDLOS" value="windows"/>
    171                 <env key="PATH" value="${basedir}\compiled\bin\windows\perl\bin;${basedir}\compiled\bin\windows;${basedir}\compiled\bin\script"/>
    172             </exec>
    173             <delete dir="${basedir}/compiled/collect/demo/index"/>
    174             <move file="${basedir}/compiled/collect/demo/building" tofile="${basedir}/compiled/collect/demo/index"/>
    175 
    176         </if></else></if>
     144        <!-- the envs on these execs simulate the environment when you run setup.bat
     145        <exec dir="${basedir}/compiled" executable="perl">
     146            <arg line="bin/script/import.pl - -removeold demo"/>
     147            <env key="GSDLHOME" path="${basedir}/compiled"/>
     148            <env key="GSDLCOLLECTDIR" path="${basedir}/compiled/collect"/>
     149            <env key="GSDLOS" value="windows"/>
     150            <env key="PATH" path="${basedir}/compiled/bin/windows/perl/bin:${basedir}/compiled/bin/windows:${basedir}/compiled/bin/script:${env.PATH}"/>
     151        </exec>
     152        <exec dir="${basedir}/compiled" executable="perl">
     153            <arg line="bin/script/buildcol.pl - -removeold demo"/>
     154            <env key="GSDLHOME" path="${basedir}/compiled"/>
     155            <env key="GSDLCOLLECTDIR" path="${basedir}/compiled/collect"/>
     156            <env key="GSDLOS" value="windows"/>
     157            <env key="PATH" path="${basedir}/compiled/bin/windows/perl/bin:${basedir}/compiled/bin/windows:${basedir}/compiled/bin/script:${env.PATH}"/>
     158        </exec>
     159        <delete dir="${basedir}/compiled/collect/demo/index"/>
     160        <move file="${basedir}/compiled/collect/demo/building" tofile="${basedir}/compiled/collect/demo/index"/>
     161        -->
    177162
    178163        <!-- delete the source code -->
  • main/trunk/release-kits/shared/core/ant-scripts/wrap.xml

    r21634 r21658  
    6969        <else><if><bool><equals arg1="${rk.os}" arg2="linux"/></bool>
    7070            <!-- create the build directory -->
    71             <mkdir dir="wrapped-installer/build"/>
     71            <mkdir dir="wrapped-installer"/>
    7272
    7373            <!-- copy the source into place -->
    74             <copy todir="wrapped-installer/build" overwrite="true">
     74            <copy todir="wrapped-installer" overwrite="true">
    7575                <fileset file="${rk.home}/shared/linux/wrapper.cpp"/>
    7676                <fileset dir="${rk.home}/shared/core/search4j" includes="libsearch4j.cpp,libsearch4j.h"/>
     
    7878
    7979            <!-- copy bundled files into place -->
    80             <copy todir="wrapped-installer/build" file="${rk.home}/shared/linux/${linux-java.installer}"/>
    81             <copy tofile="wrapped-installer/build/greenstone.jar" file="installer/Greenstone-${version}-${os.suffix}.jar"/>
     80            <copy todir="wrapped-installer" file="${rk.home}/shared/linux/${linux-java.installer}"/>
     81            <copy tofile="wrapped-installer/greenstone.jar" file="installer/Greenstone-${version}-${os.suffix}.jar"/>
    8282
    8383            <!-- substitute in real values -->
  • main/trunk/release-kits/shared/greenstone2/ant-scripts/greenstone2-shared.xml

    r21652 r21658  
    88-->
    99<project name="greenstone2-targets">
     10
     11    <property name="version.major" value="2"/>
    1012
    1113    <target name="gs2-init">
  • main/trunk/release-kits/shared/greenstone3/ant-scripts/greenstone3-shared.xml

    r21652 r21658  
    1010<project name="greenstone3-targets">
    1111
     12    <property name="version.major" value="3"/>
    1213    <target name="gs3-init">
    1314
Note: See TracChangeset for help on using the changeset viewer.