Ignore:
Timestamp:
2020-11-26T14:48:37+13:00 (3 years ago)
Author:
kjdon
Message:

on bedrock, the get command for svn files doesn't work with the new https svn server - to do with security certificates. Rather than getting the certificates, we just switch to using svn, which is how we get every other file out of the greenstone svn repository. not sure why these 2 were set up to use get instead.

Location:
main/trunk/release-kits/kits/rk2/ant-scripts
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • main/trunk/release-kits/kits/rk2/ant-scripts/compile.xml

    r31969 r34570  
    544544        <!-- tidy up gli -->
    545545        <antcall target="gli-tidy-for-dist"><param name="glibasedir" value="compiled/gli"/></antcall>
    546 
     546        <echo>Setting up export to cdrom package</echo>
    547547        <!-- mac and linux: insert export to cdrom package -->
    548548        <if><bool><or><equals arg1="${rk.os}" arg2="mac"/><equals arg1="${rk.os}" arg2="linux"/></or></bool>
    … …  
    551551
    552552            <if><bool><equals arg1="${post.2.83.version}" arg2="true"/></bool>
    553                 <get src="${svn.root}/main/${branch.path}/binaries/windows/bin/Setup.exe" dest="compiled/bin/windows/Setup.exe"/>
    554                 <get src="${svn.root}/main/${branch.path}/binaries/windows/bin/gssetup.exe" dest="compiled/bin/windows/gssetup.exe"/>
     553                <!--<get src="${svn.root}/main/${branch.path}/binaries/windows/bin/Setup.exe" dest="compiled/bin/windows/Setup.exe"/>
     554                <get src="${svn.root}/main/${branch.path}/binaries/windows/bin/gssetup.exe" dest="compiled/bin/windows/gssetup.exe"/>-->
     555                <exec executable="svn">
     556                  <arg value="export"/>
     557                  <arg value="${svn.root}/main/${branch.path}/binaries/windows/bin/Setup.exe"/>
     558                  <arg value="compiled/bin/windows/Setup.exe"/>
     559                </exec>
     560                <exec executable="svn">
     561                  <arg value="export"/>
     562                  <arg value="${svn.root}/main/${branch.path}/binaries/windows/bin/gssetup.exe"/>
     563                  <arg value="compiled/bin/windows/gssetup.exe"/>
     564                </exec>
    555565
    556566                <else>
    557                     <get src="${svn.root}/main/trunk/binaries/windows/bin/Setup.exe" dest="compiled/bin/windows/Setup.exe"/>
    558                     <get src="${svn.root}/main/trunk/binaries/windows/bin/gssetup.exe" dest="compiled/bin/windows/gssetup.exe"/>
     567                    <!--<get src="${svn.root}/main/trunk/binaries/windows/bin/Setup.exe" dest="compiled/bin/windows/Setup.exe"/>
     568                    <get src="${svn.root}/main/trunk/binaries/windows/bin/gssetup.exe" dest="compiled/bin/windows/gssetup.exe"/>-->
     569                <exec executable="svn">
     570                  <arg value="export"/>
     571                  <arg value="${svn.root}/main/trunk/binaries/windows/bin/Setup.exe"/>
     572                  <arg value="compiled/bin/windows/Setup.exe"/>
     573                </exec>
     574                <exec executable="svn">
     575                  <arg value="export"/>
     576                  <arg value="${svn.root}/main/trunk/binaries/windows/bin/gssetup.exe"/>
     577                  <arg value="compiled/bin/windows/gssetup.exe"/>
     578                </exec>
    559579                </else>
    560580            </if>

  • main/trunk/release-kits/kits/rk2/ant-scripts/elcapitan-compile.xml

    r32010 r34570  
    576576        <!-- tidy up gli -->
    577577        <antcall target="gli-tidy-for-dist"><param name="glibasedir" value="compiled/gli"/></antcall>
    578 
     578        <echo>Setting up export to cdrom package</echo>
    579579        <!-- mac and linux: insert export to cdrom package -->
    580580        <if><bool><or><equals arg1="${rk.os}" arg2="mac"/><equals arg1="${rk.os}" arg2="linux"/></or></bool>
    … …  
    583583
    584584            <if><bool><equals arg1="${post.2.83.version}" arg2="true"/></bool>
    585                 <get src="${svn.root}/main/${branch.path}/binaries/windows/bin/Setup.exe" dest="compiled/bin/windows/Setup.exe"/>
    586                 <get src="${svn.root}/main/${branch.path}/binaries/windows/bin/gssetup.exe" dest="compiled/bin/windows/gssetup.exe"/>
     585                <!--<get src="${svn.root}/main/${branch.path}/binaries/windows/bin/Setup.exe" dest="compiled/bin/windows/Setup.exe"/>
     586                <get src="${svn.root}/main/${branch.path}/binaries/windows/bin/gssetup.exe" dest="compiled/bin/windows/gssetup.exe"/>-->
     587                <exec executable="svn">
     588                  <arg value="export"/>
     589                  <arg value="${svn.root}/main/${branch.path}/binaries/windows/bin/Setup.exe"/>
     590                  <arg value="compiled/bin/windows/Setup.exe"/>
     591                </exec>
     592                <exec executable="svn">
     593                  <arg value="export"/>
     594                  <arg value="${svn.root}/main/${branch.path}/binaries/windows/bin/gssetup.exe"/>
     595                  <arg value="compiled/bin/windows/gssetup.exe"/>
     596                </exec>
    587597
    588598                <else>
    589                     <get src="${svn.root}/main/trunk/binaries/windows/bin/Setup.exe" dest="compiled/bin/windows/Setup.exe"/>
    590                     <get src="${svn.root}/main/trunk/binaries/windows/bin/gssetup.exe" dest="compiled/bin/windows/gssetup.exe"/>
     599                    <!--<get src="${svn.root}/main/trunk/binaries/windows/bin/Setup.exe" dest="compiled/bin/windows/Setup.exe"/>
     600                    <get src="${svn.root}/main/trunk/binaries/windows/bin/gssetup.exe" dest="compiled/bin/windows/gssetup.exe"/>-->
     601                <exec executable="svn">
     602                  <arg value="export"/>
     603                  <arg value="${svn.root}/main/trunk/binaries/windows/bin/Setup.exe"/>
     604                  <arg value="compiled/bin/windows/Setup.exe"/>
     605                </exec>
     606                <exec executable="svn">
     607                  <arg value="export"/>
     608                  <arg value="${svn.root}/main/trunk/binaries/windows/bin/gssetup.exe"/>
     609                  <arg value="compiled/bin/windows/gssetup.exe"/>
     610                </exec>
    591611                </else>
    592612            </if>

  • main/trunk/release-kits/kits/rk2/ant-scripts/lin32-compile.xml

    r32735 r34570  
    536536        <antcall target="gli-tidy-for-dist"><param name="glibasedir" value="compiled/gli"/></antcall>
    537537
     538        <echo>Setting up export to cdrom package</echo>
    538539        <!-- mac and linux: insert export to cdrom package -->
    539540        <if><bool><or><equals arg1="${rk.os}" arg2="mac"/><equals arg1="${rk.os}" arg2="linux"/></or></bool>
    … …  
    542543
    543544            <if><bool><equals arg1="${post.2.83.version}" arg2="true"/></bool>
    544                 <get src="${svn.root}/main/${branch.path}/binaries/windows/bin/Setup.exe" dest="compiled/bin/windows/Setup.exe"/>
    545                 <get src="${svn.root}/main/${branch.path}/binaries/windows/bin/gssetup.exe" dest="compiled/bin/windows/gssetup.exe"/>
     545                <!--<get src="${svn.root}/main/${branch.path}/binaries/windows/bin/Setup.exe" dest="compiled/bin/windows/Setup.exe"/>
     546                <get src="${svn.root}/main/${branch.path}/binaries/windows/bin/gssetup.exe" dest="compiled/bin/windows/gssetup.exe"/>-->
     547                <exec executable="svn">
     548                  <arg value="export"/>
     549                  <arg value="${svn.root}/main/${branch.path}/binaries/windows/bin/Setup.exe"/>
     550                  <arg value="compiled/bin/windows/Setup.exe"/>
     551                </exec>
     552                <exec executable="svn">
     553                  <arg value="export"/>
     554                  <arg value="${svn.root}/main/${branch.path}/binaries/windows/bin/gssetup.exe"/>
     555                  <arg value="compiled/bin/windows/gssetup.exe"/>
     556                </exec>
    546557
    547558                <else>
    548                     <get src="${svn.root}/main/trunk/binaries/windows/bin/Setup.exe" dest="compiled/bin/windows/Setup.exe"/>
    549                     <get src="${svn.root}/main/trunk/binaries/windows/bin/gssetup.exe" dest="compiled/bin/windows/gssetup.exe"/>
     559                    <!--<get src="${svn.root}/main/trunk/binaries/windows/bin/Setup.exe" dest="compiled/bin/windows/Setup.exe"/>
     560                        <get src="${svn.root}/main/trunk/binaries/windows/bin/gssetup.exe" dest="compiled/bin/windows/gssetup.exe"/>-->
     561                <exec executable="svn">
     562                  <arg value="export"/>
     563                  <arg value="${svn.root}/main/trunk/binaries/windows/bin/Setup.exe"/>
     564                  <arg value="compiled/bin/windows/Setup.exe"/>
     565                </exec>
     566                <exec executable="svn">
     567                  <arg value="export"/>
     568                  <arg value="${svn.root}/main/trunk/binaries/windows/bin/gssetup.exe"/>
     569                  <arg value="compiled/bin/windows/gssetup.exe"/>
     570                </exec>
     571
     572                   
    550573                </else>
    551574            </if>

  • main/trunk/release-kits/kits/rk2/ant-scripts/lin64-compile.xml

    r32734 r34570  
    542542        <!-- tidy up gli -->
    543543        <antcall target="gli-tidy-for-dist"><param name="glibasedir" value="compiled/gli"/></antcall>
    544 
     544        <echo>Setting up export to cdrom package</echo>
    545545        <!-- mac and linux: insert export to cdrom package -->
    546546        <if><bool><or><equals arg1="${rk.os}" arg2="mac"/><equals arg1="${rk.os}" arg2="linux"/></or></bool>
    … …  
    549549
    550550            <if><bool><equals arg1="${post.2.83.version}" arg2="true"/></bool>
    551                 <get src="${svn.root}/main/${branch.path}/binaries/windows/bin/Setup.exe" dest="compiled/bin/windows/Setup.exe"/>
    552                 <get src="${svn.root}/main/${branch.path}/binaries/windows/bin/gssetup.exe" dest="compiled/bin/windows/gssetup.exe"/>
     551            <!--<get src="${svn.root}/main/${branch.path}/binaries/windows/bin/Setup.exe" dest="compiled/bin/windows/Setup.exe"/>
     552                <get src="${svn.root}/main/${branch.path}/binaries/windows/bin/gssetup.exe" dest="compiled/bin/windows/gssetup.exe"/>-->
     553            <exec executable="svn">
     554                  <arg value="export"/>
     555                  <arg value="${svn.root}/main/${branch.path}/binaries/windows/bin/Setup.exe"/>
     556                  <arg value="compiled/bin/windows/Setup.exe"/>
     557                </exec>
     558                <exec executable="svn">
     559                  <arg value="export"/>
     560                  <arg value="${svn.root}/main/${branch.path}/binaries/windows/bin/gssetup.exe"/>
     561                  <arg value="compiled/bin/windows/gssetup.exe"/>
     562                </exec>
    553563
    554564                <else>
    555                     <get src="${svn.root}/main/trunk/binaries/windows/bin/Setup.exe" dest="compiled/bin/windows/Setup.exe"/>
    556                     <get src="${svn.root}/main/trunk/binaries/windows/bin/gssetup.exe" dest="compiled/bin/windows/gssetup.exe"/>
     565                    <!--<get src="${svn.root}/main/trunk/binaries/windows/bin/Setup.exe" dest="compiled/bin/windows/Setup.exe"/>
     566                        <get src="${svn.root}/main/trunk/binaries/windows/bin/gssetup.exe" dest="compiled/bin/windows/gssetup.exe"/>-->
     567                    <exec executable="svn">
     568                  <arg value="export"/>
     569                  <arg value="${svn.root}/main/trunk/binaries/windows/bin/Setup.exe"/>
     570                  <arg value="compiled/bin/windows/Setup.exe"/>
     571                </exec>
     572                <exec executable="svn">
     573                  <arg value="export"/>
     574                  <arg value="${svn.root}/main/trunk/binaries/windows/bin/gssetup.exe"/>
     575                  <arg value="compiled/bin/windows/gssetup.exe"/>
     576                </exec>
     577
    557578                </else>
    558579            </if>

  • main/trunk/release-kits/kits/rk2/ant-scripts/mountainlion-compile.xml

    r32009 r34570  
    558558        <!-- tidy up gli -->
    559559        <antcall target="gli-tidy-for-dist"><param name="glibasedir" value="compiled/gli"/></antcall>
    560 
     560        <echo>Setting up export to cdrom package</echo>
    561561        <!-- mac and linux: insert export to cdrom package -->
    562562        <if><bool><or><equals arg1="${rk.os}" arg2="mac"/><equals arg1="${rk.os}" arg2="linux"/></or></bool>
    … …  
    565565
    566566            <if><bool><equals arg1="${post.2.83.version}" arg2="true"/></bool>
    567                 <get src="${svn.root}/main/${branch.path}/binaries/windows/bin/Setup.exe" dest="compiled/bin/windows/Setup.exe"/>
    568                 <get src="${svn.root}/main/${branch.path}/binaries/windows/bin/gssetup.exe" dest="compiled/bin/windows/gssetup.exe"/>
     567                <!--<get src="${svn.root}/main/${branch.path}/binaries/windows/bin/Setup.exe" dest="compiled/bin/windows/Setup.exe"/>
     568                    <get src="${svn.root}/main/${branch.path}/binaries/windows/bin/gssetup.exe" dest="compiled/bin/windows/gssetup.exe"/>-->
     569                <exec executable="svn">
     570                  <arg value="export"/>
     571                  <arg value="${svn.root}/main/${branch.path}/binaries/windows/bin/Setup.exe"/>
     572                  <arg value="compiled/bin/windows/Setup.exe"/>
     573                </exec>
     574                <exec executable="svn">
     575                  <arg value="export"/>
     576                  <arg value="${svn.root}/main/${branch.path}/binaries/windows/bin/gssetup.exe"/>
     577                  <arg value="compiled/bin/windows/gssetup.exe"/>
     578                </exec>
     579                   
    569580
    570581                <else>
    571                     <get src="${svn.root}/main/trunk/binaries/windows/bin/Setup.exe" dest="compiled/bin/windows/Setup.exe"/>
    572                     <get src="${svn.root}/main/trunk/binaries/windows/bin/gssetup.exe" dest="compiled/bin/windows/gssetup.exe"/>
     582                <!--    <get src="${svn.root}/main/trunk/binaries/windows/bin/Setup.exe" dest="compiled/bin/windows/Setup.exe"/>
     583                    <get src="${svn.root}/main/trunk/binaries/windows/bin/gssetup.exe" dest="compiled/bin/windows/gssetup.exe"/>-->
     584                <exec executable="svn">
     585                  <arg value="export"/>
     586                  <arg value="${svn.root}/main/trunk/binaries/windows/bin/Setup.exe"/>
     587                  <arg value="compiled/bin/windows/Setup.exe"/>
     588                </exec>
     589                <exec executable="svn">
     590                  <arg value="export"/>
     591                  <arg value="${svn.root}/main/trunk/binaries/windows/bin/gssetup.exe"/>
     592                  <arg value="compiled/bin/windows/gssetup.exe"/>
     593                </exec>
     594               
    573595                </else>
    574596            </if>
Note: See TracChangeset for help on using the changeset viewer.