Changeset 23615


Ignore:
Timestamp:
01/20/11 12:18:57 (10 years ago)
Author:
sjm84
Message:

Modified the collection building code for Linux and Mac

File:
1 edited

Legend:

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

    r23612 r23615  
    224224
    225225            <!-- make apache-for-dist -->
    226             <exec dir="${basedir}/compiled" executable="make" failonerror="true"><arg value="apache-for-dist"/></exec>
     226            <!--<exec dir="${basedir}/compiled" executable="make" failonerror="true"><arg value="apache-for-dist"/></exec>-->
    227227
    228228            <!-- strip executables -->
     
    245245            <delete dir="${basedir}/compiled/ext/gnome-lib-minimal/darwin/etc"/>
    246246            <delete dir="${basedir}/compiled/ext/gnome-lib-minimal/darwin/include"/>
    247             <delete dir="${basedir}/compiled/ext/gnome-lib-minimal/darwin/share"/>
    248247            <delete file="${basedir}/compiled/ext/gnome-lib-minimal/setup.bat"/>
    249248            <delete file="${basedir}/compiled/ext/gnome-lib-minimal/CASCADE-MAKE.sh"/>
     
    316315                <env key="PATH" path="${basedir}/compiled/bin/windows/perl/bin:${basedir}/compiled/bin/windows:${basedir}/compiled/bin/script:${env.PATH}"/>
    317316            </exec>
     317
     318            <delete dir="${basedir}/compiled/collect/demo/index"/>
     319            <move file="${basedir}/compiled/collect/demo/building" tofile="${basedir}/compiled/collect/demo/index"/>
    318320           
    319321            <else>
    320                 <exec dir="${basedir}/compiled" executable="perl">
    321                     <arg line="-S"/>
    322                     <arg line="bin/script/import.pl demo"/>
    323                     <env key="GSDLHOME" path="${basedir}/compiled"/>
    324                     <env key="GSDLCOLLECTDIR" path="${basedir}/compiled/collect"/>
    325                     <env key="GSDLOS" value="${os.shell}"/>
    326                     <env key="PATH" path="${basedir}/compiled/bin/${os.shell}:${basedir}/compiled/bin/script:${env.PATH}"/>
    327                 </exec>
    328                 <exec dir="${basedir}/compiled" executable="perl">
    329                     <arg line="-S"/>
    330                     <arg line="bin/script/buildcol.pl demo"/>
    331                     <env key="GSDLHOME" path="${basedir}/compiled"/>
    332                     <env key="GSDLCOLLECTDIR" path="${basedir}/compiled/collect"/>
    333                     <env key="GSDLOS" value="${os.shell}"/>
    334                     <env key="PATH" path="${basedir}/compiled/bin/${os.shell}:${basedir}/compiled/bin/script:${env.PATH}"/>
    335                 </exec>
     322                <echo file="${basedir}/compiled/buildscript.sh">
     323                    #!/bin/bash
     324                    source setup.bash
     325                    /usr/bin/perl -S ${basedir}/compiled/bin/script/full-rebuild.pl demo
     326                </echo>
     327                <chmod perm="755" file="${basedir}/compiled/buildscript.sh"/>
     328                <exec dir="${basedir}/compiled" executable="/bin/bash">
     329                    <arg line="buildscript.sh"/>
     330                </exec>
     331                <delete file="${basedir}/compiled/buildscript.sh"/>
    336332            </else>
    337333        </if>
    338         <delete dir="${basedir}/compiled/collect/demo/index"/>
    339         <move file="${basedir}/compiled/collect/demo/building" tofile="${basedir}/compiled/collect/demo/index"/>
    340334
    341335        <!-- delete the source code -->
Note: See TracChangeset for help on using the changeset viewer.