Changeset 10914

Show
Ignore:
Timestamp:
17.11.2005 14:28:24 (14 years ago)
Author:
kjdon
Message:

undid the last change where I merged the two rename-gs2build-files targets - I knew there must have been a reason for doing it...

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • trunk/gsdl3/build.xml

    r10913 r10914  
    13481348  </target> 
    13491349 
    1350   <target name="rename-gs2build-files" depends="init"> 
    1351     <property name="gs2build-extra.home" value="${gs2build.home}/gs2build-extra"/> 
     1350  <target name="rename-gs2build-files" depends="rename-gs2build-files-unix,rename-gs2build-files-windows"/> 
     1351 
     1352  <target name="rename-gs2build-files-windows" if="current.os.iswindows"> 
    13521353    <!-- we want a windows path in the setup.bat file --> 
    13531354    <pathconvert targetos="windows" property="gs2build.home.windows"> 
    13541355      <path path="${gs2build.home}"/> 
    13551356    </pathconvert> 
    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--> 
     1357 
     1358    <property name="gs2build-extra.home" value="${gs2build.home}/gs2build-extra"/> 
     1359   <copy file="${gs2build-extra.home}/lib.win32.mak" tofile="${gs2build.home}/lib/win32.mak"/> 
     1360   <copy file="${gs2build-extra.home}/win32.mak" tofile="${gs2build.home}/win32.mak"/> 
     1361   <copy file="${gs2build-extra.home}/setup.bat" tofile="${gs2build.home}/setup.bat"> 
     1362     <filterset> 
     1363       <filter token="gsdlhome" value="${gs2build.home.windows}"/> 
     1364     </filterset> 
     1365    </copy>   
     1366  </target>  
     1367  <target name="rename-gs2build-files-unix" if="current.os.isunix"> 
     1368    <property name="gs2build-extra.home" value="${gs2build.home}/gs2build-extra"/> 
    13661369    <copy file="${gs2build-extra.home}/configure" tofile="${gs2build.home}/configure"/>     
    13671370    <chmod file="${gs2build.home}/configure" perm="a+x"/> 
     
    13741377     
    13751378  </target> 
    1376  
    13771379  <target name="prepare-gli" depends="init" if="gsdl2.islocal" unless="gli.present"> 
    13781380    <antcall target="checkout-gli"/>