Changeset 19459 for release-kits

Show
Ignore:
Timestamp:
14.05.2009 09:51:02 (11 years ago)
Author:
oranfry
Message:

more work on sork to produce the single source component

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • release-kits/sork2/ant-scripts/build.xml

    r19386 r19459  
    2525    <!-- THE MAIN TARGET --> 
    2626    <target name="sork2" depends="init"> 
    27         <antcall target="export-gsdl-gli"><param name="dest" value="distributions/Greenstone-${version}-source"/></antcall> 
    28         <antcall target="gsdl-set-version-numbers"><param name="gsdl.basedir" value="${basedir}/distributions/Greenstone-${version}-source"/></antcall> 
    29         <antcall target="gli-set-version-numbers"><param name="glibasedir" value="${basedir}/distributions/Greenstone-${version}-source/gli"/></antcall> 
     27        <antcall target="export-gsdl-gli"><param name="dest" value="distributions/Greenstone-${version}-source-distribution"/></antcall> 
     28        <antcall target="gsdl-set-version-numbers"><param name="gsdl.basedir" value="${basedir}/distributions/Greenstone-${version}-source-distribution"/></antcall> 
     29        <antcall target="gli-set-version-numbers"><param name="glibasedir" value="${basedir}/distributions/Greenstone-${version}-source-distribution/gli"/></antcall> 
    3030        <antcall target="insert-winbin"/> 
    31         <antcall target="insert-windows-perl"><param name="gsdl.basedir" value="${basedir}/distributions/Greenstone-${version}-source"/></antcall> 
     31        <antcall target="insert-windows-perl"><param name="gsdl.basedir" value="${basedir}/distributions/Greenstone-${version}-source-distribution"/></antcall> 
    3232        <antcall target="tweak-files" /> 
    3333        <antcall target="create-archives"/> 
     
    4848 
    4949    <target name="tweak-files"> 
    50         <delete file="distributions/Greenstone-${version}-source/bin/linux/mgquery_old" /> 
     50        <delete file="distributions/Greenstone-${version}-source-distribution/bin/linux/mgquery_old" /> 
    5151    </target> 
    5252 
    5353    <target name="insert-winbin"> 
    54         <delete dir="distributions/Greenstone-${version}-source/bin/windows"/> 
     54        <delete dir="distributions/Greenstone-${version}-source-distribution/bin/windows"/> 
    5555        <svn> 
    56             <export srcurl="${svn.root}/other-projects/trunk/winbin/bin" destPath="distributions/Greenstone-${version}-source/bin/windows"/> 
     56            <export srcurl="${svn.root}/other-projects/trunk/winbin/bin" destPath="distributions/Greenstone-${version}-source-distribution/bin/windows"/> 
    5757        </svn> 
    58         <get src="http://greenstone.org/release-snapshots/server.exe" dest="distributions/Greenstone-${version}-source/bin/windows/server.exe"/> 
     58        <get src="http://greenstone.org/release-snapshots/server.exe" dest="distributions/Greenstone-${version}-source-distribution/bin/windows/server.exe"/> 
    5959         
    60         <delete dir="distributions/Greenstone-${version}-source/bin/windows/imagemagick"/> 
    61         <delete dir="distributions/Greenstone-${version}-source/bin/windows/ghostscript"/> 
     60        <delete dir="distributions/Greenstone-${version}-source-distribution/bin/windows/imagemagick"/> 
     61        <delete dir="distributions/Greenstone-${version}-source-distribution/bin/windows/ghostscript"/> 
    6262    </target> 
    6363 
    6464    <target name="create-archives"> 
    6565        <mkdir dir="products"/> 
    66         <zip destfile="products/Greenstone-${version}-source.zip" basedir="distributions" includes="Greenstone-${version}-source/**/*"/> 
    6766        <exec dir="distributions" executable="tar"> 
    68             <arg line="-czf ../products/Greenstone-${version}-source.tar.gz Greenstone-${version}-source"/> 
     67            <arg line="-czf ../products/Greenstone-${version}-source-distribution.tar.gz Greenstone-${version}-source-distribution"/> 
    6968        </exec> 
    7069    </target> 
     
    7271    <target name="create-sourcecode"> 
    7372        <!-- create a directory for the sourcecode --> 
    74         <mkdir dir="distributions/Greenstone-${version}-sourcecode"/> 
     73        <mkdir dir="distributions/Greenstone-${version}-source-component"/> 
    7574 
    7675        <!-- copy the files in --> 
    77         <exec dir="distributions/Greenstone-${version}-source" executable="cp"> 
     76        <exec dir="distributions/Greenstone-${version}-source-distribution" executable="cp"> 
    7877            <arg value="-r"/> 
    7978 
     
    8180            <arg value="build-src"/> 
    8281            <arg value="common-src"/> 
    83             <arg value="runtime-src"/> 
    8482            <arg value="runtime-src"/> 
    8583 
     
    103101 
    104102            <!-- destination --> 
    105             <arg value="../Greenstone-${version}-sourcecode"/> 
     103            <arg value="../Greenstone-${version}-source-component"/> 
    106104 
    107105        </exec> 
    108106 
    109107        <!-- unzip some windows packages --> 
    110         <unzip src="distributions/Greenstone-${version}-sourcecode/common-src/indexers/packages/windows/iconv/iconv.zip" dest="distributions/Greenstone-${version}-sourcecode/common-src/indexers/packages/windows/iconv"/> 
    111         <delete file="distributions/Greenstone-${version}-sourcecode/common-src/indexers/packages/windows/iconv/iconv.zip"/> 
     108        <unzip src="distributions/Greenstone-${version}-source-component/common-src/indexers/packages/windows/iconv/iconv.zip" dest="distributions/Greenstone-${version}-source-component/common-src/indexers/packages/windows/iconv"/> 
     109        <delete file="distributions/Greenstone-${version}-source-component/common-src/indexers/packages/windows/iconv/iconv.zip"/> 
    112110         
    113         <unzip src="distributions/Greenstone-${version}-sourcecode/common-src/packages/windows/crypt/crypt.zip" dest="distributions/Greenstone-${version}-sourcecode/common-src/packages/windows/crypt"/> 
    114         <delete file="distributions/Greenstone-${version}-sourcecode/common-src/packages/windows/crypt/crypt.zip"/> 
     111        <unzip src="distributions/Greenstone-${version}-source-component/common-src/packages/windows/crypt/crypt.zip" dest="distributions/Greenstone-${version}-source-component/common-src/packages/windows/crypt"/> 
     112        <delete file="distributions/Greenstone-${version}-source-component/common-src/packages/windows/crypt/crypt.zip"/> 
    115113         
    116         <unzip src="distributions/Greenstone-${version}-sourcecode/common-src/packages/windows/expat/expat.zip" dest="distributions/Greenstone-${version}-sourcecode/common-src/packages/windows/expat"/> 
    117         <delete file="distributions/Greenstone-${version}-sourcecode/common-src/packages/windows/expat/expat.zip"/> 
     114        <unzip src="distributions/Greenstone-${version}-source-component/common-src/packages/windows/expat/expat.zip" dest="distributions/Greenstone-${version}-source-component/common-src/packages/windows/expat"/> 
     115        <delete file="distributions/Greenstone-${version}-source-component/common-src/packages/windows/expat/expat.zip"/> 
    118116         
    119         <unzip src="distributions/Greenstone-${version}-sourcecode/common-src/packages/windows/stlport/stlport.zip" dest="distributions/Greenstone-${version}-sourcecode/common-src/packages/windows/stlport"/> 
    120         <delete file="distributions/Greenstone-${version}-sourcecode/common-src/packages/windows/stlport/stlport.zip"/> 
     117        <unzip src="distributions/Greenstone-${version}-source-component/common-src/packages/windows/stlport/stlport.zip" dest="distributions/Greenstone-${version}-source-component/common-src/packages/windows/stlport"/> 
     118        <delete file="distributions/Greenstone-${version}-source-component/common-src/packages/windows/stlport/stlport.zip"/> 
    121119 
    122         <untar src="distributions/Greenstone-${version}-sourcecode/common-src/packages/sqlite/sqlite-amalgamation-3.5.9.tar.gz" dest="distributions/Greenstone-${version}-sourcecode/common-src/packages/sqlite" compression="gzip"/> 
    123         <delete file="distributions/Greenstone-${version}-sourcecode/common-src/packages/sqlite/sqlite-amalgamation-3.5.9.tar.gz"/> 
     120        <untar src="distributions/Greenstone-${version}-source-component/common-src/packages/sqlite/sqlite-amalgamation-3.5.9.tar.gz" dest="distributions/Greenstone-${version}-source-component/common-src/packages/sqlite" compression="gzip"/> 
     121        <delete file="distributions/Greenstone-${version}-source-component/common-src/packages/sqlite/sqlite-amalgamation-3.5.9.tar.gz"/> 
    124122 
    125123        <!-- tar it up --> 
    126124        <exec dir="distributions" executable="tar"> 
    127             <arg line="-czf ../products/Greenstone-${version}-sourcecode.tar.gz Greenstone-${version}-sourcecode"/> 
     125            <arg line="-czf ../products/Greenstone-${version}-source-component.tar.gz Greenstone-${version}-source-component"/> 
    128126        </exec> 
    129127    </target>