Changeset 38b930c for build.xml


Ignore:
Timestamp:
Jun 4, 2016 1:00:36 PM (4 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
126a4d8
Parents:
2eb89e93 (diff), 34c611d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

propagate from branch 'i2p.i2p' (head eb2151f9d804ec432bfe97214896ee62da08943e)

to branch 'i2p.i2p.zzz.test2' (head 2ea50c5f22fe1e24d37dff2f283b77feaa9190ee)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • build.xml

    r2eb89e93 r38b930c  
    3939        <echo message="  updaterWithJettyFixesAndGeoIP" />
    4040        <echo message="  updaterWithJettyFixesAndJbigi" />
     41        <echo message="  updaterWithJbigi" />
     42        <echo message="  updater200WithJbigi" />
    4143        <echo message="  updaterSmall:   updater with the essentials only - no SAM, i2psnark, SusiMail, SusiDNS, or history.txt" />
    4244        <echo message="  updaterRouter:  updater with the i2p.jar and router.jar only" />
     
    6567            <echo message="&quot;quilt&quot; and &quot;build-essential&quot;!" />
    6668            <echo message="" />
    67             <echo message="The following command will install all of the dependencies for you:" />
     69            <echo message="The following command will install the build dependencies for you:" />
    6870            <echo message=" " />
    69             <echo message="apt-get install debhelper ant debconf default-jdk gettext libgmp3-dev po-debconf fakeroot build-essential \" />
    70             <echo message="                   quilt libcommons-logging-java dh-apparmor" />
     71            <echo message="sudo apt-get install debhelper ant debconf default-jdk gettext libgmp-dev po-debconf fakeroot \" />
     72            <echo message="  build-essential quilt libcommons-logging-java dh-apparmor dh-systemd libservice-wrapper-java \"  />
     73            <echo message="  devscripts libjetty8-java glassfish-javaee"  />
     74            <echo message=" " />
     75            <echo message="The following command will install the additional runtime dependencies:" />
     76            <echo message="sudo apt-get install libecj-java geoip-database" />
    7177            <echo message=" " />
    7278            <echo message="Once the dependencies are installed, run &quot;ant debian&quot;"/>
     
    128134        <attribute name="outfile" />
    129135        <sequential>
    130             <input message="Enter private signing key file:" addproperty="release.privkey" />
     136            <input message="Enter sud/su2 private signing key file:" addproperty="release.privkey" />
    131137            <fail message="You must enter an existing file path." >
    132138                <condition>
     
    192198            </condition>
    193199        </fail>
    194         <input message="Enter key name (you@mail.i2p):" addproperty="release.signer.su3" />
     200        <input message="Enter su3 key name (you@mail.i2p):" addproperty="release.signer.su3" />
    195201        <fail message="You must enter a name." >
    196202            <condition>
     
    198204            </condition>
    199205        </fail>
    200         <input message="Enter key password for ${release.signer.su3}:" addproperty="release.password.su3" />
     206        <input message="Enter su3 key password for ${release.signer.su3}:" addproperty="release.password.su3" />
    201207        <fail message="You must enter a password." >
    202208            <condition>
     
    240246        </sequential>
    241247    </macrodef>
     248
    242249    <target name="dist" depends="pkg, javadoc" />
    243250    <target name="dist200" depends="pkg200, javadoc" />
     
    291298
    292299    <target name="buildImagegen" depends="buildCore, buildJetty" >
    293         <ant dir="apps/imagegen" target="all" />
     300        <ant dir="apps/imagegen" target="build" />
    294301        <copy file="apps/imagegen/imagegen/build/imagegen.war" todir="build/" />
    295302    </target>
     
    520527    <!-- Custom target to collect the jars that I2P-Bote needs to compile, so it can compile from source. -->
    521528    <target name="jarBote" depends="buildRouter, buildStreaming, buildJetty" >
    522         <copy file="apps/susidns/src/WEB-INF/lib/jstl.jar" todir="build/" />
    523         <copy file="apps/susidns/src/WEB-INF/lib/standard.jar" todir="build/" />
     529        <copy file="apps/susidns/src/lib/jstl.jar" todir="build/" />
     530        <copy file="apps/susidns/src/lib/standard.jar" todir="build/" />
    524531    </target>
    525532
     
    700707            <group title="Core SDK (i2p.jar)" packages="net.i2p:net.i2p.*:net.i2p.client:net.i2p.client.*:net.i2p.internal:net.i2p.internal.*:freenet.support.CPUInformation:org.bouncycastle.oldcrypto:org.bouncycastle.oldcrypto.*:gnu.crypto.*:gnu.getopt:gnu.gettext:com.nettgryppa.security:net.metanotion:net.metanotion.*:org.apache.http.conn.ssl:org.apache.http.conn.util:org.apache.http.util" />
    701708            <group title="Streaming Library" packages="net.i2p.client.streaming:net.i2p.client.streaming.impl" />
    702             <group title="Router" packages="net.i2p.router:net.i2p.router.*:net.i2p.data.i2np:net.i2p.data.router:org.cybergarage:org.cybergarage.*:org.freenetproject:org.xlattice.crypto.filters" />
     709            <group title="Router" packages="net.i2p.router:net.i2p.router.*:net.i2p.data.i2np:net.i2p.data.router:org.cybergarage:org.cybergarage.*:org.freenetproject:org.xlattice.crypto.filters:com.maxmind.geoip" />
    703710            <group title="Router Console" packages="net.i2p.router.web:net.i2p.router.update:net.i2p.router.news" />
    704711            <!-- apps and bridges starting here, alphabetical please -->
     
    754761                <pathelement location="apps/jrobin/jrobin-1.5.9.1.jar" />
    755762                <pathelement location="installer/lib/wrapper/all/wrapper.jar" />
     763                <!-- following are only for debian builds -->
     764                <pathelement location="core/java/build/libintl.jar" />
     765                <pathelement location="core/java/build/gnu-getopt.jar" />
    756766            </classpath>
    757767            <!-- These variables are stored in build.properties.
     
    765775        <echo message="Warning, javadoc embeds timestamps in the output, run with 'TZ=UTC ant javadoc' if you plan to distribute" />
    766776    </target>
     777
    767778    <target name="javadoc-zip" depends="javadoc">
    768779        <zip destfile="javadoc.zip" basedir="build" level="9" includes="javadoc\**" />
     
    879890    </target>
    880891
    881     <target name="-pre-release">
     892    <target name="-pre-sign">
     893            <!-- if you're distributing su3 files to others, at a minimum you should set these -->
    882894            <fail message="javac.compilerargs must contain a -bootclasspath option in override.properties">
    883895                <condition>
     
    900912                </condition>
    901913            </fail>
     914    </target>
     915
     916    <target name="-pre-release" depends="-pre-sign">
    902917            <echo message="================================================================" />
    903918            <echo message="Did you update these files?" />
     
    951966        <ant dir="apps/i2psnark/java/" target="distclean" />
    952967        <ant dir="apps/jetty/" target="distclean" />
     968        <ant dir="apps/imagegen/" target="distclean" />
    953969        <delete dir="core/c/jbigi/bin" />
    954970        <delete dir="core/c/jbigi/lib" />
    955971        <delete dir="core/c/jcpuid/lib" />
    956972        <ant dir="installer/resources/locale" target="distclean" />
     973        <ant dir="installer/tools/java" target="distclean" />
    957974        <!--
    958975                NOTE! We need to turn off the default excludes for these
     
    10041021        <ant dir="apps/susidns/src/" target="distclean" />
    10051022        <ant dir="apps/i2psnark/java/" target="distclean" />
     1023        <ant dir="apps/imagegen/" target="distclean" />
    10061024    </target>
    10071025
     
    10211039            <fileset dir="installer/lib/wrapper/solaris/" excludes="*.txt" />
    10221040        </copy>
     1041     <!-- Force using the new wrapper.jar.
     1042          The new jar with the old windows binaries will output a warning on windows.
     1043          We do not generate release files from this target.
     1044          See preppkg-windows-only target below.
     1045      -->
     1046        <copy overwrite="true" file="installer/lib/wrapper/all/wrapper.jar" todir="pkg-temp/lib" />
    10231047    </target>
    10241048
     
    10601084    </target>
    10611085
     1086    <!-- This is the target called by debian/rules -->
    10621087    <target name="preppkg-unix" depends="preppkg-base, prep-script-translation" >
    10631088        <copy file="installer/resources/runplain.sh" todir="pkg-temp/" />
     
    11121137    </target>
    11131138
    1114     <target name="preppkg-windows" depends="preppkg-base, buildUtilityJar, buildexe">
     1139    <target name="preppkg-windows" depends="preppkg-base, preplicenses-windows, buildUtilityJar, buildexe">
    11151140        <copy file="build/i2p.exe" todir="pkg-temp/" failonerror="false" />
     1141        <copy file="apps/systray/java/lib/systray4j.jar" todir="pkg-temp/lib" />
    11161142        <copy file="apps/systray/java/lib/systray4j.dll" todir="pkg-temp/lib" />
    11171143        <copy file="apps/systray/java/resources/iggy.ico" todir="pkg-temp/icons" />
     
    11231149        <copy file="installer/resources/set_config_dir_for_nt_service.bat" todir="pkg-temp/" />
    11241150        <copy file="installer/resources/uninstall_i2p_service_winnt.bat" todir="pkg-temp/" />
    1125         <copy file="installer/lib/wrapper/all/wrapper.jar" todir="pkg-temp/lib" />
    11261151        <copy file="build/utility.jar" todir="pkg-temp" />
    11271152        <copy todir="pkg-temp/lib/wrapper/win32/">
     
    11351160    <target name="preppkg-windows-only" depends="preppkg-windows, jbigi-windows-only">
    11361161        <copy file="build/jbigi.jar" todir="pkg-temp/lib" />
     1162     <!-- Win binaries are down-rev from the others, so use the old jar.
     1163          This will not overwrite, so preppkg (for all OSes) will get the new jar with
     1164          the old binaries, which will probably work but will output a warning.
     1165          The windows-only installer will get the correct jar.
    11371166        <copy file="installer/lib/wrapper/all/wrapper.jar" todir="pkg-temp/lib" />
    1138     </target>
    1139 
    1140     <target name="preppkg-base" depends="build, preplicenses, prepConsoleDocs, prepthemeupdates, prepCertificates, prepRouterInfos">
     1167      -->
     1168        <copy overwrite="true" file="installer/lib/wrapper/win-all/wrapper.jar" todir="pkg-temp/lib" />
     1169    </target>
     1170
     1171    <!-- see targets below for conditional copying -->
     1172    <target name="preppkg-base" depends="build, preplicenses, prepConsoleDocs, prepthemeupdates, prepCertificates, prepRouterInfos, copyjetty, copytomcat-unlesspkg, copyjstl-unlesspkg, copystandard-unlesspkg">
    11411173        <!-- if updater200 was run previously, it left *.pack files in pkg-temp -->
    11421174        <!-- Also remove deletelist.txt used for updater only -->
     
    11461178        <copy file="build/i2p.jar" todir="pkg-temp/lib/" />
    11471179        <copy file="build/i2ptunnel.jar" todir="pkg-temp/lib/" />
    1148         <!-- all jetty stuff -->
    1149         <copy todir="pkg-temp/lib" >
    1150             <fileset dir="build" includes="commons*.jar jasper*.jar javax*.jar jetty*.jar jsp*.jar org.mortbay.*.jar" />
    1151         </copy>
    11521180        <copy file="build/mstreaming.jar" todir="pkg-temp/lib/" />
    11531181        <copy file="build/streaming.jar" todir="pkg-temp/lib/" />
     
    11611189        <copy file="build/systray.jar" todir="pkg-temp/lib" />
    11621190        <copy file="build/i2psnark.jar" todir="pkg-temp/lib/" />
    1163         <copy file="apps/systray/java/lib/systray4j.jar" todir="pkg-temp/lib" />
    11641191        <copy file="build/i2ptunnel.war" todir="pkg-temp/webapps/" />
    11651192        <copy file="build/routerconsole.war" todir="pkg-temp/webapps/" />
     
    11681195        <copy file="build/susidns.war" todir="pkg-temp/webapps/" />
    11691196        <copy file="build/imagegen.war" todir="pkg-temp/webapps/" />
    1170         <copy file="apps/susidns/src/WEB-INF/lib/jstl.jar" todir="pkg-temp/lib/" />
    1171         <copy file="apps/susidns/src/WEB-INF/lib/standard.jar" todir="pkg-temp/lib/" />
    11721197        <copy file="build/i2psnark.war" todir="pkg-temp/webapps/" />
    11731198        <copy file="apps/i2psnark/i2psnark.config" todir="pkg-temp/" />
     
    12021227    </target>
    12031228
    1204     <target name="preplicenses">
     1229    <target name="copyjetty" depends="copyjetty-unlesspkg" >
     1230        <copy file="build/jetty-i2p.jar" todir="pkg-temp/lib" />
     1231    </target>
     1232
     1233    <target name="copyjetty-unlesspkg" unless="${with-libjetty8-java}" >
     1234        <copy todir="pkg-temp/lib" >
     1235            <fileset dir="build" includes="javax.servlet.jar jetty*.jar org.mortbay.*.jar" excludes="jetty-i2p.jar" />
     1236        </copy>
     1237    </target>
     1238
     1239    <!-- todo handle alt package too -->
     1240    <target name="copytomcat-unlesspkg" unless="${with-libtomcat7-java}" >
     1241        <copy todir="pkg-temp/lib" >
     1242            <fileset dir="build" includes="commons*.jar jasper*.jar javax*.jar" />
     1243        </copy>
     1244    </target>
     1245
     1246    <!-- todo handle alt package too -->
     1247    <target name="copyjstl-unlesspkg" unless="${with-glassfish-javaee}" >
     1248        <copy file="apps/susidns/src/lib/jstl.jar" todir="pkg-temp/lib/" />
     1249    </target>
     1250
     1251    <!-- todo handle alt package too -->
     1252    <target name="copystandard-unlesspkg" unless="${with-glassfish-javaee}" >
     1253        <copy file="apps/susidns/src/lib/standard.jar" todir="pkg-temp/lib/" />
     1254    </target>
     1255
     1256    <!-- does NOT include launch4j licenses for Windows builds -->
     1257    <target name="preplicenses" depends="preplicenses-unlesspkg" >
    12051258        <copy file="LICENSE.txt" todir="pkg-temp/" />
    12061259        <copy todir="pkg-temp/licenses/" >
    12071260          <fileset dir="licenses/" />
    12081261        </copy>
     1262        <copy file="apps/imagegen/identicon/README.md" tofile="pkg-temp/licenses/LICENSE-Identicon.txt" />
     1263        <copy file="apps/desktopgui/LICENSE" tofile="pkg-temp/licenses/LICENSE-DesktopGUI.txt" />
     1264    </target>
     1265
     1266    <target name="preplicenses-unlesspkg" unless="${with-libtomcat7-java}" >
     1267        <copy file="apps/jetty/apache-tomcat-deployer/NOTICE" tofile="pkg-temp/licenses/NOTICE-Tomcat.txt" />
     1268    </target>
     1269
     1270    <!-- DOES include launch4j licenses for Windows builds -->
     1271    <target name="preplicenses-windows" depends="preplicenses">
    12091272        <!--
    12101273              The license in launch4j/ is a BSD license for launch4j
     
    12131276         -->
    12141277        <copy file="installer/lib/launch4j/head/LICENSE.txt" tofile="pkg-temp/licenses/LICENSE-Launch4j.txt" />
    1215         <copy file="apps/jetty/apache-tomcat-deployer/NOTICE" tofile="pkg-temp/licenses/NOTICE-Tomcat.txt" />
    12161278        <!--  Not sure if these are used or should be included -->
    12171279        <copy file="installer/lib/launch4j/lib/foxtrot.LICENSE.txt" tofile="pkg-temp/licenses/LICENSE-Foxtrot.txt" />
     
    12191281        <copy file="installer/lib/launch4j/lib/JGoodies.Looks.LICENSE.txt" tofile="pkg-temp/licenses/LICENSE-JGoodies-Looks.txt" />
    12201282        <copy file="installer/lib/launch4j/lib/XStream.LICENSE.txt" tofile="pkg-temp/licenses/LICENSE-XStream.txt" />
    1221         <copy file="apps/imagegen/identicon/README.md" tofile="pkg-temp/licenses/LICENSE-Identicon.txt" />
    12221283    </target>
    12231284
     
    12451306            <classpath>
    12461307                <pathelement location="build/i2p.jar" />
     1308                <pathelement location="core/java/build/gnu-getopt.jar" />
    12471309                <pathelement location="build/router.jar" />
    12481310                <pathelement location="build/tools.jar" />
     
    13191381    <target name="updater200WithJettyFixes" depends="prepjupdatefixes, preplicenses, pack200, zipit200" />
    13201382    <target name="updater200WithJettyFixesAndJbigi" depends="prepjupdatefixes, prepjbigiupdate, preplicenses, pack200, zipit200" />
     1383    <target name="updater200WithJbigi" depends="prepupdate, prepjbigiupdate, preplicenses, pack200, zipit200" />
    13211384    <target name="updater" depends="prepupdate, preplicenses, zipit" />
    13221385    <target name="updaterRepack" depends="prepupdate, preplicenses, repack200, zipit" />
     
    13321395    <target name="updaterWithJettyFixesAndJbigi" depends="prepjupdatefixes, prepjbigiupdate, preplicenses, zipit" />
    13331396    <target name="updaterWithJettyFixesAndGeoIP" depends="prepjupdatefixes, prepgeoupdate, preplicenses, zipit" />
     1397    <target name="updaterWithJbigi" depends="prepupdate, prepjbigiupdate, preplicenses, zipit" />
    13341398    <target name="updaterSmall" depends="prepupdateSmall, zipit" />
    13351399    <target name="updaterRouter" depends="prepupdateRouter, zipit" />
     
    13391403    </target>
    13401404
    1341     <target name="signed-updater200" depends="updater200, -sign-update" />
    1342     <target name="signed-updater200WithJetty" depends="updater200WithJetty, -sign-update" />
    1343     <target name="signed-updater200WithJettyAndGeoIP" depends="updater200WithJettyAndGeoIP, -sign-update" />
    1344     <target name="signed-updater200WithJavadoc" depends="updater200WithJavadoc, -sign-update" />
    1345     <target name="signed-updater200WithJavadocAndJetty" depends="updater200WithJavadocAndJetty, -sign-update" />
     1405    <target name="signed-updater200" depends="-pre-sign, updater200, -sign-update" />
     1406    <target name="signed-updater200WithJetty" depends="-pre-sign, updater200WithJetty, -sign-update" />
     1407    <target name="signed-updater200WithJettyAndGeoIP" depends="-pre-sign, updater200WithJettyAndGeoIP, -sign-update" />
     1408    <target name="signed-updater200WithJavadoc" depends="-pre-sign, updater200WithJavadoc, -sign-update" />
     1409    <target name="signed-updater200WithJavadocAndJetty" depends="-pre-sign, updater200WithJavadocAndJetty, -sign-update" />
    13461410
    13471411    <target name="zipit" depends="getReleaseNumber">
     
    14171481        <!-- include systray changes in 0.7.5 -->
    14181482        <copy file="build/systray.jar" todir="pkg-temp/lib/" />
    1419        <!-- removed from updater in 0.9
     1483       <!-- removed from updater in 0.9, added back in 0.9.26 -->
    14201484        <copy file="build/desktopgui.jar" todir="pkg-temp/lib/" />
    1421        -->
    14221485        <copy file="build/susimail.war" todir="pkg-temp/webapps/" />
    14231486        <copy file="build/susidns.war" todir="pkg-temp/webapps/" />
    14241487        <copy file="build/imagegen.war" todir="pkg-temp/webapps/" />
    1425         <!-- as of 0.7.12; someday, we can remove these from the updater -->
    1426         <copy file="apps/susidns/src/WEB-INF/lib/jstl.jar" todir="pkg-temp/lib/" />
    1427         <copy file="apps/susidns/src/WEB-INF/lib/standard.jar" todir="pkg-temp/lib/" />
     1488        <!-- as of 0.7.12; last changed in 0.9; removed from update in 0.9.26 -->
     1489      <!--
     1490        <copy file="apps/susidns/src/lib/jstl.jar" todir="pkg-temp/lib/" />
     1491        <copy file="apps/susidns/src/lib/standard.jar" todir="pkg-temp/lib/" />
     1492       -->
    14281493        <copy file="build/i2psnark.war" todir="pkg-temp/webapps/" />
    14291494        <copy file="history.txt" todir="pkg-temp/" />
     
    14731538    </target>
    14741539
    1475     <!-- GeoIP files and flag icons -->
    1476     <target name="prepgeoupdate">
    1477         <copy file="installer/resources/geoip.txt" todir="pkg-temp/geoip/" />
    1478         <copy file="installer/resources/geoipv6.dat.gz" todir="pkg-temp/geoip/" />
     1540    <!-- GeoIP files -->
     1541    <target name="prepgeoupdate" depends="prepgeoupdate-unlesspkg" >
    14791542        <copy file="installer/resources/countries.txt" todir="pkg-temp/geoip/" />
    14801543        <copy file="installer/resources/continents.txt" todir="pkg-temp/geoip/" />
     
    14821545        <copy file="installer/resources/public-suffix-list.txt" todir="pkg-temp/geoip/" />
    14831546       -->
     1547    </target>
     1548
     1549    <!-- GeoIP files, set withGeoIPDatabase=true in override.properties to prevent -->
     1550    <!-- As of 0.9.26, the files are not included in Debian/Ubuntu builds. -->
     1551    <target name="prepgeoupdate-unlesspkg" unless="${with-geoip-database}" >
     1552        <copy file="installer/resources/geoip.txt" todir="pkg-temp/geoip/" />
     1553        <copy file="installer/resources/geoipv6.dat.gz" todir="pkg-temp/geoip/" />
    14841554    </target>
    14851555
     
    17851855            <arg value="i2p.fba"/>
    17861856            <arg value="-auxclasspath"/>
    1787             <arg value="build/commons-el.jar:build/commons-logging.jar:build/jasper-runtime.jar:build/javax.servlet.jar:build/org.mortbay.jetty.jar:apps/jrobin/jrobin-1.5.9.1.jar:apps/systray/java/lib/systray4j.jar:installer/lib/wrapper/all/wrapper.jar:apps/susidns/src/WEB-INF/lib/standard.jar:apps/susidns/src/WEB-INF/lib/jstl.jar:apps/jrobin/jrobin-1.5.9.1.jar"/>
     1857            <arg value="build/commons-el.jar:build/commons-logging.jar:build/jasper-runtime.jar:build/javax.servlet.jar:build/org.mortbay.jetty.jar:apps/jrobin/jrobin-1.5.9.1.jar:apps/systray/java/lib/systray4j.jar:installer/lib/wrapper/all/wrapper.jar:apps/susidns/src/lib/standard.jar:apps/susidns/src/lib/jstl.jar:apps/jrobin/jrobin-1.5.9.1.jar"/>
    17881858            <arg value="-sourcepath"/>
    17891859            <arg value="apps/BOB/src/:apps/addressbook/java/src/:apps/i2psnark/java/src/:apps/i2ptunnel/java/src/:apps/ministreaming/java/src/:apps/routerconsole/java/src/:apps/sam/java/src/:apps/streaming/java/src/:apps/susidns/src/java/src/:apps/susimail/src/src/:apps/systray/java/src/:core/java/src/:router/java/src/:installer/java/src"/>
     
    19642034        <exec executable="mtn" failonerror="true">
    19652035            <arg value="co" />
    1966             <arg value="-b" />
    1967             <arg value="i2p.i2p" />
    19682036            <!-- w: is the revision of the current workspace -->
    19692037            <arg value="-r" />
     
    19722040        </exec>
    19732041        <delete includeemptydirs="true" quiet="false">
     2042            <fileset dir="../i2p-${Extended.Version}/debian-alt/" />
    19742043            <fileset dir="../i2p-${Extended.Version}/installer/lib/" />
    19752044            <fileset dir="../i2p-${Extended.Version}/Slackware" />
    19762045            <fileset dir="../i2p-${Extended.Version}/_MTN" />
     2046            <!-- gettext-base -->
     2047            <fileset dir="../i2p-${Extended.Version}/core/java/src/gnu/gettext" />
     2048            <!-- libgetopt-java -->
     2049            <fileset dir="../i2p-${Extended.Version}/core/java/src/gnu/getopt" />
     2050            <!-- libhttpclient-java and libhttpcore-java -->
     2051          <!--
     2052            <fileset dir="../i2p-${Extended.Version}/core/java/src/org/apache/http" />
     2053           -->
     2054            <!-- systray4j -->
     2055            <fileset dir="../i2p-${Extended.Version}/apps/systray/java/lib" />
     2056            <file name="../i2p-${Extended.Version}/apps/systray/java/src/net/i2p/apps/systray/SysTrayImpl.java" />
     2057            <!-- geoip-database -->
     2058            <file name="../i2p-${Extended.Version}/installer/resources/geoip.txt" />
     2059            <file name="../i2p-${Extended.Version}/installer/resources/geoipv6.dat.gz" />
     2060            <!-- libjetty8-java -->
     2061            <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-8.1.17.v20150415" />
     2062            <!-- libjstl1.1-java or glassfish-javaee -->
     2063            <file name="../i2p-${Extended.Version}/apps/susidns/src/lib/jstl.jar" />
     2064            <!-- libjakarta-taglibs-standard-java or glassfish-javaee -->
     2065            <file name="../i2p-${Extended.Version}/apps/susidns/src/lib/standard.jar" />
     2066            <!-- libtomcat6-java or libtomcat7-java -->
     2067          <!--
     2068            <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat" />
     2069            <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat-deployer/" />
     2070           -->
     2071            <!-- anything added above, add in debian-release-tarball also -->
    19772072        </delete>
    19782073        <tar longfile="gnu" destfile="../${debian.tarball.name}" compression="bzip2">
     
    19802075                <include name="**/**" />
    19812076                <exclude name="debian/**"/>
     2077                <exclude name="debian-alt/**"/>
    19822078                <exclude name="**/*.sh"/>
     2079                <exclude name="installer/resources/geoip.txt"/>
     2080                <exclude name="installer/resources/geoipv6.dat.gz"/>
     2081                <exclude name="apps/jetty/jetty-distribution-*/**"/>
     2082                <exclude name="apps/susidns/src/lib/jstl.jar" />
     2083                <exclude name="apps/susidns/src/lib/standard.jar" />
     2084          <!--
     2085                <exclude name="apps/jetty/apache-tomcat/**"/>
     2086                <exclude name="apps/jetty/apache-tomcat-deployer/**"/>
     2087           -->
     2088                <!-- anything added above, add in debian-release-tarball also -->
    19832089            </tarfileset>
    19842090            <tarfileset dir="../i2p-${Extended.Version}" prefix="/i2p-${Extended.Version}" filemode="755">
     2091                <exclude name="debian/**" />
     2092                <include name="**/*.sh" />
     2093            </tarfileset>
     2094        </tar>
     2095    </target>
     2096
     2097    <!-- same as debian-tarball but with bundled jetty -->
     2098    <target name="precise-tarball" depends="getExtendedVersion">
     2099        <!-- this will use the monotonerc file in the current workspace -->
     2100        <fail message="This target cannot be used without Monotone! Use &quot;fakeroot debian/rules get-orig-source&quot; instead.">
     2101            <condition>
     2102                <not>
     2103                    <isset property="mtn.available" />
     2104                </not>
     2105            </condition>
     2106        </fail>
     2107        <property name="debian.tarball.name" value="i2p_${Extended.Version}.orig.tar.bz2" />
     2108        <echo message="Checking out fresh copy into ../i2p-${Extended.Version} for tarballing:" />
     2109        <delete dir="../i2p-${Extended.Version}" />
     2110        <exec executable="mtn" failonerror="true">
     2111            <arg value="co" />
     2112            <!-- w: is the revision of the current workspace -->
     2113            <arg value="-r" />
     2114            <arg value="w:" />
     2115            <arg value="../i2p-${Extended.Version}" />
     2116        </exec>
     2117        <delete includeemptydirs="true" quiet="false">
     2118            <fileset dir="../i2p-${Extended.Version}/debian-alt/" />
     2119            <fileset dir="../i2p-${Extended.Version}/installer/lib/" />
     2120            <fileset dir="../i2p-${Extended.Version}/Slackware" />
     2121            <fileset dir="../i2p-${Extended.Version}/_MTN" />
     2122            <!-- gettext-base -->
     2123            <fileset dir="../i2p-${Extended.Version}/core/java/src/gnu/gettext" />
     2124            <!-- libgetopt-java -->
     2125            <fileset dir="../i2p-${Extended.Version}/core/java/src/gnu/getopt" />
     2126            <!-- libhttpclient-java and libhttpcore-java -->
     2127          <!--
     2128            <fileset dir="../i2p-${Extended.Version}/core/java/src/org/apache/http" />
     2129           -->
     2130            <!-- systray4j -->
     2131            <fileset dir="../i2p-${Extended.Version}/apps/systray/java/lib" />
     2132            <file name="../i2p-${Extended.Version}/apps/systray/java/src/net/i2p/apps/systray/SysTrayImpl.java" />
     2133            <!-- geoip-database -->
     2134            <file name="../i2p-${Extended.Version}/installer/resources/geoip.txt" />
     2135            <file name="../i2p-${Extended.Version}/installer/resources/geoipv6.dat.gz" />
     2136            <!-- libjetty8-java -->
     2137          <!--
     2138            <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-8.1.17.v20150415" />
     2139           -->
     2140            <!-- libjstl1.1-java or glassfish-javaee -->
     2141            <file name="../i2p-${Extended.Version}/apps/susidns/src/lib/jstl.jar" />
     2142            <!-- libjakarta-taglibs-standard-java or glassfish-javaee -->
     2143            <file name="../i2p-${Extended.Version}/apps/susidns/src/lib/standard.jar" />
     2144            <!-- libtomcat6-java or libtomcat7-java -->
     2145          <!--
     2146            <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat" />
     2147            <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat-deployer/" />
     2148           -->
     2149            <!-- anything added above, add in debian-release-tarball also -->
     2150        </delete>
     2151        <tar longfile="gnu" destfile="../${debian.tarball.name}" compression="bzip2">
     2152            <tarfileset dir="../i2p-${Extended.Version}" prefix="/i2p-${Extended.Version}">
     2153                <include name="**/**" />
     2154                <exclude name="debian/**"/>
     2155                <exclude name="debian-alt/**"/>
     2156                <exclude name="**/*.sh"/>
     2157                <exclude name="installer/resources/geoip.txt"/>
     2158                <exclude name="installer/resources/geoipv6.dat.gz"/>
     2159          <!--
     2160                <exclude name="apps/jetty/jetty-distribution-*/**"/>
     2161           -->
     2162                <exclude name="apps/susidns/src/lib/jstl.jar" />
     2163                <exclude name="apps/susidns/src/lib/standard.jar" />
     2164          <!--
     2165                <exclude name="apps/jetty/apache-tomcat/**"/>
     2166                <exclude name="apps/jetty/apache-tomcat-deployer/**"/>
     2167           -->
     2168                <!-- anything added above, add in debian-release-tarball also -->
     2169            </tarfileset>
     2170            <tarfileset dir="../i2p-${Extended.Version}" prefix="/i2p-${Extended.Version}" filemode="755">
     2171                <exclude name="debian/**" />
     2172                <include name="**/*.sh" />
     2173            </tarfileset>
     2174        </tar>
     2175    </target>
     2176
     2177    <!-- same as debian-tarball but with a release tar.bz2 file name and tar prefix -->
     2178    <target name="debian-release-tarball" depends="getExtendedVersion">
     2179        <!-- this will use the monotonerc file in the current workspace -->
     2180        <fail message="This target cannot be used without Monotone! Use &quot;fakeroot debian/rules get-orig-source&quot; instead.">
     2181            <condition>
     2182                <not>
     2183                    <isset property="mtn.available" />
     2184                </not>
     2185            </condition>
     2186        </fail>
     2187        <property name="debian.tarball.name" value="i2p_${release.number}.orig.tar.bz2" />
     2188        <echo message="Checking out fresh copy into ../i2p-${Extended.Version} for tarballing:" />
     2189        <delete dir="../i2p-${Extended.Version}" />
     2190        <exec executable="mtn" failonerror="true">
     2191            <arg value="co" />
     2192            <!-- w: is the revision of the current workspace -->
     2193            <arg value="-r" />
     2194            <arg value="w:" />
     2195            <arg value="../i2p-${Extended.Version}" />
     2196        </exec>
     2197        <delete includeemptydirs="true" quiet="false">
     2198            <fileset dir="../i2p-${Extended.Version}/debian-alt/" />
     2199            <fileset dir="../i2p-${Extended.Version}/installer/lib/" />
     2200            <fileset dir="../i2p-${Extended.Version}/Slackware" />
     2201            <fileset dir="../i2p-${Extended.Version}/_MTN" />
     2202            <fileset dir="../i2p-${Extended.Version}/core/java/src/gnu/gettext" />
     2203            <fileset dir="../i2p-${Extended.Version}/core/java/src/gnu/getopt" />
     2204          <!--
     2205            <fileset dir="../i2p-${Extended.Version}/core/java/src/org/apache/http" />
     2206           -->
     2207            <fileset dir="../i2p-${Extended.Version}/apps/systray/java/lib" />
     2208            <file name="../i2p-${Extended.Version}/apps/systray/java/src/net/i2p/apps/systray/SysTrayImpl.java" />
     2209            <file name="../i2p-${Extended.Version}/installer/resources/geoip.txt" />
     2210            <file name="../i2p-${Extended.Version}/installer/resources/geoipv6.dat.gz" />
     2211            <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-8.1.17.v20150415" />
     2212            <file name="../i2p-${Extended.Version}/apps/susidns/src/lib/jstl.jar" />
     2213            <file name="../i2p-${Extended.Version}/apps/susidns/src/lib/standard.jar" />
     2214          <!--
     2215            <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat" />
     2216            <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat-deployer/" />
     2217           -->
     2218            <!-- anything added above, add in debian-tarball also -->
     2219        </delete>
     2220        <tar longfile="gnu" destfile="../${debian.tarball.name}" compression="bzip2">
     2221            <tarfileset dir="../i2p-${Extended.Version}" prefix="/i2p-${release.number}">
     2222                <include name="**/**" />
     2223                <exclude name="debian/**"/>
     2224                <exclude name="debian-alt/**"/>
     2225                <exclude name="**/*.sh"/>
     2226                <exclude name="installer/resources/geoip.txt"/>
     2227                <exclude name="installer/resources/geoipv6.dat.gz"/>
     2228                <exclude name="apps/jetty/jetty-distribution-*/**"/>
     2229                <exclude name="apps/susidns/src/lib/jstl.jar" />
     2230                <exclude name="apps/susidns/src/lib/standard.jar" />
     2231          <!--
     2232                <exclude name="apps/jetty/apache-tomcat/**"/>
     2233                <exclude name="apps/jetty/apache-tomcat-deployer/**"/>
     2234           -->
     2235                <!-- anything added above, add in debian-tarball also -->
     2236            </tarfileset>
     2237            <tarfileset dir="../i2p-${Extended.Version}" prefix="/i2p-${release.number}" filemode="755">
    19852238                <exclude name="debian/**" />
    19862239                <include name="**/*.sh" />
Note: See TracChangeset for help on using the changeset viewer.