Ignore:
Timestamp:
2008-08-13T11:45:21+12:00 (16 years ago)
Author:
oranfry
Message:

changes to wirk2 after ant cleaned up

File:
1 edited

Legend:

Unmodified
Added
Removed
  • release-kits/wirk2/ant-scripts/compile.xml

    r16633 r16745  
    33
    44    <target name="compile">
    5 
    6         <addressedcall target="checkout-gsdl-gli" />
    7         <addressedcall target="set-version-numbers" />
    8         <addressedcall target="unzip-packages" />
    9         <addressedcall target="get-winbin" />
    10         <addressedcall target="insert-perl" />
    11         <addressedcall target="compile-c-code" />
    12         <addressedcall target="build-demo-collection" />
    13        
     5        <antcall target="checkout-gsdl-gli" />
     6        <antcall target="set-version-numbers" />
     7        <antcall target="unzip-packages" />
     8        <antcall target="get-winbin" />
     9        <antcall target="insert-perl" />
     10        <antcall target="compile-c-code" />
     11        <antcall target="build-demo-collection" />
    1412    </target>
    1513
    1614    <target name="checkout-gsdl-gli">
    17         <if><bool><istrue value="${execute}"/></bool>
    18             <svn>
    19                 <checkout url="${svn.root}/gsdl/${branch.path}" destPath="${basedir}/gsdl"/>
    20                 <checkout url="${svn.root}/gli/${branch.path}" destPath="${basedir}/gsdl/gli"/>
    21             </svn>
    22         </if>
     15        <svn>
     16            <checkout url="${svn.root}/gsdl/${branch.path}" destPath="${basedir}/gsdl"/>
     17            <checkout url="${svn.root}/gli/${branch.path}" destPath="${basedir}/gsdl/gli"/>
     18        </svn>
    2319    </target>
    2420
    2521    <target name="set-version-numbers">
    26         <if><bool><istrue value="${execute}"/></bool>
    27             <rsr file="${basedir}/gsdl/common-src/src/lib/gsdlconf.h" pattern="(#define GSDL_VERSION ).*" replacement="$1&quot;${version}&quot;" />
    28             <rsr file="${basedir}/gsdl/Install.sh" pattern="(echo &quot;Version: ).*(&quot; .*)" replacement="$1${version}$2" />
    29             <rsr file="${basedir}/gsdl/etc/VERSION" pattern="(gsdl version: ).*" replacement="$1${version}" />
    30         </if>
     22        <rsr file="${basedir}/gsdl/common-src/src/lib/gsdlconf.h" pattern="(#define GSDL_VERSION ).*" replacement="$1&quot;${version}&quot;" />
     23        <rsr file="${basedir}/gsdl/Install.sh" pattern="(echo &quot;Version: ).*(&quot; .*)" replacement="$1${version}$2" />
     24        <rsr file="${basedir}/gsdl/etc/VERSION" pattern="(gsdl version: ).*" replacement="$1${version}" />
    3125    </target>
    3226
    3327    <target name="unzip-packages">
    34         <if><bool><istrue value="${execute}"/></bool>
    35             <unzip src="${basedir}/gsdl/common-src/packages/windows/crypt/crypt.zip" dest="${basedir}/gsdl/common-src/packages/windows/crypt"/>
    36             <unzip src="${basedir}/gsdl/common-src/packages/windows/expat/expat.zip" dest="${basedir}/gsdl/common-src/packages/windows/expat"/>
    37             <unzip src="${basedir}/gsdl/common-src/packages/windows/gdbm/gdbm.zip" dest="${basedir}/gsdl/common-src/packages/windows/gdbm"/>
    38             <unzip src="${basedir}/gsdl/common-src/packages/windows/stlport/stlport.zip" dest="${basedir}/gsdl/common-src/packages/windows/stlport"/>
    39         </if>   
     28        <unzip src="${basedir}/gsdl/common-src/packages/windows/crypt/crypt.zip" dest="${basedir}/gsdl/common-src/packages/windows/crypt"/>
     29        <unzip src="${basedir}/gsdl/common-src/packages/windows/expat/expat.zip" dest="${basedir}/gsdl/common-src/packages/windows/expat"/>
     30        <unzip src="${basedir}/gsdl/common-src/packages/windows/gdbm/gdbm.zip" dest="${basedir}/gsdl/common-src/packages/windows/gdbm"/>
     31        <unzip src="${basedir}/gsdl/common-src/packages/windows/stlport/stlport.zip" dest="${basedir}/gsdl/common-src/packages/windows/stlport"/>
    4032    </target>
    4133
    4234    <target name="get-winbin">
    43         <if><bool><istrue value="${execute}"/></bool>
    44            
    45             <if>
    46                 <bool><not><available file="${basedir}/gsdl/bin/windows"/></not></bool>
    47                 <svn><export srcUrl="${svn.root}/other-projects/trunk/winbin/bin" destPath="${basedir}/gsdl/bin/windows" revision="${branch.revision}"/></svn>
    48             </if>
    49            
     35        <if>
     36            <bool><not><available file="${basedir}/gsdl/bin/windows"/></not></bool>
     37            <svn><export srcUrl="${svn.root}/other-projects/trunk/winbin/bin" destPath="${basedir}/gsdl/bin/windows" revision="${branch.revision}"/></svn>
    5038        </if>
    5139    </target>
    5240
    5341    <target name="insert-perl">
    54         <if><bool><istrue value="${execute}"/></bool>
    55             <mkdir dir="${basedir}/gsdl/bin/windows"/>
    56             <delete dir="${basedir}/gsdl/bin/windows/perl"/>
    57             <unzip src="${wirk2.home}/resources/perl.zip" dest="${basedir}/gsdl/bin/windows"/>
    58         </if>
     42        <mkdir dir="${basedir}/gsdl/bin/windows"/>
     43        <delete dir="${basedir}/gsdl/bin/windows/perl"/>
     44        <unzip src="${wirk2.home}/resources/perl.zip" dest="${basedir}/gsdl/bin/windows"/>
    5945    </target>
    6046   
    6147    <target name="compile-c-code">
    62         <if><bool><istrue value="${execute}"/></bool>
    63             <copy file="${wirk2.home}/resources/compile.bat" todir="${basedir}/gsdl" overwrite="true"/>
    64             <exec dir="${basedir}/gsdl" executable="${basedir}/gsdl/compile.bat"/>
    65            
    66             <move file="${basedir}/gsdl/server.exe" todir="${basedir}/gsdl/bin/windows"/>
    67             <move todir="${basedir}/gsdl/bin/windows">
    68                 <fileset dir="${basedir}/gsdl/cgi-bin" includes="library.exe,oaiserver.exe"/>
    69             </move>
    70 
    71         </if>
     48        <copy file="${wirk2.home}/resources/compile.bat" todir="${basedir}/gsdl" overwrite="true"/>
     49        <exec dir="${basedir}/gsdl" executable="${basedir}/gsdl/compile.bat" />
     50       
     51        <move file="${basedir}/gsdl/server.exe" todir="${basedir}/gsdl/bin/windows"/>
     52        <move todir="${basedir}/gsdl/bin/windows">
     53            <fileset dir="${basedir}/gsdl/cgi-bin" includes="library.exe,oaiserver.exe"/>
     54        </move>
    7255    </target>
    7356   
    7457    <target name="build-demo-collection">
    75         <if><bool><istrue value="${execute}"/></bool>
    76             <!-- the envs on these execs simulate the environment when you run setup.bat -->
    77             <exec dir="${basedir}/gsdl" executable="${basedir}/gsdl/bin/windows/perl/bin/perl.exe">
    78                 <arg line="bin\script\import.pl --removeold demo"/>
    79                 <env key="GSDLHOME" value="${basedir}/gsdl"/>
    80                 <env key="GSDLCOLLECTDIR" value="${basedir}/gsdl/collect"/>
    81                 <env key="GSDLOS" value="windows"/>
    82                 <env key="PATH" value="${basedir}\gsdl\bin\windows\perl\bin;${basedir}\gsdl\bin\windows;${basedir}\gsdl\bin\script"/>
    83             </exec>
    84             <exec dir="${basedir}/gsdl" executable="${basedir}/gsdl/bin/windows/perl/bin/perl.exe">
    85                 <arg line="bin\script\buildcol.pl --removeold demo"/>
    86                 <env key="GSDLHOME" value="${basedir}/gsdl"/>
    87                 <env key="GSDLCOLLECTDIR" value="${basedir}/gsdl/collect"/>
    88                 <env key="GSDLOS" value="windows"/>
    89                 <env key="PATH" value="${basedir}\gsdl\bin\windows\perl\bin;${basedir}\gsdl\bin\windows;${basedir}\gsdl\bin\script"/>
    90             </exec>
    91            
    92             <delete dir="${basedir}/gsdl/collect/demo/index"/>
    93             <move file="${basedir}/gsdl/collect/demo/building" tofile="${basedir}/gsdl/collect/demo/index"/>
    94         </if>
     58        <!-- the envs on these execs simulate the environment when you run setup.bat -->
     59        <exec dir="${basedir}/gsdl" executable="${basedir}/gsdl/bin/windows/perl/bin/perl.exe">
     60            <arg line="bin\script\import.pl --removeold demo"/>
     61            <env key="GSDLHOME" value="${basedir}/gsdl"/>
     62            <env key="GSDLCOLLECTDIR" value="${basedir}/gsdl/collect"/>
     63            <env key="GSDLOS" value="windows"/>
     64            <env key="PATH" value="${basedir}\gsdl\bin\windows\perl\bin;${basedir}\gsdl\bin\windows;${basedir}\gsdl\bin\script"/>
     65        </exec>
     66        <exec dir="${basedir}/gsdl" executable="${basedir}/gsdl/bin/windows/perl/bin/perl.exe">
     67            <arg line="bin\script\buildcol.pl --removeold demo"/>
     68            <env key="GSDLHOME" value="${basedir}/gsdl"/>
     69            <env key="GSDLCOLLECTDIR" value="${basedir}/gsdl/collect"/>
     70            <env key="GSDLOS" value="windows"/>
     71            <env key="PATH" value="${basedir}\gsdl\bin\windows\perl\bin;${basedir}\gsdl\bin\windows;${basedir}\gsdl\bin\script"/>
     72        </exec>
     73       
     74        <delete dir="${basedir}/gsdl/collect/demo/index"/>
     75        <move file="${basedir}/gsdl/collect/demo/building" tofile="${basedir}/gsdl/collect/demo/index"/>
    9576    </target>
    9677   
Note: See TracChangeset for help on using the changeset viewer.