Changeset 10913 for trunk/gsdl3


Ignore:
Timestamp:
2005-11-17T14:00:42+13:00 (18 years ago)
Author:
kjdon
Message:

added GSDL3HOME env var to all windows c++ packages make calls, merged rename-gs2build-files windows and linux versions into one - need all types for source release

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/gsdl3/build.xml

    r10910 r10913  
    12101210  <target name="compile-windows-c++-packages" depends="init" if="current.os.iswindows"
    12111211    description="Compile only the C/C++ packages">
    1212     <exec executable="${mg.home}/winMake.bat" dir="${mg.home}"/>
     1212    <exec executable="${mg.home}/winMake.bat" dir="${mg.home}">
     1213      <env key="GSDL3HOME" value="${basedir}"/>
     1214    </exec>
    12131215    <exec executable="${mg.home}/winMake.bat" dir="${mg.home}">
    12141216      <arg value="install"/>
    12151217      <env key="GSDL3HOME" value="${basedir}"/>
    12161218    </exec>
    1217     <exec executable="${mgpp.home}/winMake.bat" dir="${mgpp.home}"/>
     1219    <exec executable="${mgpp.home}/winMake.bat" dir="${mgpp.home}">
     1220      <env key="GSDL3HOME" value="${basedir}"/>
     1221    </exec>
    12181222    <exec executable="${mgpp.home}/winMake.bat" dir="${mgpp.home}">
    12191223      <arg value="install"/>
    12201224      <env key="GSDL3HOME" value="${basedir}"/>
    12211225    </exec>
    1222     <exec executable="${javagdbm.home}/winMake.bat" dir="${javagdbm.home}"/>
     1226    <exec executable="${javagdbm.home}/winMake.bat" dir="${javagdbm.home}">
     1227      <env key="GSDL3HOME" value="${basedir}"/>
     1228    </exec>
    12231229    <exec executable="${javagdbm.home}/winMake.bat" dir="${javagdbm.home}">
    12241230      <arg value="install"/>
    … …  
    13421348  </target>
    13431349
    1344   <target name="rename-gs2build-files" depends="rename-gs2build-files-unix,rename-gs2build-files-windows"/>
    1345 
    1346   <target name="rename-gs2build-files-windows" if="current.os.iswindows">
     1350  <target name="rename-gs2build-files" depends="init">
     1351    <property name="gs2build-extra.home" value="${gs2build.home}/gs2build-extra"/>
    13471352    <!-- we want a windows path in the setup.bat file -->
    13481353    <pathconvert targetos="windows" property="gs2build.home.windows">
    13491354      <path path="${gs2build.home}"/>
    13501355    </pathconvert>
    1351 
    1352     <property name="gs2build-extra.home" value="${gs2build.home}/gs2build-extra"/>
    1353    <copy file="${gs2build-extra.home}/lib.win32.mak" tofile="${gs2build.home}/lib/win32.mak"/>
    1354    <copy file="${gs2build-extra.home}/win32.mak" tofile="${gs2build.home}/win32.mak"/>
    1355    <copy file="${gs2build-extra.home}/setup.bat" tofile="${gs2build.home}/setup.bat">
    1356      <filterset>
    1357        <filter token="gsdlhome" value="${gs2build.home.windows}"/>
    1358      </filterset>
    1359     </copy> 
    1360   </target>
    1361   <target name="rename-gs2build-files-unix" if="current.os.isunix">
    1362     <property name="gs2build-extra.home" value="${gs2build.home}/gs2build-extra"/>
     1356   
     1357    <!-- windows versions -->
     1358    <copy file="${gs2build-extra.home}/lib.win32.mak" tofile="${gs2build.home}/lib/win32.mak"/>
     1359    <copy file="${gs2build-extra.home}/win32.mak" tofile="${gs2build.home}/win32.mak"/>
     1360    <copy file="${gs2build-extra.home}/setup.bat" tofile="${gs2build.home}/setup.bat">
     1361      <filterset>
     1362    <filter token="gsdlhome" value="${gs2build.home.windows}"/>
     1363      </filterset>
     1364    </copy>   
     1365    <!-- unix versions-->
    13631366    <copy file="${gs2build-extra.home}/configure" tofile="${gs2build.home}/configure"/>   
    13641367    <chmod file="${gs2build.home}/configure" perm="a+x"/>
    … …  
    13711374   
    13721375  </target>
     1376
    13731377  <target name="prepare-gli" depends="init" if="gsdl2.islocal" unless="gli.present">
    13741378    <antcall target="checkout-gli"/>
Note: See TracChangeset for help on using the changeset viewer.