Ignore:
Timestamp:
2013-03-27T17:03:26+13:00 (11 years ago)
Author:
ak19
Message:

Shifting instructions for svn updating gs2build/common-src/cgi-bin scripts for moving into gs3/web/WEB-INF/cgi to its own target and making sure it gets called at the same time as it did before (previously in prepare-gli and svnupdate-gli targets, now called alongside those targets). Now metadata-server.pl in cgi-bin is also svn-updated.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • main/trunk/greenstone3/build.xml

    r27034 r27135  
    20652065    description="Update (SVN update, configure, compile etc) only the collection building components"/>
    20662066
    2067   <target name="svnupdate-collection-building" if="collection.building.enabled" depends="init,svnupdate-gs2build,svnupdate-gli" unless="nosvn.mode"
     2067  <target name="svnupdate-collection-building" if="collection.building.enabled" depends="init,svnupdate-gs2build,svnupdate-cgi,svnupdate-gli" unless="nosvn.mode"
    20682068    description="SVN update the collection building components">
    20692069  </target>
    20702070
    2071   <target name="prepare-collection-building" depends="init,prepare-gs2build,prepare-gli" if="collection.building.enabled">
     2071  <target name="prepare-collection-building" depends="init,prepare-gs2build,svnupdate-cgi,prepare-gli" if="collection.building.enabled">
    20722072  </target>
    20732073
    … …  
    21252125
    21262126  <!-- ============== gli targets ================================= -->
     2127 
     2128  <!-- gliserver.pl, gsdlCGI.pm and metadata-server.pl updated are updated alongside
     2129       this in target svnupdate-collection-building -->
    21272130  <target name="svnupdate-gli" if="collection.building.enabled" depends="init" unless="nosvn.mode">
    21282131
    … …  
    21332136    </exec>
    21342137
    2135    <exec executable="svn" dir="web/WEB-INF/cgi">
     2138  </target>
     2139
     2140  <!-- gliserver.pl, gsdlCGI.pm and metadata-server.pl updated are updated
     2141       alongside this prepare-gli target in target prepare-collection-building -->
     2142  <target name="prepare-gli" depends="init" if="collection.building.enabled" unless="gli.present">
     2143    <!-- checkout -->
     2144    <if><bool><and><not><istrue value="${nosvn.mode}"/></not><isset property="with.gli.and.gems"/></and></bool>
     2145
     2146    <exec executable="svn">
     2147      <arg value="checkout"/>
     2148      <arg value="${svn.root}/main/${branch.path}/gli"/>
     2149      <arg value="-r"/><arg value="${branch.revision}"/>
     2150    </exec>
     2151
     2152    </if>
     2153  </target>
     2154
     2155  <!-- svn checkout gliserver.pl, gsdlCGI.pm for gli applet,
     2156       as well as gsdlCGI.pm-dependent metadata-server.pl
     2157       (checksum.pl used only by GS2 for depositdspace.dm) -->
     2158  <target name="svnupdate-cgi">
     2159
     2160    <exec executable="svn" dir="web/WEB-INF/cgi">
    21362161      <arg value="export"/>
    21372162      <arg value="-r"/><arg value="${branch.revision}"/>
    … …  
    21432168      <arg value="${svn.root}/main/${branch.path}/greenstone2/common-src/cgi-bin/gsdlCGI.pm"/>
    21442169    </exec>
    2145 
    2146   </target>
    2147 
    2148   <target name="prepare-gli" depends="init" if="collection.building.enabled" unless="gli.present">
    2149     <!-- checkout -->
    2150     <if><bool><and><not><istrue value="${nosvn.mode}"/></not><isset property="with.gli.and.gems"/></and></bool>
    2151 
    2152     <exec executable="svn">
    2153       <arg value="checkout"/>
    2154       <arg value="${svn.root}/main/${branch.path}/gli"/>
    2155       <arg value="-r"/><arg value="${branch.revision}"/>
    2156     </exec>
    2157 
    2158    <exec executable="svn" dir="web/WEB-INF/cgi">
    2159       <arg value="export"/>
    2160       <arg value="-r"/><arg value="${branch.revision}"/>
    2161       <arg value="${svn.root}/main/${branch.path}/greenstone2/common-src/cgi-bin/gliserver.pl"/>
    2162     </exec>
    21632170    <exec executable="svn" dir="web/WEB-INF/cgi">
    21642171      <arg value="export"/>
    21652172      <arg value="-r"/><arg value="${branch.revision}"/>
    2166       <arg value="${svn.root}/main/${branch.path}/greenstone2/common-src/cgi-bin/gsdlCGI.pm"/>
    2167     </exec>
    2168 
    2169     </if>
    2170   </target>
     2173      <arg value="${svn.root}/main/${branch.path}/greenstone2/common-src/cgi-bin/metadata-server.pl"/>
     2174    </exec>
     2175  </target>
     2176
    21712177 
    21722178  <target name="clean-gli" depends="init" if="collection.building.enabled">
Note: See TracChangeset for help on using the changeset viewer.