Changeset 14510


Ignore:
Timestamp:
2007-09-11T11:35:03+12:00 (17 years ago)
Author:
oranfry
Message:

made the distribution build script work with svn, and fixed an apparent bug where the XML-Parser tarball for mac was not retrieved from the web before an attempt was made to extract it

Location:
greenstone3/branches/3-03
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • greenstone3/branches/3-03/build.xml

    r14500 r14510  
    7979  <property name="flax.svn.root" value="http://svn.greenstone.org/flax"/>
    8080
    81   <property name="svn.root" value="http://puka.cs.waikato.ac.nz/svn/greenstone"/>
     81  <property name="svn.root" value="http://svn.greenstone.org"/>
    8282<!--  <property name="cvs.root" value=":pserver:[email protected]:2402/usr/local/global-cvs/gsdl-src"/> -->
    8383  <!-- catalina home is set to tomcat basedir is already installed, otherwise
    … …  
    11331133    </svn> 
    11341134  </target>
     1135
     1136  <target name="update-winbin" depends="init" if="current.os.iswindows" unless="nocvs.mode">
     1137        <svn>
     1138            <update url="${svn.root}/other-projects/trunk/winbin" destPath="${basedir}/winbin"/>
     1139        </svn> 
     1140    </target>
    11351141 
    11361142  <target name="get-windows-binaries" depends="init" if="collection.building.enabled.windows">

  • greenstone3/branches/3-03/dist-resources/dist-build.xml

    r13930 r14510  
    2222  <!-- Create the binaries for windows distribution -->
    2323  <target name="prepare-windows" depends="init">
    24     <cvs command="checkout -P" package="gs2build" />
     24    <antcall target="checkout-gs2build"/>
     25    <antcall target="unzip-windows-packages"/>
    2526    <antcall target="unzip-windows-packages"/>
    2627    <antcall target="checkout-winbin"/>
    … …  
    2829  </target>
    2930 
    30   <target name="build-windows" depends="init">
    31     <antcall target="cvsupdate-distribution"/>
    32     <cvs command="update -dP" package="winbin" />
    33     <antcall target="get-windows-binaries"/>
    34     <antcall target="rename-gs2build-files-windows"/>
    35     <antcall target="compile-gs2build"/>
    36     <antcall target="compile-packages"/>
    37    </target>
     31    <target name="build-windows" depends="init">
     32
     33        <antcall target="svnupdate-distribution"/>
     34        <antcall target="update-winbin"/>
     35        <antcall target="get-windows-binaries"/>
     36        <antcall target="rename-gs2build-files-windows"/>
     37        <antcall target="compile-gs2build"/>
     38        <antcall target="compile-packages"/>
     39
     40    </target>
    3841 
    3942  <!-- Create the binaries for Unix/Mac distributions -->
    4043  <target name="prepare-unix" depends="init">
    41     <cvs command="checkout -P" package="gs2build"/>
    42     <cvs command="checkout -P" packages="gli"/>
     44    <antcall target="checkout-gs2build"/>
     45    <antcall target="checkout-gli"/>
    4346  </target>
    4447
    4548  <target name="update-unix" depends="init">
    46     <antcall target="cvsupdate-distribution"/>
     49    <antcall target="svnupdate-distribution"/>
    4750    <antcall target="rename-gs2build-files-unix"/>
    4851    <antcall target="delete-windows-files"/>
    … …  
    6063    greenstones (prepare-os targets) -->
    6164  <target name="create-distribution-1" depends="init" description="do all the initial downloading and setting up">
    62     <cvs command="export -D '1 second ago'" package="gs2build"/>
    63     <cvs command="export -D '1 second ago'" package="gli"/>
     65    <antcall target="checkout-gs2build"/>
     66    <antcall target="checkout-gli"/>
    6467    <delete file="${gli.home}/gli.bat"/>
    6568    <delete file="${gli.home}/gli.sh"/>
    … …  
    173176
    174177  <target name="create-source-distribution" depends="init">
    175     <cvs command="export -D '1 second ago'" package="gs2build"/>
    176     <cvs command="export -D '1 second ago'" package="gli"/>
     178    <antcall target="checkout-gs2build"/>
     179    <antcall target="checkout-gli"/>
    177180    <delete file="${gli.home}/gli.bat"/>
    178181    <delete file="${gli.home}/gli.sh"/>
    … …  
    205208  <!-- Supplementary targets -->
    206209
    207   <target name="cvsupdate-distribution" depends="init">
    208     <antcall target="cvsupdate-packages"/>
    209     <antcall target="cvsupdate-core"/>
    210     <antcall target="cvsupdate-gs2build"/>
    211     <antcall target="cvsupdate-web"/>
     210  <target name="svnupdate-distribution" depends="init">
     211    <antcall target="svnupdate-packages"/>
     212    <antcall target="svnupdate-core"/>
     213    <antcall target="svnupdate-gs2build"/>
     214    <antcall target="svnupdate-web"/>
    212215  </target>
    213216
    … …  
    343346  </target>
    344347
    345   <target name="create-changelog">
     348<!--  <target name="create-changelog"> -->
    346349    <!-- generate greenstone 3 changelog -->
    347     <exec executable="/home/nzdl/for-distributions/bin/script/cvs2cl.pl"
     350<!--    <exec executable="/home/nzdl/for-distributions/bin/script/cvs2cl.pl"
    348351      dir="${basedir}">
    349352      <arg value="-P"/>
    … …  
    358361      <arg value="-I"/>
    359362      <arg value="gli/.*|gs2build/.*"/>
    360     </exec>
     363    </exec> -->
    361364    <!-- generate coll building change log -->
    362     <exec executable="/home/nzdl/for-distributions/bin/script/cvs2cl.pl"
     365<!--    <exec executable="/home/nzdl/for-distributions/bin/script/cvs2cl.pl"
    363366      dir="${basedir}">
    364367      <arg value="-P"/>
    … …  
    374377      <arg value="gs2build"/>
    375378    </exec>
    376   </target>
     379  </target> -->
     380
     381
    377382  <!-- new targets to go in distribution build.xml files -->
    378383
Note: See TracChangeset for help on using the changeset viewer.