Changeset 22111

Show
Ignore:
Timestamp:
19.05.2010 12:36:42 (9 years ago)
Author:
sjm84
Message:

Uncommented out some code that was responsible for building the demo collection, it should now work for Windows and Linux

Files:
1 modified

Legend:

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

    r22097 r22111  
    167167 
    168168        <!-- build demo collection --> 
    169         <!-- the envs on these execs simulate the environment when you run setup.bat  
    170         <exec dir="${basedir}/compiled" executable="perl"> 
    171             <arg line="bin/script/import.pl - -removeold demo"/> 
    172             <env key="GSDLHOME" path="${basedir}/compiled"/> 
    173             <env key="GSDLCOLLECTDIR" path="${basedir}/compiled/collect"/> 
    174             <env key="GSDLOS" value="windows"/> 
    175             <env key="PATH" path="${basedir}/compiled/bin/windows/perl/bin:${basedir}/compiled/bin/windows:${basedir}/compiled/bin/script:${env.PATH}"/> 
    176         </exec> 
    177         <exec dir="${basedir}/compiled" executable="perl"> 
    178             <arg line="bin/script/buildcol.pl - -removeold demo"/> 
    179             <env key="GSDLHOME" path="${basedir}/compiled"/> 
    180             <env key="GSDLCOLLECTDIR" path="${basedir}/compiled/collect"/> 
    181             <env key="GSDLOS" value="windows"/> 
    182             <env key="PATH" path="${basedir}/compiled/bin/windows/perl/bin:${basedir}/compiled/bin/windows:${basedir}/compiled/bin/script:${env.PATH}"/> 
    183         </exec> 
     169        <!-- the envs on these execs simulate the environment when you run setup.bat --> 
     170        <if> 
     171            <bool> 
     172                <equals arg1="${rk.os}" arg2="windows"/> 
     173            </bool>  
     174             
     175            <exec dir="${basedir}/compiled" executable="${basedir}/compiled/bin/windows/perl/bin/perl"> 
     176                <arg line="-S"/> 
     177                <arg line="bin/script/import.pl demo"/> 
     178                <env key="GSDLHOME" path="${basedir}/compiled"/> 
     179                <env key="GSDLCOLLECTDIR" path="${basedir}/compiled/collect"/> 
     180                <env key="GSDLOS" value="windows"/> 
     181                <env key="PATH" path="${basedir}/compiled/bin/windows/perl/bin:${basedir}/compiled/bin/windows:${basedir}/compiled/bin/script:${env.PATH}"/> 
     182            </exec> 
     183            <exec dir="${basedir}/compiled" executable="${basedir}/compiled/bin/windows/perl/bin/perl"> 
     184                <arg line="-S"/> 
     185                <arg line="bin/script/buildcol.pl demo"/> 
     186                <env key="GSDLHOME" path="${basedir}/compiled"/> 
     187                <env key="GSDLCOLLECTDIR" path="${basedir}/compiled/collect"/> 
     188                <env key="GSDLOS" value="windows"/> 
     189                <env key="PATH" path="${basedir}/compiled/bin/windows/perl/bin:${basedir}/compiled/bin/windows:${basedir}/compiled/bin/script:${env.PATH}"/> 
     190            </exec> 
     191             
     192            <else> 
     193                <exec dir="${basedir}/compiled" executable="perl"> 
     194                    <arg line="-S"/> 
     195                    <arg line="bin/script/import.pl demo"/> 
     196                    <env key="GSDLHOME" path="${basedir}/compiled"/> 
     197                    <env key="GSDLCOLLECTDIR" path="${basedir}/compiled/collect"/> 
     198                    <env key="GSDLOS" value="linux"/> 
     199                    <env key="PATH" path="${basedir}/compiled/bin/linux:${basedir}/compiled/bin/script:${env.PATH}"/> 
     200                </exec> 
     201                <exec dir="${basedir}/compiled" executable="perl"> 
     202                    <arg line="-S"/> 
     203                    <arg line="bin/script/buildcol.pl demo"/> 
     204                    <env key="GSDLHOME" path="${basedir}/compiled"/> 
     205                    <env key="GSDLCOLLECTDIR" path="${basedir}/compiled/collect"/> 
     206                    <env key="GSDLOS" value="linux"/> 
     207                    <env key="PATH" path="${basedir}/compiled/bin/linux:${basedir}/compiled/bin/script:${env.PATH}"/> 
     208                </exec> 
     209            </else> 
     210        </if> 
    184211        <delete dir="${basedir}/compiled/collect/demo/index"/> 
    185212        <move file="${basedir}/compiled/collect/demo/building" tofile="${basedir}/compiled/collect/demo/index"/> 
    186         --> 
    187213 
    188214        <!-- delete the source code -->