Changeset 18765

Show
Ignore:
Timestamp:
24.03.2009 12:19:19 (10 years ago)
Author:
oranfry
Message:

fail if the compilation fails

Location:
release-kits/lirk2/ant-scripts
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • release-kits/lirk2/ant-scripts/compile.xml

    r18703 r18765  
    5555 
    5656    <target name="run-configure"> 
    57         <exec dir="${basedir}/compiled" executable="${basedir}/compiled/configure"> 
     57        <exec dir="${basedir}/compiled" executable="${basedir}/compiled/configure" failonerror="true"> 
    5858            <arg line="--enable-apache-httpd"/> 
    5959            <env key="LDFLAGS" value="-static"/> 
     
    8181 
    8282    <target name="run-make"> 
    83         <exec dir="${basedir}/compiled" executable="make"/> 
     83        <exec dir="${basedir}/compiled" executable="make" failonerror="true"/> 
    8484    </target> 
    8585 
    8686 
    8787    <target name="run-make-install"> 
    88         <exec dir="${basedir}/compiled" executable="make"><arg value="install"/></exec> 
     88        <exec dir="${basedir}/compiled" executable="make" failonerror="true"><arg value="install"/></exec> 
    8989    </target> 
    9090 
    9191    <target name="copy-library-oai"> 
    92         <exec executable="mv"><arg line="${basedir}/compiled/cgi-bin/library.cgi ${basedir}/compiled/bin/linux/library.cgi"/></exec> 
    93         <exec executable="mv"><arg line="${basedir}/compiled/cgi-bin/oaiserver.cgi ${basedir}/compiled/bin/linux/oaiserver.cgi"/></exec> 
     92        <exec executable="mv" failonerror="true"><arg line="${basedir}/compiled/cgi-bin/library.cgi ${basedir}/compiled/bin/linux/library.cgi"/></exec> 
     93        <exec executable="mv" failonerror="true"><arg line="${basedir}/compiled/cgi-bin/oaiserver.cgi ${basedir}/compiled/bin/linux/oaiserver.cgi"/></exec> 
    9494    </target> 
    9595 
    9696    <target name="strip-execs"> 
    97         <exec dir="${basedir}/compiled/bin/linux" executable="find"> 
     97        <exec dir="${basedir}/compiled/bin/linux" executable="find" failonerror="true"> 
    9898            <arg line="! -name . -type f -maxdepth 1 -exec strip {} &#59;"/> 
    9999        </exec> 
     
    101101 
    102102    <target name="build-demo-collection"> 
    103         <exec dir="${basedir}/compiled" executable="${lirk2.home}/resources/build-demo.sh"/> 
     103        <exec dir="${basedir}/compiled" executable="${lirk2.home}/resources/build-demo.sh" failonerror="true"/> 
    104104    </target> 
    105105 
  • release-kits/lirk2/ant-scripts/create-components.xml

    r18049 r18765  
    88        <antcall target="prepare-components" /> 
    99        <antcall target="compress-components" /> 
     10        <antcall target="produce-cd-components"/> 
    1011    </target> 
    1112 
     
    1415        <antcall target="prepare-core-component" /> 
    1516        <antcall target="prepare-imagemagick-component" /> 
    16  
     17         
    1718        <antcall target="prepare-sourcecode-component" /> 
    18  
    1919    </target> 
    2020 
     
    5050                <exclude name="acconfig.h"/> 
    5151                <exclude name="aclocal.m4"/> 
     52                <exclude name="config.guess"/> 
    5253                <exclude name="config.sub"/> 
    5354                <exclude name="configtest.pl"/> 
     
    101102 
    102103    </target> 
    103          
     104     
    104105    <target name="compress-sourcecode-component"> 
    105106        <sevenzip task="encode" input="components/sourcecode.comp" output="components/sourcecode.lzma" dictionnary="26"/> 
     
    125126    </target> 
    126127 
     128    <!-- 
     129        cd components 
     130        produce components for cdrom distributions, to be picked up and used by cdrk2 release kit 
     131        split components into linux only files (linux) and general files (all) 
     132    --> 
     133    <target name="produce-cd-components"> 
     134        <delete dir="components/tmp/cdrom"/> 
     135        <mkdir dir="components/tmp/cdrom"/> 
     136 
     137        <!-- core --> 
     138        <mkdir dir="components/tmp/cdrom/core/all"/> 
     139        <mkdir dir="components/tmp/cdrom/core/linux"/> 
     140        <copy todir="components/tmp/cdrom/core/all" overwrite="true"> 
     141            <fileset dir="components/tmp/core"/> 
     142        </copy> 
     143        <move todir="components/tmp/cdrom/core/linux" overwrite="true"> 
     144            <fileset dir="components/tmp/cdrom/core/all"> 
     145                <include name="bin/linux"/> 
     146                <include name="bin/linux/**/*"/> 
     147                <include name="bin/windows"/> 
     148                <include name="bin/windows/**/*"/> 
     149                <include name="apache-httpd/linux"/> 
     150                <include name="apache-httpd/linux/**/*"/> 
     151                <include name="*.sh"/> 
     152                <include name="*.csh"/> 
     153                <include name="*.bash"/> 
     154            </fileset> 
     155        </move> 
     156 
     157        <!-- imagemagick (all linux specific) --> 
     158        <mkdir dir="components/tmp/cdrom/imagemagick/linux"/> 
     159        <copy todir="components/tmp/cdrom/imagemagick/linux" overwrite="true"> 
     160            <fileset dir="components/tmp/imagemagick"/> 
     161        </copy> 
     162 
     163 
     164        <!-- sourcecode --> 
     165        <mkdir dir="components/tmp/cdrom/sourcecode/all"/> 
     166        <mkdir dir="components/tmp/cdrom/sourcecode/linux"/> 
     167        <copy todir="components/tmp/cdrom/sourcecode/all" overwrite="true"> 
     168            <fileset dir="components/tmp/sourcecode"/> 
     169        </copy> 
     170        <move todir="components/tmp/cdrom/sourcecode/linux" overwrite="true"> 
     171            <fileset dir="components/tmp/cdrom/sourcecode/all"> 
     172                <include name="acconfig.h"/> 
     173                <include name="aclocal.m4"/> 
     174                <include name="config.guess"/> 
     175                <include name="config.sub"/> 
     176                <include name="configtest.pl"/> 
     177                <include name="configure"/> 
     178                <include name="configure.in"/> 
     179                <include name="install-sh"/> 
     180                <include name="Makefile.in"/> 
     181                <include name="micotest.cpp"/> 
     182                <include name="config.h.in"/> 
     183            </fileset> 
     184        </move> 
     185 
     186        <tar destfile="products/cdrom.tar.gz" basedir="components/tmp/cdrom" compression="gzip"/> 
     187         
     188    </target> 
     189 
    127190</project>