Changeset 19910

Show
Ignore:
Timestamp:
25.06.2009 11:18:40 (10 years ago)
Author:
oranfry
Message:

implemented the workaround for the missing expat library problem.

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • greenstone3/trunk/build.xml

    r19904 r19910  
    397397      proxy.port=${proxy.port} 
    398398      disable.collection.building=${disable.collection.building} 
    399       If these are not acceptable, please change them and rerun this target. Continue [y/n]? /> 
     399      If these are not acceptable, please change them and rerun this target. Continue [y/n]? 
    400400    </input> 
    401401    <condition property="do.abort">  
    … …  
    14231423  
    14241424  <target name="compile-gs2build" depends="init" if="collection.building.enabled"> 
    1425     <!-- gs2build --> 
    1426     <!--linux: make, make install --> 
    1427     <exec executable="make" os="${os.unix}" dir="${gs2build.home}" failonerror="true"/> 
    1428     <exec executable="make" os="${os.unix}" dir="${gs2build.home}" failonerror="true"> 
    1429       <arg value="install"/> 
    1430     </exec> 
    1431     <!-- run the setup script --> 
    1432     <!-- <exec executable="${compile.windows.c++.setup}" os="${os.windows}"/>--> 
    1433     <!--Above does not work: even though vcvars.bat executes, the env changes it makes don't get saved. Need user to run vcvars.bat first before calling ant-->  
    1434     <exec executable="nmake" dir="${gs2build.home}" os="${os.windows}" failonerror="true"> 
    1435       <arg value="/f"/> 
    1436       <arg value="win32.mak"/> 
    1437     </exec> 
    1438     <exec executable="nmake" dir="${gs2build.home}" os="${os.windows}" failonerror="true"> 
    1439       <arg value="/f"/> 
    1440       <arg value="win32.mak"/> 
    1441       <arg value="install"/> 
    1442     </exec> 
     1425 
     1426    <!-- unix: make, make install --> 
     1427    <if> 
     1428      <bool><istrue value="${current.os.isunix}"/></bool> 
     1429 
     1430      <!-- WORKAROUND: make common-src and reconfigure --> 
     1431      <!-- this is a workaround to a problem with the gsdl build code --> 
     1432      <!-- expat needs to be compiled before the perl XML Parser is configured --> 
     1433      <exec executable="make" dir="${gs2build.home}/common-src" failonerror="true"/> 
     1434      <antcall target="configure-collection-building"/> 
     1435      <!-- /WORKAROUND --> 
     1436 
     1437      <exec executable="make" dir="${gs2build.home}" failonerror="true"/> 
     1438      <exec executable="make" dir="${gs2build.home}" failonerror="true"> 
     1439        <arg value="install"/> 
     1440      </exec> 
     1441 
     1442    <!-- windows: nmake, nmake install --> 
     1443    <else><if> 
     1444      <bool><istrue value="${current.os.isunix}"/></bool> 
     1445      <!-- run the setup script --> 
     1446      <!-- <exec executable="${compile.windows.c++.setup}" os="${os.windows}"/>--> 
     1447      <!--Above does not work: even though vcvars.bat executes, the env changes it makes don't get saved. Need user to run vcvars.bat first before calling ant-->  
     1448      <exec executable="nmake" dir="${gs2build.home}" os="${os.windows}" failonerror="true"> 
     1449        <arg value="/f"/> 
     1450        <arg value="win32.mak"/> 
     1451      </exec> 
     1452      <exec executable="nmake" dir="${gs2build.home}" failonerror="true"> 
     1453        <arg value="/f"/> 
     1454        <arg value="win32.mak"/> 
     1455        <arg value="install"/> 
     1456      </exec> 
     1457 
     1458      <!-- install gs2build indexers --> 
     1459      <copy todir="${gs2build.home}/bin/windows"> 
     1460        <fileset dir="${gs2build.home}/common-src/indexers/bin"> 
     1461          <include name="*.*"/> 
     1462        </fileset> 
     1463      </copy> 
     1464 
     1465    </if></else></if> 
     1466 
    14431467    <!-- LuceneWrapper jar file not installed by default --> 
    14441468    <mkdir dir="${gs2build.home}/bin/java"/> 
    14451469    <copy file="${lucene.home}/LuceneWrapper.jar" todir="${gs2build.home}/bin/java"/> 
    1446     <antcall target="install-gs2build-indexers-windows"/> 
    1447   </target> 
    1448    
    1449   <target name="install-gs2build-indexers-windows" depends="init" if="collection.building.enabled.windows"> 
    1450     <copy todir="${gs2build.home}/bin/windows"> 
    1451       <fileset dir="${gs2build.home}/common-src/indexers/bin"> 
    1452         <include name="*.*"/> 
    1453       </fileset> 
    1454     </copy> 
    1455   </target> 
    1456  
     1470 
     1471  </target> 
    14571472   
    14581473