Changeset 14588


Ignore:
Timestamp:
2007-09-27T12:37:47+12:00 (16 years ago)
Author:
oranfry
Message:

applying diffs from 3.03 branch: r14509:14510 , r14513:14514 and r14515:14516

Location:
greenstone3/trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • greenstone3/trunk/build.xml

    r14581 r14588  
    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/trunk/dist-resources/convert-build-xml.xsl

    r13379 r14588  
    2424  <xsl:template match="target[starts-with(@name, 'rename-gs2build')]"></xsl:template>
    2525  <xsl:template match="target[@name='test']"></xsl:template>
    26   <xsl:template match="target[@name='get-macos-extra']"></xsl:template>
     26  <!--<xsl:template match="target[@name='get-macos-extra']"></xsl:template>-->
    2727  <xsl:template match="target[@name='get-windows-binaries']"></xsl:template>
    2828

  • greenstone3/trunk/dist-resources/dist-build.xml

    r13930 r14588  
    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
    … …  
    301304  <target name="get-documented-collections" depends="init">
    302305    <property name="collect.home" value="${basedir}/web/sites/localsite/collect"/>
    303     <copy todir="${collect.home}/MARC-e">
    304       <fileset dir="${documented.collections.home}/MARC-e"/>
    305     </copy>
    306     <copy todir="${collect.home}/cltbib-e">
    307       <fileset dir="${documented.collections.home}/cltbib-e"/>
     306
     307    <copy todir="${collect.home}/authen-e">
     308      <fileset dir="${documented.collections.home}/authen-e"/>
     309    </copy>
     310    <copy todir="${collect.home}/bibliog1">
     311      <fileset dir="${documented.collections.home}/bibliog1"/>
     312    </copy>
     313    <copy todir="${collect.home}/bibliogr">
     314      <fileset dir="${documented.collections.home}/bibliogr"/>
    308315    </copy>
    309316    <copy todir="${collect.home}/dls-e">
    … …  
    330337    <copy todir="${collect.home}/wrdpdf-e">
    331338      <fileset dir="${documented.collections.home}/wrdpdf-e"/>
     339    </copy>
     340
     341    <copy todir="${collect.home}/garish">
     342      <fileset dir="${documented.collections.home}/garish"/>
     343    </copy>
     344    <copy todir="${collect.home}/marcexam">
     345      <fileset dir="${documented.collections.home}/marcexam"/>
     346    </copy>
     347    <copy todir="${collect.home}/style-e">
     348      <fileset dir="${documented.collections.home}/style-e"/>
     349    </copy>
     350    <copy todir="${collect.home}/wiki">
     351      <fileset dir="${documented.collections.home}/wiki"/>
    332352    </copy>
    333353  </target>
    … …  
    343363  </target>
    344364
    345   <target name="create-changelog">
     365<!--  <target name="create-changelog"> -->
    346366    <!-- generate greenstone 3 changelog -->
    347     <exec executable="/home/nzdl/for-distributions/bin/script/cvs2cl.pl"
     367<!--    <exec executable="/home/nzdl/for-distributions/bin/script/cvs2cl.pl"
    348368      dir="${basedir}">
    349369      <arg value="-P"/>
    … …  
    358378      <arg value="-I"/>
    359379      <arg value="gli/.*|gs2build/.*"/>
    360     </exec>
     380    </exec> -->
    361381    <!-- generate coll building change log -->
    362     <exec executable="/home/nzdl/for-distributions/bin/script/cvs2cl.pl"
     382<!--    <exec executable="/home/nzdl/for-distributions/bin/script/cvs2cl.pl"
    363383      dir="${basedir}">
    364384      <arg value="-P"/>
    … …  
    374394      <arg value="gs2build"/>
    375395    </exec>
    376   </target>
     396  </target> -->
     397
     398
    377399  <!-- new targets to go in distribution build.xml files -->
    378400
Note: See TracChangeset for help on using the changeset viewer.