Changeset 35581 for main/trunk


Ignore:
Timestamp:
2021-10-14T11:52:03+13:00 (3 years ago)
Author:
davidb
Message:

The JAVACFLAGS change works (in general) but needs to be done a bit more carefully to handle the situation where the environment variable is not set at all; second change to this commit is to widen the set of targets the 'needs-gs-devel', and for the ant-built-in sourceing technique to only be done if it has not already done so. Something to note here is that 'antcall' does look to start a new process, and so the property set is not carried forward. Could be an improvement to the approach taken here is to set an environment variable to explicitly represent the DEVEL file being sourced, and use that to determine when/if the gs3-devel file needs to be sourced

File:
1 edited

Legend:

Unmodified
Added
Removed

  • main/trunk/greenstone3/build.xml

    r35579 r35581  
    802802  <property name="compile.encoding"    value="UTF8"/>
    803803  <property name="compile.includeantruntime" value="false"/> <!-- to get rid of annoying 'ant' warning -->
     804 
    804805  <!--
    805806
    … …  
    938939    </delete>
    939940
    940     <!-- has the gs3-setup script been run?? -->
     941    <!-- has the gs3-setup been sourced successfully -->
    941942    <condition property="gs3-setup-not-done">
    942943      <not>
    … …  
    945946    </condition>
    946947
    947     <fail if="gs3-setup-not-done" message="Please run 'gs3-setup' (Windows) or 'source ./gs3-setup.sh' (Unix) before starting the Greenstone server."/>
     948    <fail if="gs3-setup-not-done" message="Please run 'gs3-setup' (Windows) or 'source ./gs3-setup.sh' (Unix) before starting the Greenstone server."/>   
    948949  </target>
    949950
    950951  <target name="needs-gs3-devel">
    951952
    952     <exec os="${os.unix}" executable="bash"   dir="${basedir}" failonerror="true" output="${basedir}/gs3-develenv.properties">
    953       <arg value="-c" />
    954       <arg value=". ./gs3-devel.sh >/dev/null 2>gs3-develenv.errors ; env" />
    955     </exec>
    956     <exec osfamily="windows" executable="cmd" dir="${basedir}" failonerror="true" output="${basedir}/gs3-develenv.properties">
    957       <arg value="/c" />
    958       <arg value=".\gs3-devel.sh >nul 2>gs3-develenv.errors ; set" />
    959     </exec>         
    960 
    961     <property file="${basedir}/gs3-develenv.properties" prefix="env"/>
    962 
    963     <!-- Delete the error output file if it is empty -->
    964     <delete>
    965       <fileset dir="${basedir}" includes="gs3-develenv.errors">
    966     <size value="0" when="equal"/>
    967       </fileset>
    968     </delete>
     953    <if>
     954      <!-- only need to source gs3-devel if not already done so -->
     955      <bool><not><isset property="gs3-devel-done"/></not></bool>
     956     
     957      <exec os="${os.unix}" executable="bash"   dir="${basedir}" failonerror="true" output="${basedir}/gs3-develenv.properties">
     958    <arg value="-c" />
     959    <arg value=". ./gs3-devel.sh >/dev/null 2>gs3-develenv.errors ; env" />
     960      </exec>
     961      <exec osfamily="windows" executable="cmd" dir="${basedir}" failonerror="true" output="${basedir}/gs3-develenv.properties">
     962    <arg value="/c" />
     963    <arg value=".\gs3-devel.sh >nul 2>gs3-develenv.errors ; set" />
     964      </exec>         
     965     
     966      <property file="${basedir}/gs3-develenv.properties" prefix="env"/>
     967
     968      <!-- Delete the error output file if it is empty -->
     969      <delete>
     970    <fileset dir="${basedir}" includes="gs3-develenv.errors">
     971      <size value="0" when="equal"/>
     972    </fileset>
     973      </delete>
     974
     975      <!-- has the gs3-setup been sourced successfully -->
     976      <condition property="gs3-devel-done">
     977    <isset property="env.GSDL3HOME"/>
     978      </condition>
     979     
     980      <if>
     981    <bool><isset property="${env.JAVACFLAGS}"/></bool>
     982    <property name="compile.javac.flags" value="${env.JAVACFLAGS}"/>
     983    <else>
     984      <property name="compile.javac.flags" value=""/>
     985    </else>
     986      </if>
     987    </if>
     988   
    969989  </target>
    970990 
    … …  
    17791799  </target>
    17801800
    1781   <target name="compile-web" depends="init">
     1801  <target name="compile-web" depends="init,needs-gs3-devel">
    17821802    <javac srcdir="${web.classes}"
    17831803      destdir="${web.classes}"
    … …  
    17871807      optimize="${compile.optimize}"
    17881808      encoding="${compile.encoding}">
    1789       <compilerarg line="${env.JAVACFLAGS}"/>
     1809      <compilerarg line="${compile.javac.flags}"/>
    17901810      <classpath><path refid="compile.classpath"/></classpath>
    17911811    </javac>
    17921812  </target>
    17931813
    1794   <target name="compile-classpath-jars" depends="init">
     1814  <target name="compile-classpath-jars" depends="init,needs-gs3-devel">
    17951815    <if><bool><available file="admin/cp.mf"/></bool>
    17961816      <jar destfile="admin/cp.jar" manifest="admin/cp.mf"/>
    … …  
    31853205      optimize="${compile.optimize}"
    31863206      encoding="${compile.encoding}">
    3187       <compilerarg line="${env.JAVACFLAGS}"/>
     3207      <compilerarg line="${compile.javac.flags}"/>
    31883208      <classpath refid="compile.classpath"/>
    31893209      <include name="org/greenstone/gsdl3/${axis.servicesname}${axis.sitename}.java" />
    … …  
    32203240  </target>
    32213241
    3222   <target name="compile-core" depends="init"
     3242  <target name="compile-core" depends="init,needs-gs3-devel"
    32233243    description="Compile only the Greenstone core">
    32243244    <mkdir dir="${build.home}"/>
    … …  
    32323252           optimize="${compile.optimize}"
    32333253           encoding="${compile.encoding}">
    3234       <compilerarg line="${env.JAVACFLAGS}"/>
     3254      <compilerarg line="${compile.javac.flags}"/>
    32353255      <classpath>
    32363256            <path refid="compile.classpath"/>
    … …  
    32463266         optimize="${compile.optimize}"
    32473267         encoding="${compile.encoding}">
    3248         <compilerarg line="${env.JAVACFLAGS}"/>
     3268        <compilerarg line="${compile.javac.flags}"/>
    32493269        <classpath>
    32503270              <path refid="compile.classpath"/>
    … …  
    37043724    </exec>
    37053725  </target>
    3706   <target name="compile-common-src" depends="init">
     3726  <target name="compile-common-src" depends="init,needs-gs3-devel">
    37073727    <!-- unix: -->
    37083728    <exec executable="make" os="${os.unix}" dir="${common.src.home}" failonerror="true">
    … …  
    37473767    if="collection.building.enabled"/>
    37483768
    3749   <target name="compile-collection-building" depends="init,compile-build-src,compile-gli" if="collection.building.enabled"
     3769  <target name="compile-collection-building" depends="init,needs-gs3-devel,compile-build-src,compile-gli" if="collection.building.enabled"
    37503770    description="Compile only the collection building components">
    37513771    <!-- make install for common-src -->
    … …  
    38543874  </target>
    38553875 
    3856   <target name="compile-gli" depends="init" if="collection.building.enabled">
     3876  <target name="compile-gli" depends="init,needs-gs3-devel" if="collection.building.enabled">
    38573877    <if><bool><isset property="with.gli.and.gems"/></bool>
    38583878      <!-- gli -->
    … …  
    42704290
    42714291  <!-- common-src is done separately and needs to be compiled first -->
    4272   <target name="compile-build-src" depends="init" if="collection.building.enabled">
     4292  <target name="compile-build-src" depends="init,needs-gs3-devel" if="collection.building.enabled">
    42734293   
    42744294    <exec executable="make" dir="${build.src.home}" os="${os.unix}" failonerror="true">
    … …  
    45754595                       optimize="${compile.optimize}"
    45764596                       encoding="${compile.encoding}">
    4577                   <compilerarg line="${env.JAVACFLAGS}"/>
     4597                  <compilerarg line="${compile.javac.flags}"/>
    45784598                  <classpath>
    45794599                    <fileset dir="${basedir}/ext/testing/lib/java">
Note: See TracChangeset for help on using the changeset viewer.