Changeset 16620

Show
Ignore:
Timestamp:
31.07.2008 14:36:47 (11 years ago)
Author:
oranfry
Message:

no need to rename gs2build-extra files as we no longer use gs2build-extra

Location:
greenstone3/trunk
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • greenstone3/trunk/build.xml

    r16602 r16620  
    13481348  </target> 
    13491349 
    1350   <target name="rename-gs2build-files" depends="rename-gs2build-files-unix,rename-gs2build-files-windows,gs2build-edit-setup-bat" if="collection.building.enabled"/> 
     1350  <target name="rename-gs2build-files" depends="gs2build-edit-setup-bat" if="collection.building.enabled"/> 
    13511351   
    13521352  <target name="gs2build-edit-setup-bat" if="collection.building.enabled.windows"> 
     
    13571357    <move file="${gs2build.home}/setup.bat" tofile="${gs2build.home}/setup-tmp.bat"> 
    13581358      <filterset> 
    1359     <filter token="gsdlhome" value="${gs2build.home.windows}"/> 
     1359        <filter token="gsdlhome" value="${gs2build.home.windows}"/> 
    13601360      </filterset> 
    13611361    </move>   
    13621362    <move file="${gs2build.home}/setup-tmp.bat" tofile="${gs2build.home}/setup.bat" /> 
    1363   </target> 
    1364    
    1365   <target name="rename-gs2build-files-windows" if="collection.building.enabled.windows"> 
    1366     <property name="gs2build-extra.home" value="${gs2build.home}/gs2build-extra"/> 
    1367     <copy file="${gs2build-extra.home}/lib.win32.mak" tofile="${gs2build.home}/src/lib/win32.mak"/> 
    1368     <copy file="${gs2build-extra.home}/win32.mak" tofile="${gs2build.home}/win32.mak"/> 
    1369     <copy file="${gs2build-extra.home}/setup.bat" tofile="${gs2build.home}/setup.bat"/> 
    1370   </target>  
    1371    
    1372   <target name="rename-gs2build-files-unix" if="collection.building.enabled.unix"> 
    1373     <property name="gs2build-extra.home" value="${gs2build.home}/gs2build-extra"/> 
    1374     <copy file="${gs2build-extra.home}/configure" tofile="${gs2build.home}/configure"/>     
    1375     <chmod file="${gs2build.home}/configure" perm="a+x"/> 
    1376     <copy file="${gs2build-extra.home}/configure.in" tofile="${gs2build.home}/configure.in"/> 
    1377     <copy file="${gs2build-extra.home}/Makefile.in" tofile="${gs2build.home}/Makefile.in"/>   
    1378     <copy file="${gs2build-extra.home}/packages.configure" tofile="${gs2build.home}/packages/configure"/> 
    1379     <chmod file="${gs2build.home}/packages/configure" perm="a+x"/> 
    1380     <copy file="${gs2build-extra.home}/packages.Makefile.in" tofile="${gs2build.home}/packages/Makefile.in"/> 
    1381     <copy file="${gs2build-extra.home}/lib.Makefile.in" tofile="${gs2build.home}/src/lib/Makefile.in"/>   
    13821363  </target> 
    13831364   
  • greenstone3/trunk/resources/java/global.properties.in

    r15149 r16620  
    11## greenstone home 
    22gsdl3.home=@gsdl3home@ 
    3 gsdl3.version=@gsdl3version@ 
     3gsdl3.version=3s2008.06.25 
    44 
    55# tomcat info