Changeset 84e4558


Ignore:
Timestamp:
Jan 1, 2012 11:31:41 PM (8 years ago)
Author:
kytv <kytv@…>
Branches:
master
Children:
dd9cae5
Parents:
b5f97d0
Message:

Updated packaging scripts to work with Debian's (and Ubuntu's) Jetty packages.

Files:
1 added
7 edited

Legend:

Unmodified
Added
Removed
  • apps/jetty/build.xml

    rb5f97d0 r84e4558  
    8383              jetty-java5-threadpool-xxx.jar: Concurrent thread pool for eepsite
    8484              commons-logging.jar: JspC compiler
    85               TODO which of these are available in the Ubuntu packages?
    8685        -->
    8786        <copy preservelastmodified="true" file="${jetty.base}/lib/${jetty.base}.jar" tofile="jettylib/org.mortbay.jetty.jar" />
  • build.xml

    rb5f97d0 r84e4558  
    5151        <echo message="  slackpkg:  generate Slackware packages in ./Slackware/i2p and ./Slackware/i2p-base" />
    5252        <echo message="  debianhowto: instructions on building Debian packages" />
    53         <echo message="  debian: generate Debian packages in ../" />
    54         <echo message="          run &quot;ant debianhowto&quot; for instructions" />
    55         <echo message="  debian-clean: rollback debian specific patches and run the &quot;distclean&quot; target (done automatically at the end of the &quot;debian&quot; target)" />
    56         <!-- <echo message="  debianrepo: build a Debian repository (reprepro required)" /> -->
     53        <echo message="  debian: generate Debian packages in ../" />
     54        <echo message="          run &quot;ant debianhowto&quot; for instructions" />
     55        <echo message="  debian-clean: rollback debian specific patches and run the &quot;distclean&quot; target (done automatically at the end of the &quot;debian&quot; target)" />
     56        <!-- <echo message="  debianrepo: build a Debian repository (reprepro required)" /> -->
    5757        <echo message="  poupdate: update the .po files for translators" />
    5858        <echo message="  pkg-portable-win32:  build a minimum portable version for win32" />
    5959   </target>
    6060    <target name="debianhowto">
    61             <echo message="To build debian packages, you must make sure that you have" />
    62             <echo message="the necessary build-dependencies installed." />
    63             <echo message="The packages required to build can be found in the file "/>
    64             <echo message="&quot;debian/control&quot; in both the Build-Depends and Build-Depends-Indep fields."/>
    65             <echo message="In addition to those packages, be sure to install &quot;fakeroot&quot;,"/>
    66             <echo message="&quot;quilt&quot; and &quot;build-essential&quot;!" />
    67             <echo message="" />
    68             <echo message="The following command will install all dependencies for you:" />
    69             <echo message="apt-get install debhelper ant debconf default-jdk gettext libgmp3-dev po-debconf fakeroot build-essential quilt" />
    70             <echo message=" " />
    71             <echo message="Once the dependencies are installed, run &quot;ant debian&quot;"/>
    72             <echo message="to patch the source and build the packages." />
     61            <echo message="To build debian packages, you must make sure that you have" />
     62            <echo message="the necessary build-dependencies installed." />
     63            <echo message="The packages required to build can be found in the file "/>
     64            <echo message="&quot;debian/control&quot; in the &quot;Build-Depends&quot; field."/>
     65            <echo message="In addition to those packages, be sure to install &quot;fakeroot&quot;,"/>
     66            <echo message="&quot;quilt&quot; and &quot;build-essential&quot;!" />
     67            <echo message="" />
     68            <echo message="The following command will install all of the dependencies for you:" />
     69            <echo message=" " />
     70            <echo message="apt-get install debhelper ant debconf default-jdk gettext libgmp3-dev po-debconf fakeroot build-essential \" />
     71            <echo message="                   quilt libcommons-el-java libcommons-logging-java libjetty-extra-java libjetty-java" />
     72            <echo message=" " />
     73            <echo message="Once the dependencies are installed, run &quot;ant debian&quot;"/>
     74            <echo message="to patch the source and build the packages." />
    7375    </target>
    7476    <target name="dist" depends="pkg, javadoc">
     
    13801382    <target name="debian-binary" >
    13811383        <echo message="Did you update the version using dch -i?" />
    1382         <echo message=" " />
    1383         <echo message="If the changelog was not updated with dch -i, press" />
    1384         <echo message="press CTRL+C to abort building this Debian package." />
    1385         <echo message="" />
    1386         <echo message="Pausing build for ten seconds to give enough time to read this notice." />
    1387         <exec executable="sleep" failonerror="true">
    1388                 <arg value="10" />
    1389         </exec>
     1384        <echo message=" " />
     1385        <echo message="If the changelog was not updated with dch -i, press" />
     1386        <echo message="press CTRL+C to abort building this Debian package." />
     1387        <echo message="" />
     1388        <echo message="Pausing build for ten seconds to give enough time to read this notice." />
     1389        <exec executable="sleep" failonerror="true">
     1390                <arg value="10" />
     1391        </exec>
    13901392        <echo message="====================" />
    1391         <!-- bundle the jetty 5 lib since there isn't a deb for it -->
    1392         <ant dir="apps/jetty" target="ensureJettylib" />
    1393        
    1394         <exec executable="fakeroot" failonerror="true">
    1395             <arg value="debian/rules" />
    1396             <arg value="patch" />
    1397             <arg value="binary" />
    1398             <arg value="clean" />
    1399         </exec>
    1400         <delete dir=".pc" />
    1401     </target>
     1393
     1394        <exec executable="fakeroot" failonerror="true">
     1395            <arg value="debian/rules" />
     1396            <arg value="patch" />
     1397            <arg value="binary" />
     1398            <arg value="clean" />
     1399        </exec>
     1400        <delete dir=".pc" />
     1401    </target>
     1402
    14021403    <target name="debian-clean" depends="buildProperties" >
    14031404        <exec executable="fakeroot" failonerror="true">
    1404             <arg value="debian/rules" />
    1405             <arg value="clean" />
    1406         </exec>
    1407         <delete dir="./.pc" />
    1408     </target>
     1405            <arg value="debian/rules" />
     1406            <arg value="clean" />
     1407        </exec>
     1408        <delete dir="./.pc" />
     1409    </target>
     1410
    14091411    <target name="debian-patch" depends="buildProperties" >
    14101412        <exec executable="quilt" failonerror="true">
     
    14161418    <target name="debian-unpatch" depends="buildProperties">
    14171419        <exec executable="quilt" failonerror="false">
    1418             <arg value="-a" />
    1419             <arg value="pop" />
     1420            <arg value="-a" />
     1421            <arg value="pop" />
    14201422        </exec>
    14211423    </target>
  • debian/control

    rb5f97d0 r84e4558  
    1111 default-jdk,
    1212 gettext,
     13 libcommons-el-java,
     14 libcommons-logging-java,
    1315 libgmp3-dev,
     16 libjetty-extra-java,
     17 libjetty-java,
    1418 po-debconf
    15 ##Build-Depends-Indep: tor-geoipdb
    1619
    1720Package: i2p
     
    6669Section: net
    6770Priority: optional
    68 Depends: ${misc:Depends}, ${java:Depends}, ${shlibs:Depends}, default-jre-headless | java5-runtime-headless | java6-runtime-headless
     71Depends: ${misc:Depends}, ${java:Depends}, ${shlibs:Depends},
     72 default-jre-headless | java5-runtime-headless | java6-runtime-headless,
     73 libcommons-logging-java,
     74 libjetty-java,
     75 libtomcat6-java
    6976Replaces: i2p ( << 0.8.6-5)
    7077Breaks: i2p (<< 0.8.6-5)
     
    7784 i2pfox,
    7885 irc-client,
     86 itoopie,
    7987 jircii,
    8088 mail-client,
  • debian/i2p-router.install

    rb5f97d0 r84e4558  
     1# history.txt is installed to /usr/share/i2p because
     2# it's shown in the router console at http://127.0.0.1:7657
     3# (this is also why I don't use dh_installchangelogs -k for it)
    14history.txt usr/share/i2p
     5
    26pkg-temp/blocklist.txt usr/share/i2p
    37pkg-temp/certificates usr/share/i2p
     
    1115pkg-temp/i2psnark.config usr/share/i2p
    1216pkg-temp/i2ptunnel.config usr/share/i2p
    13 pkg-temp/lib/*.jar usr/share/i2p/lib
    1417pkg-temp/router.config usr/share/i2p
    1518pkg-temp/systray.config usr/share/i2p
    1619pkg-temp/webapps usr/share/i2p
     20
     21# We'll selectively copy things from pkg-temp
     22# to ensure that potential Jetty jars aren't
     23# duplicated
     24pkg-temp/lib/BOB.jar usr/share/i2p/lib
     25pkg-temp/lib/desktopgui.jar usr/share/i2p/lib
     26pkg-temp/lib/i2p.jar usr/share/i2p/lib
     27pkg-temp/lib/i2psnark.jar usr/share/i2p/lib
     28pkg-temp/lib/i2ptunnel.jar usr/share/i2p/lib
     29pkg-temp/lib/jetty-i2p.jar usr/share/i2p/lib
     30pkg-temp/lib/jrobin.jar usr/share/i2p/lib
     31pkg-temp/lib/mstreaming.jar usr/share/i2p/lib
     32pkg-temp/lib/router.jar usr/share/i2p/lib
     33pkg-temp/lib/routerconsole.jar usr/share/i2p/lib
     34pkg-temp/lib/sam.jar usr/share/i2p/lib
     35pkg-temp/lib/standard.jar usr/share/i2p/lib
     36pkg-temp/lib/streaming.jar usr/share/i2p/lib
     37pkg-temp/lib/systray.jar usr/share/i2p/lib
     38pkg-temp/lib/systray4j.jar usr/share/i2p/lib
     39
     40# These two are copied over to avoid depending on libjetty-extra-java
     41# and pulling in dependencies that we don't care about
     42pkg-temp/lib/commons-el.jar usr/share/i2p/lib
     43pkg-temp/lib/jetty-threadpool.jar usr/share/i2p/lib
  • debian/i2p-router.links

    rb5f97d0 r84e4558  
    33usr/share/common-licenses/Apache-2.0 usr/share/doc/i2p-router/licenses/LICENSE-Apache2.0.txt
    44usr/share/common-licenses/BSD usr/share/doc/i2p-router/licenses/LICENSE-BSD.txt
     5
     6# From libcommons-logging-java
     7usr/share/java/commons-logging.jar usr/share/i2p/lib/commons-logging.jar
     8# From libtomcat6-java
     9usr/share/java/jasper.jar usr/share/i2p/lib/jasper.jar
     10usr/share/java/jasper-el.jar usr/share/i2p/lib/jasper-el.jar
     11usr/share/java/tomcat-juli.jar usr/share/i2p/lib/tomcat-juli.jar
     12
     13# From libjetty-java
     14usr/share/java/jetty.jar usr/share/i2p/lib/jetty.jar
     15usr/share/java/jetty-util.jar usr/share/i2p/lib/jetty-util.jar
     16usr/share/java/jetty-sslengine.jar usr/share/i2p/lib/jetty-sslengine.jar
     17usr/share/java/jetty-start.jar usr/share/i2p/lib/jetty-start.jar
     18
     19# From libservlet2.5-java
     20usr/share/java/servlet-api-2.5.jar usr/share/i2p/lib/servlet-api.jar
     21usr/share/java/jsp-api-2.1.jar usr/share/i2p/lib/jsp-api.jar
     22usr/share/java/el-api-2.1.jar usr/share/i2p/lib/el-api.jar
  • debian/patches/series

    rb5f97d0 r84e4558  
    220002-jbigi-soname.patch
    330003-renaming-jcpuid.patch
    4 debian-version.patch
     4#debian-version.patch
     50004-jetty6.patch
  • debian/rules

    rb5f97d0 r84e4558  
    3838        dh_auto_clean
    3939        ant distclean
    40         # The next line is used by KYTV when building from source packages
    41         #rm -f apps/jetty/jetty-5.1.15.tgz
    4240        rm -f core/c/jbigi/*.[s]o
    4341        rm -rf core/c/jcpuid/lib/
     42        #rm -f $(CURDIR)/installer/lib/wrapper/all/wrapper.jar
    4443        debconf-updatepo
    4544
     
    4948build-indep:
    5049        dh_prep
    51         # The next line is used by KYTV when building from source packages
    52         #[ -r jetty/jetty-5.1.15.tgz ] && ln -sf $(CURDIR)/jetty/jetty-5.1.15.tgz $(CURDIR)/apps/jetty/jetty-5.1.15.tgz
     50        #mkdir -p $(CURDIR)/installer/lib/wrapper/all
     51        #ln -sf /usr/share/java/wrapper.jar $(CURDIR)/installer/lib/wrapper/all/wrapper.jar
    5352        ant preppkg-unix javadoc
    5453        echo router.updateDisabled=true > $(I2P)/router.config
    5554        mv $(I2P)/runplain.sh $(I2P)/i2prouter-nowrapper
    56         #-cp -fv /usr/share/tor/geoip $(CURDIR)/pkg-temp/geoip/geoip.txt
    5755       
    5856
Note: See TracChangeset for help on using the changeset viewer.