Changeset f653b03


Ignore:
Timestamp:
May 26, 2016 6:29:24 PM (4 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
8807787
Parents:
498280b
Message:

Ubuntu: Launchpad precise build fixes

  • Mods to the trusty debian files for precise
  • New precise-tarball build target
Files:
2 added
3 edited

Legend:

Unmodified
Added
Removed
  • build.xml

    r498280b rf653b03  
    20952095    </target>
    20962096
     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
    20972177    <!-- same as debian-tarball but with a release tar.bz2 file name and tar prefix -->
    20982178    <target name="debian-release-tarball" depends="getExtendedVersion">
  • debian-alt/precise/control

    r498280b rf653b03  
    55Priority: optional
    66Bugs: mailto:zzz@i2pmail.org
    7 Homepage: https://geti2p.net
     7Homepage: https://geti2p.net/
    88Build-Depends: debhelper (>= 7.0.50~)
    99 ,ant (>= 1.8)
     
    1414# Unable to locate tools.jar. Expected to find it in /usr/lib/jvm/java-6-openjdk-amd64/lib/tools.jar
    1515 ,openjdk-6-jdk
     16 ,glassfish-javaee
    1617 ,dh-apparmor
    1718 ,gettext
    18  ,libgmp3-dev
     19 ,libgetopt-java
     20 ,libgmp-dev (>= 2:5.0.2)
    1921 ,libservice-wrapper-java
    2022 ,hardening-wrapper
     
    4648Priority: optional
    4749Depends: ${shlibs:Depends}, i2p-router
    48 Homepage: http://www.i2p2.de/jbigi
     50Homepage: https://geti2p.net/
    4951Description: Java Big Integer library
    5052 This Package contains the libjbigi JNI library (and on x86 platforms, jcpuid).
     
    7375Priority: optional
    7476Depends: ${misc:Depends}, ${java:Depends}, ${shlibs:Depends},
    75  openjdk-8-jre-headless | openjdk-7-jre-headless | java8-runtime-headless | java7-runtime-headless, libecj-java
     77 openjdk-8-jre-headless | openjdk-7-jre-headless | java8-runtime-headless | java7-runtime-headless,
     78 libecj-java,
     79 geoip-database,
     80 gettext-base,
     81 libgetopt-java,
     82 glassfish-javaee
    7683Replaces: i2p ( << 0.8.6-5)
    7784Breaks: i2p (<< 0.8.6-5)
  • debian-alt/precise/rules

    r498280b rf653b03  
    3535export JAVA_HOME I2P
    3636export DEBIANVERSION := $(shell dpkg-parsechangelog |awk -F' ' '/^Version:/{print $$2}' |sed 's/.*-\([.0-9A-Za-z~+]\{1,\}\)$$/\1/')
     37# required for jbigi/jcpuid build
     38export BITS := $(shell dpkg-architecture -qDEB_HOST_ARCH_BITS)
     39#export DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
    3740
    3841%:
     
    6366        dh_prep
    6467        mkdir -p $(CURDIR)/installer/lib/wrapper/all
    65         mkdir -p $(CURDIR)/installer/lib/launch4j/lib/
    66         ln -sf /usr/share/java/commons-logging.jar $(CURDIR)/installer/lib/launch4j/lib/commons-logging.jar
    6768        ln -sf /usr/share/java/wrapper.jar $(CURDIR)/installer/lib/wrapper/all/wrapper.jar
    6869        if [ ! -e $(CURDIR)/debian/routerversion.java.bak ]; then \
     
    7576        @echo "Already found deb in version, not doing anything"
    7677endif
    77         # build options
     78        @# build options
    7879        @/bin/echo -e "javac.version=1.7" > $(CURDIR)/override.properties
    7980        @/bin/echo -e "javac.compilerargs=-bootclasspath $(JAVA_HOME)/jre/lib/rt.jar:$(JAVA_HOME)/jre/lib/jce.jar" >> $(CURDIR)/override.properties
    8081        @/bin/echo -e "javac.compilerargs7=-bootclasspath $(JAVA_HOME)/jre/lib/rt.jar:$(JAVA_HOME)/jre/lib/jce.jar" >> $(CURDIR)/override.properties
    8182        @/bin/echo -e "build.built-by=debian" >> $(CURDIR)/override.properties
     83
     84        @# debian and ubuntu: everywhere
     85        @/bin/echo -e "with-geoip-database=true" >> $(CURDIR)/override.properties
     86
     87        @# ubuntu: not in precise
     88        @# debian: in wheezy jessie stretch sid
     89        @#/bin/echo -e "with-libjetty8-java=true" >> $(CURDIR)/override.properties
     90        @#mkdir -p $(CURDIR)/apps/jetty/jettylib
     91        @#ln -sf /usr/share/java/jetty8-continuation.jar $(CURDIR)/apps/jetty/jettylib/jetty-continuation.jar
     92        @#ln -sf /usr/share/java/jetty8-deploy.jar $(CURDIR)/apps/jetty/jettylib/jetty-deploy.jar
     93        @#ln -sf /usr/share/java/jetty8-http.jar $(CURDIR)/apps/jetty/jettylib/jetty-http.jar
     94        @#ln -sf /usr/share/java/jetty8-io.jar $(CURDIR)/apps/jetty/jettylib/jetty-io.jar
     95        @#ln -sf /usr/share/java/jetty8-rewrite.jar $(CURDIR)/apps/jetty/jettylib/jetty-rewrite-handler.jar
     96        @#ln -sf /usr/share/java/jetty8-security.jar $(CURDIR)/apps/jetty/jettylib/jetty-security.jar
     97        @#ln -sf /usr/share/java/jetty8-servlet.jar $(CURDIR)/apps/jetty/jettylib/jetty-servlet.jar
     98        @#ln -sf /usr/share/java/jetty8-servlets.jar $(CURDIR)/apps/jetty/jettylib/jetty-servlets.jar
     99        @#ln -sf /usr/share/java/jetty8-start.jar $(CURDIR)/apps/jetty/jettylib/jetty-start.jar
     100        @#ln -sf /usr/share/java/jetty8-util.jar $(CURDIR)/apps/jetty/jettylib/jetty-util.jar
     101        @#ln -sf /usr/share/java/jetty8-webapp.jar $(CURDIR)/apps/jetty/jettylib/jetty-webapp.jar
     102        @#ln -sf /usr/share/java/jetty8-xml.jar $(CURDIR)/apps/jetty/jettylib/jetty-xml.jar
     103        @#ln -sf /usr/share/java/jetty8-server.jar $(CURDIR)/apps/jetty/jettylib/org.mortbay.jetty.jar
     104        @#ln -sf /usr/share/java/jetty8-jmx.jar $(CURDIR)/apps/jetty/jettylib/org.mortbay.jmx.jar
     105        @# following two are from libservlet3.0-java which is a dependency of libjetty8-java
     106        @#ln -sf /usr/share/java/servlet-api-3.0.jar $(CURDIR)/apps/jetty/jettylib/javax.servlet.jar
     107        @#ln -sf /usr/share/java/jsp-api-2.2.jar $(CURDIR)/apps/jetty/jettylib/jsp-api.jar
     108
     109        @# ubuntu: only in precise trusty vivid
     110        @# debian: only in wheezy
     111        @#@/bin/echo -e "with-libtomcat6-java=true" >> $(CURDIR)/override.properties
     112        @#mkdir -p $(CURDIR)/apps/jetty/jettylib
     113        @#ln -sf /usr/share/java/jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-runtime.jar
     114        @#ln -sf /usr/share/java/tomcat-coyote.jar $(CURDIR)/apps/jetty/jettylib/tomcat-coyote.jar
     115        @#ln -sf /usr/share/java/tomcat-juli.jar $(CURDIR)/apps/jetty/jettylib/commons-logging.jar
     116        @#ln -sf /usr/share/java/jasper-el.jar $(CURDIR)/apps/jetty/jettylib/jasper-el.jar
     117        @# following is from libservlet2.5-java which is a dependency of libtomcat6-java
     118        @#ln -sf /usr/share/java/el-api-2.1.jar $(CURDIR)/apps/jetty/jettylib/commons-el.jar
     119
     120        @# debian and ubuntu: everywhere
     121        @#/bin/echo -e "with-libtomcat7-java=true" >> $(CURDIR)/override.properties
     122        @#mkdir -p $(CURDIR)/apps/jetty/jettylib
     123        @#ln -sf /usr/share/java/tomcat-jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-runtime.jar
     124        @#ln -sf /usr/share/java/tomcat-api.jar $(CURDIR)/apps/jetty/jettylib/tomcat-api.jar
     125        @#ln -sf /usr/share/java/tomcat-util.jar $(CURDIR)/apps/jetty/jettylib/tomcat-util.jar
     126        @#ln -sf /usr/share/java/tomcat-coyote.jar $(CURDIR)/apps/jetty/jettylib/tomcat-coyote.jar
     127        @#ln -sf /usr/share/java/tomcat-juli.jar $(CURDIR)/apps/jetty/jettylib/commons-logging.jar
     128        @#ln -sf /usr/share/java/tomcat-jasper-el.jar $(CURDIR)/apps/jetty/jettylib/jasper-el.jar
     129        @# following is from libservlet3.0-java which is a dependency of libtomcat7-java
     130        @#ln -sf /usr/share/java/el-api-2.2.jar $(CURDIR)/apps/jetty/jettylib/commons-el.jar
     131
     132        @# debian and ubuntu: everywhere
     133        @/bin/echo -e "with-glassfish-javaee=true" >> $(CURDIR)/override.properties
     134        ln -sf /usr/share/java/glassfish-javaee.jar $(CURDIR)/apps/susidns/src/lib/jstl.jar
     135        ln -sf /usr/share/java/glassfish-appserv-jstl.jar $(CURDIR)/apps/susidns/src/lib/standard.jar
     136
     137        @# debian and ubuntu: everywhere
     138        @#/bin/echo -e "with-libjakarta-taglibs-standard-java=true" >> $(CURDIR)/override.properties
     139        @#ln -sf /usr/share/java/standard.jar $(CURDIR)/apps/susidns/src/lib/standard.jar
     140
     141        @# debian and ubuntu: everywhere
     142        @#/bin/echo -e "with-libjstl1.1-java=true" >> $(CURDIR)/override.properties
     143        @#ln -sf /usr/share/java/jstl1.1.jar $(CURDIR)/apps/susidns/src/lib/jstl.jar
     144
     145        @# debian and ubuntu: everywhere
     146        @/bin/echo -e "with-gettext-base=true" >> $(CURDIR)/override.properties
     147        @mkdir -p $(CURDIR)/core/java/build
     148        ln -sf /usr/share/java/libintl.jar $(CURDIR)/core/java/build/libintl.jar
     149
     150        @# debian and ubuntu: everywhere
     151        @/bin/echo -e "with-libgetopt-java=true" >> $(CURDIR)/override.properties
     152        @mkdir -p $(CURDIR)/core/java/build
     153        ln -sf /usr/share/java/gnu-getopt.jar $(CURDIR)/core/java/build/gnu-getopt.jar
     154
     155        @# 2 MB of dependencies vs. 20 KB of copied source
     156        @# Requires 4.4 or higher.
     157        @# Debian: Not in wheezy/jessie
     158        @# Ubuntu: Only in wily and later
     159        @#/bin/echo -e "with-libhttpclient-java=true" >> $(CURDIR)/override.properties
     160        @#mkdir -p $(CURDIR)/core/java/build
     161        @#ln -sf /usr/share/java/httpclient.jar $(CURDIR)/core/java/build/httpclient.jar
     162        @#ln -sf /usr/share/java/httpcore.jar $(CURDIR)/core/java/build/httpcore.jar
     163
    82164        TZ=UTC JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8 ant preppkg-unix javadoc
    83165        echo router.updateDisabled=true > $(I2P)/router.config
Note: See TracChangeset for help on using the changeset viewer.