Changeset 34610


Ignore:
Timestamp:
2020-12-16T22:23:01+13:00 (19 months ago)
Author:
anupama
Message:
  1. rk2 related changes to finally work with changeover from http to https for greenstone.org. Related to previous release-kits changes from today (most of 34603 to 34609, though one or two are related to IsisGdl). 2. mojave's compile.xml further also specifically wgets the IsisGdl.mac64mojave binary for now, so that all OS release-kits are known to still work as before, and the Mac GS2 caveat and GS3.10 release binaries' IsisGdl have now also been tested to work after creating and installing them.
Location:
main/trunk/release-kits/kits
Files:
8 edited

Legend:

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

    r34570 r34610  
    548548        <if><bool><or><equals arg1="${rk.os}" arg2="mac"/><equals arg1="${rk.os}" arg2="linux"/></or></bool>
    549549            <mkdir dir="compiled/bin/windows"/>
    550             <get src="${server.exe.location}" dest="compiled/bin/windows/server.exe"/>
     550            <!--<get src="${server.exe.location}" dest="compiled/bin/windows/server.exe"/>-->
     551            <exec executable="wget" failonerror="true">
     552              <arg value="-P"/>
     553              <arg value="compiled/bin/windows"/>
     554              <arg value="--no-check-certificate"/>
     555              <arg value="${server.exe.location}"/>
     556            </exec>
     557            <move file="compiled/bin/windows/latest-server.exe"
     558                  tofile="distributions/${dist.name}/bin/windows/server.exe"/>
    551559
    552560            <if><bool><equals arg1="${post.2.83.version}" arg2="true"/></bool>
  • main/trunk/release-kits/kits/rk2/ant-scripts/elcapitan-compile.xml

    r34570 r34610  
    580580        <if><bool><or><equals arg1="${rk.os}" arg2="mac"/><equals arg1="${rk.os}" arg2="linux"/></or></bool>
    581581            <mkdir dir="compiled/bin/windows"/>
    582             <get src="${server.exe.location}" dest="compiled/bin/windows/server.exe"/>
     582            <!--<get src="${server.exe.location}" dest="compiled/bin/windows/server.exe"/>-->
     583            <exec executable="wget" failonerror="true">
     584              <arg value="-P"/>
     585              <arg value="compiled/bin/windows"/>
     586              <arg value="--no-check-certificate"/>
     587              <arg value="${server.exe.location}"/>
     588            </exec>
     589            <move file="compiled/bin/windows/latest-server.exe"
     590                  tofile="distributions/${dist.name}/bin/windows/server.exe"/>
    583591
    584592            <if><bool><equals arg1="${post.2.83.version}" arg2="true"/></bool>
  • main/trunk/release-kits/kits/rk2/ant-scripts/lin32-compile.xml

    r34570 r34610  
    540540        <if><bool><or><equals arg1="${rk.os}" arg2="mac"/><equals arg1="${rk.os}" arg2="linux"/></or></bool>
    541541            <mkdir dir="compiled/bin/windows"/>
    542             <get src="${server.exe.location}" dest="compiled/bin/windows/server.exe"/>
     542            <!--<get src="${server.exe.location}" dest="compiled/bin/windows/server.exe"/>-->
     543            <exec executable="wget" failonerror="true">
     544              <arg value="-P"/>
     545              <arg value="compiled/bin/windows"/>
     546              <arg value="--no-check-certificate"/>
     547              <arg value="${server.exe.location}"/>
     548            </exec>
     549            <move file="compiled/bin/windows/latest-server.exe"
     550                  tofile="distributions/${dist.name}/bin/windows/server.exe"/>
    543551
    544552            <if><bool><equals arg1="${post.2.83.version}" arg2="true"/></bool>
  • main/trunk/release-kits/kits/rk2/ant-scripts/lin64-compile.xml

    r34570 r34610  
    546546        <if><bool><or><equals arg1="${rk.os}" arg2="mac"/><equals arg1="${rk.os}" arg2="linux"/></or></bool>
    547547            <mkdir dir="compiled/bin/windows"/>
    548             <get src="${server.exe.location}" dest="compiled/bin/windows/server.exe"/>
     548            <!--<get src="${server.exe.location}" dest="compiled/bin/windows/server.exe"/>-->
     549            <exec executable="wget" failonerror="true">
     550              <arg value="-P"/>
     551              <arg value="compiled/bin/windows"/>
     552              <arg value="--no-check-certificate"/>
     553              <arg value="${server.exe.location}"/>
     554            </exec>
     555            <move file="compiled/bin/windows/latest-server.exe"
     556                  tofile="distributions/${dist.name}/bin/windows/server.exe"/>
    549557
    550558            <if><bool><equals arg1="${post.2.83.version}" arg2="true"/></bool>
  • main/trunk/release-kits/kits/rk2/ant-scripts/mojave-compile.xml

    r34571 r34610  
    261261            <!-- for 64 bit need to copy in the statically compiled IsisGdl -->
    262262            <!--<delete file="${basedir}/compiled/bin/${os.shell}/IsisGdl"/>-->
    263             <get src="http://www.greenstone.org/caveat-emptor/IsisGdl.macleopard" dest="${basedir}/compiled/bin/${os.shell}/IsisGdl"/>
    264             <!--<move file="${basedir}/compiled/bin/${os.shell}/IsisGdl.bin32" tofile="${basedir}/compiled/bin/${os.shell}/IsisGdl"/>-->
     263            <!--<get src="http://www.greenstone.org/caveat-emptor/IsisGdl.macleopard" dest="${basedir}/compiled/bin/${os.shell}/IsisGdl"/>-->
     264            <!--<get src="http://www.greenstone.org/caveat-emptor/IsisGdl.mac64mojave" dest="${basedir}/compiled/bin/${os.shell}/IsisGdl"/>-->
     265            <exec executable="wget" failonerror="true">
     266              <arg value="-P"/>
     267              <arg value="${basedir}/compiled/bin/${os.shell}"/>
     268              <arg value="--no-check-certificate"/>
     269              <arg value="http://www.greenstone.org/caveat-emptor/IsisGdl.mac64mojave"/>
     270            </exec>
     271           
     272            <move file="${basedir}/compiled/bin/${os.shell}/IsisGdl.mac64mojave" tofile="${basedir}/compiled/bin/${os.shell}/IsisGdl"/>
    265273            <chmod perm="755" file="${basedir}/compiled/bin/${os.shell}/IsisGdl"/>
    266274        </if>
     
    580588        <if><bool><or><equals arg1="${rk.os}" arg2="mac"/><equals arg1="${rk.os}" arg2="linux"/></or></bool>
    581589            <mkdir dir="compiled/bin/windows"/>
    582             <get src="${server.exe.location}" dest="compiled/bin/windows/server.exe"/>
     590            <!--<get src="${server.exe.location}" dest="compiled/bin/windows/server.exe"/>-->
     591            <exec executable="wget" failonerror="true">
     592              <arg value="-P"/>
     593              <arg value="compiled/bin/windows"/>
     594              <arg value="--no-check-certificate"/>
     595              <arg value="${server.exe.location}"/>
     596            </exec>
     597            <move file="compiled/bin/windows/latest-server.exe"
     598                  tofile="distributions/${dist.name}/bin/windows/server.exe"/>
    583599
    584600            <if><bool><equals arg1="${post.2.83.version}" arg2="true"/></bool>
  • main/trunk/release-kits/kits/rk2/ant-scripts/mountainlion-compile.xml

    r34570 r34610  
    562562        <if><bool><or><equals arg1="${rk.os}" arg2="mac"/><equals arg1="${rk.os}" arg2="linux"/></or></bool>
    563563            <mkdir dir="compiled/bin/windows"/>
    564             <get src="${server.exe.location}" dest="compiled/bin/windows/server.exe"/>
     564            <!--<get src="${server.exe.location}" dest="compiled/bin/windows/server.exe"/>-->
     565            <exec executable="wget" failonerror="true">
     566              <arg value="-P"/>
     567              <arg value="compiled/bin/windows"/>
     568              <arg value="--no-check-certificate"/>
     569              <arg value="${server.exe.location}"/>
     570            </exec>
     571            <move file="compiled/bin/windows/latest-server.exe"
     572                  tofile="distributions/${dist.name}/bin/windows/server.exe"/>
    565573
    566574            <if><bool><equals arg1="${post.2.83.version}" arg2="true"/></bool>
  • main/trunk/release-kits/kits/rk2/installer/build.xml

    r32733 r34610  
    394394        <shortcut
    395395            file="${startmenu.path}\Documentation\Greenstone Website.url"
    396             url="http://www.greenstone.org" />
     396            url="https://www.greenstone.org" />
    397397
    398398    </target>
  • main/trunk/release-kits/kits/sork2/ant-scripts/build.xml

    r28535 r34610  
    3838            <arg value="distributions/${dist.name}/bin/windows"/>
    3939        </exec>
    40         <get src="${server.exe.location}" dest="distributions/${dist.name}/bin/windows/server.exe"/>
     40        <!--<get src="${server.exe.location}" dest="distributions/${dist.name}/bin/windows/server.exe"/>-->
     41        <exec executable="wget" failonerror="true">
     42          <arg value="-P"/>
     43          <arg value="distributions/${dist.name}/bin/windows/"/>
     44          <arg value="--no-check-certificate"/>
     45          <arg value="${server.exe.location}"/>
     46        </exec>
     47        <move file="distributions/${dist.name}/bin/windows/latest-server.exe"
     48              tofile="distributions/${dist.name}/bin/windows/server.exe"/>
     49
    4150        <delete dir="distributions/${dist.name}/bin/windows/imagemagick"/>
    4251        <delete dir="distributions/${dist.name}/bin/windows/ghostscript"/>
Note: See TracChangeset for help on using the changeset viewer.