Changeset 37344 for main


Ignore:
Timestamp:
2023-02-24T11:05:47+13:00 (14 months ago)
Author:
kjdon
Message:

added in placeholder for svn args needed by release kits to trust server certificates.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • main/trunk/greenstone3/build.xml

    r37333 r37344  
    574574  <!--constants -->
    575575  <property name="svn.root" value="https://svn.greenstone.org"/>
     576  <!-- release kits need to set this to - -non-interactive - -trust-server-cert"
     577       in order to bypass having to manually accept the new SSL certificate
     578       every three months -->
     579  <property name="global-svn-args" value=""/>
     580
    576581  <property name="gsorg.root" value="https://www.greenstone.org"/>
    577582  <!--<property name="gsorg.root" value="http://community.nzdl.org"/>-->
    … …  
    20342039  <target name="svnupdate-web" unless="nosvn.mode">
    20352040    <exec executable="svn">
     2041      <arg line="${global-svn-args}"/>
    20362042      <arg value="update"/>
    20372043      <arg value="${web.writablehome}"/>
    … …  
    35323538  <target name="svnupdate-core" unless="nosvn.mode">
    35333539    <exec executable="svn">
     3540      <arg line="${global-svn-args}"/>
    35343541      <arg value="update"/>
    35353542      <arg value="${basedir}"/>
    … …  
    37473754  <target name="prepare-wget-for-windows">
    37483755    <exec executable="svn" osfamily="windows" dir="${basedir}/bin/windows">
     3756      <arg line="${global-svn-args}"/>
    37493757      <arg value="export"/>
    37503758      <arg value="-r"/><arg value="${branch.revision}"/>
    … …  
    37523760    </exec>
    37533761    <exec executable="svn" osfamily="windows" dir="${basedir}/bin/windows">
     3762      <arg line="${global-svn-args}"/>
    37543763      <arg value="export"/>
    37553764      <arg value="-r"/><arg value="${branch.revision}"/>
    … …  
    37663775  <target name="svnupdate-packages" unless="nosvn.mode">
    37673776    <exec executable="svn">
     3777      <arg line="${global-svn-args}"/>
    37683778      <arg value="update"/>
    37693779      <arg value="${src.packages.home}"/>
    … …  
    37833793    <mkdir dir="${gs2build.home}/bin/${os.bin.dir}"/> <!-- mkdir darwin or linux -->
    37843794    <exec executable="svn" dir="${gs2build.home}/bin/${os.bin.dir}">
     3795      <arg line="${global-svn-args}"/>
    37853796      <arg value="export"/>
    37863797      <arg value="-r"/><arg value="${branch.revision}"/>
    … …  
    39783989  <target name="svnupdate-common-src" depends="init" if="collection.building.disabled" unless="nosvn.mode">
    39793990    <exec executable="svn">
     3991      <arg line="${global-svn-args}"/>
    39803992      <arg value="update"/>
    39813993      <arg value="${common.src.home}"/>
    … …  
    39924004    <echo>checking out common-src</echo>
    39934005    <exec executable="svn">
     4006      <arg line="${global-svn-args}"/>
    39944007      <arg value="checkout"/>
    39954008      <arg value="${svn.root}/main/${branch.path}/greenstone2/common-src"/>
    … …  
    41374150
    41384151    <exec executable="svn">
     4152      <arg line="${global-svn-args}"/>
    41394153      <arg value="update"/>
    41404154      <arg value="${gli.home}"/>
    … …  
    41494163
    41504164    <exec executable="svn">
     4165      <arg line="${global-svn-args}"/>
    41514166      <arg value="checkout"/>
    41524167      <arg value="${svn.root}/main/${branch.path}/gli"/>
    … …  
    42124227    <echo>svn updating gs2build</echo>
    42134228    <exec executable="svn">
     4229      <arg line="${global-svn-args}"/>
    42144230      <arg value="update"/>
    42154231      <arg value="${gs2build.home}"/>
    … …  
    42324248    <echo>checking out gs2build</echo>
    42334249    <exec executable="svn">
     4250      <arg line="${global-svn-args}"/>
    42344251      <arg value="checkout"/>
    42354252      <arg value="${svn.root}/main/${branch.path}/gs2build"/>
    … …  
    42644281      <echo>Checking out the PDFBox extension into the GSDLHOME extension area</echo>
    42654282      <exec executable="svn">
     4283            <arg line="${global-svn-args}"/>
    42664284        <arg value="export"/>
    42674285        <arg value="${svn.root}/gs2-extensions/pdf-box/trunk/pdf-box-java.tar.gz"/>
    … …  
    43204338
    43214339      <exec executable="svn">
     4340        <arg line="${global-svn-args}"/>
    43224341    <arg value="checkout"/>
    43234342    <arg value="${svn.root}/gs2-extensions/imagemagick/trunk/src"/>
    … …  
    44764495      <echo>checking out gnome-lib extension</echo>
    44774496      <exec executable="svn">
     4497        <arg line="${global-svn-args}"/>
    44784498    <arg value="checkout"/>
    44794499    <arg value="${svn.root}/gs2-extensions/gnome-lib/trunk/src"/>
    … …  
    44924512
    44934513    <exec executable="svn">
     4514      <arg line="${global-svn-args}"/>
    44944515      <arg value="checkout"/>
    44954516      <arg value="${svn.root}/main/${branch.path}/binaries/windows"/>
    … …  
    45024523  <target name="update-winbin" depends="init" if="current.os.iswindows" unless="nosvn.mode">
    45034524    <exec executable="svn">
     4525      <arg line="${global-svn-args}"/>
    45044526      <arg value="update"/>
    45054527      <arg value="winbin"/>
    … …  
    46704692    <mkdir dir="${basedir}/flax-resources"/>
    46714693    <mkdir dir="${basedir}/flax-lib"/>
    4672     <exec executable="svn"><arg value="checkout"/><arg value="${flax.checkout.path}/src/java/org/flax"/>
     4694    <exec executable="svn"><arg line="${global-svn-args}"/><arg value="checkout"/><arg value="${flax.checkout.path}/src/java/org/flax"/>
    46734695      <arg value="src/java/org/flax"/></exec>
    4674     <exec executable="svn"><arg value="checkout"/><arg value="${flax.checkout.path}/src/java/org/greenstone/gsdl3/flax"/>
     4696    <exec executable="svn"><arg line="${global-svn-args}"/><arg value="checkout"/><arg value="${flax.checkout.path}/src/java/org/greenstone/gsdl3/flax"/>
    46754697      <arg value="src/java/org/greenstone/gsdl3/flax"/></exec>
    46764698    <exec executable="svn"><arg value="checkout"/><arg value="${flax.checkout.path}/src/java/org/greenstone/gsdl3/action/flax"/>
    46774699      <arg value="src/java/org/greenstone/gsdl3/action/flax"/></exec>
    4678      <exec executable="svn"><arg value="checkout"/><arg value="${flax.checkout.path}/web/WEB-INF/classes/flax"/>
     4700    <exec executable="svn"><arg line="${global-svn-args}"/><arg value="checkout"/><arg value="${flax.checkout.path}/web/WEB-INF/classes/flax"/>
    46794701      <arg value="${web.home}/WEB-INF/classes/flax"/></exec>
    4680     <exec executable="svn"><arg value="checkout"/><arg value="${flax.checkout.path}/web/interfaces/flax"/>
     4702    <exec executable="svn"><arg line="${global-svn-args}"/><arg value="checkout"/><arg value="${flax.checkout.path}/web/interfaces/flax"/>
    46814703      <arg value="${web.home}/interfaces/flax"/></exec>
    4682     <exec executable="svn"><arg value="checkout"/><arg value="${flax.checkout.path}/web/sites/flax"/>
     4704    <exec executable="svn"><arg line="${global-svn-args}"/><arg value="checkout"/><arg value="${flax.checkout.path}/web/sites/flax"/>
    46834705      <arg value="${web.home}/sites/flax"/></exec>
    4684     <exec executable="svn"><arg value="checkout"/><arg value="${flax.checkout.path}/flax-resources"/>
     4706    <exec executable="svn"><arg line="${global-svn-args}"/><arg value="checkout"/><arg value="${flax.checkout.path}/flax-resources"/>
    46854707      <arg value="flax-resources"/></exec>
    4686     <exec executable="svn"><arg value="checkout"/><arg value="${flax.checkout.path}/lib"/>
     4708    <exec executable="svn"><arg line="${global-svn-args}"/><arg value="checkout"/><arg value="${flax.checkout.path}/lib"/>
    46874709      <arg value="flax-lib"/></exec>
    46884710    <antcall target="flax-copy-del-files" />
    … …  
    47074729  <target name="update-flax" description="update flax from repository">
    47084730    <echo>updating flax ...</echo>
    4709     <exec executable="svn"><arg value="update"/>
     4731    <exec executable="svn"><arg line="${global-svn-args}"/><arg value="update"/>
    47104732      <arg value="src/java/org/flax"/></exec>
    4711     <exec executable="svn"><arg value="update"/>
     4733    <exec executable="svn"><arg line="${global-svn-args}"/><arg value="update"/>
    47124734      <arg value="src/java/org/greenstone/gsdl3/action/flax"/></exec>
    4713     <exec executable="svn"><arg value="update"/>
     4735    <exec executable="svn"><arg line="${global-svn-args}"/><arg value="update"/>
    47144736      <arg value="src/java/org/greenstone/gsdl3/flax"/></exec>
    4715     <exec executable="svn"><arg value="update"/>
     4737    <exec executable="svn"><arg line="${global-svn-args}"/><arg value="update"/>
    47164738      <arg value="${web.home}/WEB-INF/classes/flax"/></exec>
    4717     <exec executable="svn"><arg value="update"/>
     4739    <exec executable="svn"><arg line="${global-svn-args}"/><arg value="update"/>
    47184740      <arg value="${web.home}/interfaces/flax"/></exec>
    4719     <exec executable="svn"><arg value="update"/>
     4741    <exec executable="svn"><arg line="${global-svn-args}"/><arg value="update"/>
    47204742      <arg value="${web.home}/web/sites/flax"/></exec>
    4721     <exec executable="svn"><arg value="update"/>
     4743    <exec executable="svn"><arg line="${global-svn-args}"/><arg value="update"/>
    47224744      <arg value="flax-resources"/></exec>
    4723     <exec executable="svn"><arg value="update"/>
     4745    <exec executable="svn"><arg line="${global-svn-args}"/><arg value="update"/>
    47244746      <arg value="flax-lib"/></exec>
    47254747    <antcall target="compile-core" />
Note: See TracChangeset for help on using the changeset viewer.