Changeset f1e36f7 for build.xml


Ignore:
Timestamp:
Nov 18, 2010 8:56:42 PM (10 years ago)
Author:
HungryHobo <HungryHobo@…>
Branches:
master
Children:
b32399ac
Parents:
b56563d
Message:

Create Debian packages in debian/packages/ instead of ../

File:
1 edited

Legend:

Unmodified
Added
Removed
  • build.xml

    rb56563d rf1e36f7  
    3838        <echo message="  slackpkg:  generate Slackware packages in ./Slackware/i2p and ./Slackware/i2p-base" />
    3939        <echo message="  debianhowto: instructions on building Debian packages" />
    40         <echo message="  debian: generate Debian packages (source + binary)" />
     40        <echo message="  debian: generate Debian packages in ./debian/packages" />
     41        <echo message="          (libc6-i686 and libc6-amd64 required, ant>=1.8 required)" />
    4142        <echo message="  debianrepo: build a Debian repository (reprepro required)" />
    4243        <echo message="  updaterWithDesktopgui: tar the built files and desktopgui in an i2pupdate.zip" />
     
    237238        <delete file="i2psnark-standalone.zip" failonerror="false" quiet="true" />
    238239        <delete file="BOB-one.jar" failonerror="false" quiet="true" /> 
    239     </target>
    240     <target name="distclean" depends="clean">
    241240        <delete dir="debian/tmp" />
    242         <delete dir="debian/repo" />
    243241        <delete dir="debian/db" />
    244242        <delete file="debian/files" />
    245243        <delete file="debian/build" />
    246244        <delete file="debian/substvars"/>
    247       <!-- HH to move
    248         <delete>
    249             <fileset dir=".." includes="i2p_*.tar.gz,i2p_*.deb,i2p_*.dsc,i2p_*.changes" />
     245    </target>
     246    <target name="distclean" depends="clean">
     247        <delete includeemptydirs="true" removeNotFollowedSymlinks="true" failonerror="false" >
     248            <fileset dir="debian/packages" followSymlinks="false" />
    250249        </delete>
    251       -->
     250        <delete dir="debian/repo" />
    252251        <ant dir="core/java/" target="distclean" />
    253252        <ant dir="router/java/" target="distclean" />
     
    925924    </target>
    926925
    927     <target name="debian">
    928         <!-- same as debian-binary + debian-source, but only one build needed -->
     926    <target name="debian" depends="distclean, debian-source, debian-binary" />
     927
     928    <target name="debian-binary">
    929929        <echo message="Did you update the version in these files?" />
    930930        <exec executable="ls" failonerror="true">
     
    935935        <!-- bundle the 20MB jetty 5 lib since there probably isn't a deb for it -->
    936936        <ant dir="apps/jetty" target="ensureJettylib" />
    937         <exec executable="dpkg-buildpackage" failifexecutionfails="true">
    938             <arg value="-I_MTN" />
    939             <arg value="-ai386" />
    940         </exec>
    941         <!-- rather than doing a complete new build, recreate debian/tmp by calling the "build" target in debian/rules -->
    942         <delete dir="debian/tmp" />
    943         <exec executable="dpkg-buildpackage" failifexecutionfails="true">
    944             <arg value="-I_MTN" />
    945             <arg value="-Tbuild" />
    946             <arg value="-aamd64" />
    947             <env key="MAKEFLAGS" value="-B" />
    948         </exec>
    949         <exec executable="dpkg-buildpackage" failifexecutionfails="true">
    950             <arg value="-I_MTN" />
    951             <!-- don't clean so the previous package isn't deleted -->
    952             <arg value="-nc" />
    953             <arg value="-aamd64" />
    954         </exec>
    955     </target>
    956     <target name="debian-binary">
    957         <!-- binary only -->
    958         <echo message="Did you update the version in these files?" />
    959         <exec executable="ls" failonerror="true">
    960             <arg value="-l" />
    961             <arg value="debian/changelog" />
    962         </exec>
    963         <echo message="====================" />
    964         <exec executable="dpkg-buildpackage" failifexecutionfails="true" >
    965             <arg value="-b" />
     937       
     938        <exec dir="debian" executable="./buildpackage.sh" failonerror="true">
     939            <arg value="i386" />
     940        </exec>
     941        <exec dir="debian" executable="./buildpackage.sh" failonerror="true">
     942            <arg value="amd64" />
    966943        </exec>
    967944    </target>
     
    975952        </exec>
    976953        <echo message="====================" />
    977         <exec executable="dpkg-buildpackage" failifexecutionfails="true" >
    978             <arg value="-S" />
    979             <arg value="-I_MTN" />
     954        <exec dir="debian" executable="./buildpackage.sh" failonerror="true">
     955            <arg value="source" />
    980956        </exec>
    981957    </target>
Note: See TracChangeset for help on using the changeset viewer.