Changeset 10901 for trunk/gsdl3


Ignore:
Timestamp:
2005-11-15T17:29:09+13:00 (18 years ago)
Author:
kjdon
Message:

solaris modifications. added in os.solaris property, and os.unix - includes linux,mac,solaris. most exec now use os=os.unix so that they execute under solaris as well

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/gsdl3/build.xml

    r10897 r10901  
    8686  <property name="os.linux" value="Linux"/>
    8787  <property name="os.mac" value="Mac OS X"/>
     88  <property name="os.solaris" value="SunOS"/>
     89  <property name="os.unix" value="${os.linux},${os.mac},${os.solaris}"/>
    8890  <property name="os.windows" value="Windows 95,Windows 98,Windows 2000,Windows XP,Windows NT,Windows ME"/> <!-- check this!!!-->
    8991
    … …  
    215217    <echo>is unixnotmac : ${current.os.isunixnotmac}</echo>
    216218    <echo>is windows : ${current.os.iswindows}</echo>
     219    <echo>os.unix: ${os.unix}</echo>
    217220  </target>
    218221<!-- ==================== Primary and Global Targets ============================= -->
    … …  
    543546    <property name="tomcat.path" refid="local.tomcat.path"/>
    544547    <property name="catalina.opts" value="-Djava.util.prefs.syncInterval=2000000 -DGSDL3HOME=$GSDL3HOME -DGSDLOS=$GSDLOS -DPATH=$PATH -Xmx400M"/>
    545     <exec executable="${catalina.home}/bin/startup.sh" os="${os.linux},${os.mac}" dir="${catalina.home}/bin" spawn="false">
     548    <exec executable="${catalina.home}/bin/startup.sh" os="${os.unix}" dir="${catalina.home}/bin" spawn="false">
    546549      <!--<env key="GSDLOS" value="linux"/> do we need this?? -->
    547550      <env key="GSDL3HOME" value="${basedir}"/>
    … …  
    571574  <!-- windows: do we want to launch a webrowser?? -->
    572575  <target name="stop-tomcat" description="Shutdown only Tomcat" depends="init" if="tomcat.islocal">
    573     <exec executable="${catalina.home}/bin/shutdown.sh" os="${os.linux},${os.mac}" dir="${catalina.home}/bin" spawn="false">
     576    <exec executable="${catalina.home}/bin/shutdown.sh" os="${os.unix}" dir="${catalina.home}/bin" spawn="false">
    574577      <env key="CATALINA_HOME" value="${catalina.home}"/>
    575578    </exec>
    … …  
    10711074      Configuring MG
    10721075    </echo>
    1073     <exec executable="${mg.home}/configure" os="${os.linux},${os.mac}"
     1076    <exec executable="${mg.home}/configure" os="${os.unix}"
    10741077      dir="${mg.home}">
    10751078      <arg value="--prefix=${basedir}"/>
    … …  
    10791082      Configuring MGPP
    10801083    </echo>
    1081     <exec executable="${mgpp.home}/configure" os="${os.linux},${os.mac}"
     1084    <exec executable="${mgpp.home}/configure" os="${os.unix}"
    10821085      dir="${mgpp.home}">
    10831086      <arg value="--prefix=${basedir}"/>
    … …  
    10871090      Configuring JavaGDBM
    10881091    </echo>
    1089     <exec executable="${javagdbm.home}/configure" os="${os.linux}"
     1092    <exec executable="${javagdbm.home}/configure" os="${os.linux},${os.solaris}"
    10901093      dir="${javagdbm.home}">
    10911094      <arg value="--prefix=${basedir}"/>
    … …  
    11051108  <target name="clean-packages-c++" depends="init">
    11061109    <!-- mg : just call the make target -->
    1107     <exec executable="make" os="${os.linux},${os.mac}"
     1110    <exec executable="make" os="${os.unix}"
    11081111      dir="${mg.home}">
    11091112      <arg value="clean"/>
    11101113    </exec>
    11111114    <!-- mgpp -->
    1112     <exec executable="make" os="${os.linux},${os.mac}"
     1115    <exec executable="make" os="${os.unix}"
    11131116      dir="${mgpp.home}">
    11141117      <arg value="clean"/>
    11151118    </exec>
    11161119    <!-- javagdbm -->
    1117     <exec executable="make" os="${os.linux},${os.mac}"
     1120    <exec executable="make" os="${os.unix}"
    11181121      dir="${javagdbm.home}">
    11191122      <arg value="clean"/>
    … …  
    11231126  <target name="distclean-packages-c++" depends="init">
    11241127    <!-- mg : just call the make target -->
    1125     <exec executable="make" os="${os.linux},${os.mac}"
     1128    <exec executable="make" os="${os.unix}"
    11261129      dir="${mg.home}">
    11271130      <arg value="distclean"/>
    11281131    </exec>
    11291132    <!-- mgpp -->
    1130     <exec executable="make" os="${os.linux},${os.mac}"
     1133    <exec executable="make" os="${os.unix}"
    11311134      dir="${mgpp.home}">
    11321135      <arg value="distclean"/>
    11331136    </exec>
    11341137    <!-- javagdbm -->
    1135     <exec executable="make" os="${os.linux},${os.mac}"
     1138    <exec executable="make" os="${os.unix}"
    11361139      dir="${javagdbm.home}">
    11371140      <arg value="distclean"/>
    … …  
    11521155    description="Compile only the packages">
    11531156    <echo>Compiling MG</echo>
    1154     <exec executable="make" os="${os.linux},${os.mac}"
     1157    <exec executable="make" os="${os.unix}"
    11551158       dir="${mg.home}">
    11561159    </exec>
    1157     <exec executable="make" os="${os.linux},${os.mac}"
     1160    <exec executable="make" os="${os.unix}"
    11581161      dir="${mg.home}">
    11591162      <arg value="install"/>
    … …  
    11701173    <!-- mgpp -->
    11711174    <echo>Compiling MGPP</echo>
    1172     <exec executable="make" os="${os.linux},${os.mac}"
     1175    <exec executable="make" os="${os.unix}"
    11731176       dir="${mgpp.home}">
    11741177    </exec>
    1175     <exec executable="make" os="${os.linux},${os.mac}"
     1178    <exec executable="make" os="${os.unix}"
    11761179      dir="${mgpp.home}">
    11771180      <arg value="install"/>
    … …  
    11871190   
    11881191    <!-- javagdbm -->
    1189     <exec executable="make" os="${os.linux},${os.mac}"
     1192    <exec executable="make" os="${os.unix}"
    11901193      dir="${javagdbm.home}">
    11911194    </exec>
    1192     <exec executable="make" os="${os.linux},${os.mac}"
     1195    <exec executable="make" os="${os.unix}"
    11931196      dir="${javagdbm.home}">
    11941197      <arg value="install"/>
    … …  
    13781381  <target name="configure-gs2building" depends="init" if="gsdl2.islocal"
    13791382    description="Configure only the Greenstone 2 building components">
    1380     <exec executable="${gs2build.home}/configure" os="${os.linux}"
     1383    <exec executable="${gs2build.home}/configure" os="${os.linux},${os.solaris}"
    13811384      dir="${gs2build.home}">
    13821385      <arg value="--prefix=${gs2build.home}"/>
    … …  
    13951398    <property name="gli.home" value="${basedir}/gli"/>
    13961399    <!-- linux -->
    1397     <exec executable="clean.sh" os="${os.linux},${os.mac}" dir="${gli.home}"
     1400    <exec executable="clean.sh" os="${os.unix}" dir="${gli.home}"
    13981401      resolveExecutable="true"/>
    13991402    <!-- windows -->
    … …  
    14041407    <!-- gs2build -->
    14051408    <!--linux:  -->
    1406     <exec executable="make" os="${os.linux},${os.mac}" dir="${gs2build.home}">
     1409    <exec executable="make" os="${os.unix}" dir="${gs2build.home}">
    14071410      <arg value="clean"/>
    14081411    </exec>
    … …  
    14121415    <!-- gs2build -->
    14131416    <!--linux:  -->
    1414     <exec executable="make" os="${os.linux},${os.mac}" dir="${gs2build.home}">
     1417    <exec executable="make" os="${os.unix}" dir="${gs2build.home}">
    14151418      <arg value="distclean"/>
    14161419    </exec>
    … …  
    14341437    <property name="gli.home" value="${basedir}/gli"/>
    14351438    <!-- linux -->
    1436     <exec executable="makegli.sh" os="${os.linux},${os.mac}" dir="${gli.home}"
     1439    <exec executable="makegli.sh" os="${os.unix}" dir="${gli.home}"
    14371440      resolveExecutable="true"/>
    14381441    <!-- windows -->
    … …  
    14411444    <!-- gs2build -->
    14421445    <!--linux: make, make install -->
    1443     <exec executable="make" os="${os.linux},${os.mac}" dir="${gs2build.home}">
    1444     </exec>
    1445     <exec executable="make" os="${os.linux},${os.mac}" dir="${gs2build.home}">
     1446    <exec executable="make" os="${os.unix}" dir="${gs2build.home}">
     1447    </exec>
     1448    <exec executable="make" os="${os.unix}" dir="${gs2build.home}">
    14461449      <arg value="install"/>
    14471450    </exec>
    … …  
    14621465
    14631466  <target name="gli-local" depends="init" if="gsdl2.islocal">
    1464     <exec executable="${basedir}/gli/gli4gs3.sh" os="${os.linux}" dir="${basedir}/gli" spawn="true">
     1467    <exec executable="${basedir}/gli/gli4gs3.sh" os="${os.linux},${os.solaris}" dir="${basedir}/gli" spawn="true">
    14651468      <env key="gsdl3path" path="${basedir}"/>
    14661469      <env key="gsdlpath" path="${basedir}/gs2build"/>
    … …  
    14801483 
    14811484  <target name="gli-external" depends="init" unless="gsdl2.islocal">
    1482     <exec executable="${gsdl2.installed.path}/gli/gli4gs3.sh" os="${os.linux},${os.mac}" dir="${gsdl2.installed.path}/gli" spawn="true">
     1485    <exec executable="${gsdl2.installed.path}/gli/gli4gs3.sh" os="${os.linux},${os.solaris}" dir="${gsdl2.installed.path}/gli" spawn="true">
    14831486      <env key="gsdl3path" path="${basedir}"/>
    14841487      <env key="gsdlpath"  path="${gsdl2.installed.path}"/>
     1488    </exec>
     1489    <exec executable="${gsdl2.installed.path}/gli/gli4gs3.sh" os="${os.mac}" dir="${gsdl2.installed.path}/gli" spawn="true">
     1490      <env key="gsdl3path" path="${basedir}"/>
     1491      <env key="gsdlpath"  path="${gsdl2.installed.path}"/>
     1492      <env key="DYLD_LIBRARY_PATH" path="${env.DYLD_LIBRARY_PATH}:${gdbm.installed.path}/lib"/>
    14851493    </exec>
    14861494    <exec executable="${gsdl2.installed.path}/gli/gli4gs3.bat" os="${os.windows}" dir="${gsdl2.installed.path}/gli" spawn="true">
Note: See TracChangeset for help on using the changeset viewer.