Changeset 5c8eab9


Ignore:
Timestamp:
Apr 4, 2016 6:07:43 PM (4 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
094cf14
Parents:
ae5828f
Message:

Debian: Add dependency on glassfish-javaee for jstl.jar and standard.jar version 1.2
don't echo comments in debian/rules

Files:
7 edited

Legend:

Unmodified
Added
Removed
  • build.properties

    rae5828f r5c8eab9  
    126126# Don't build with bundled tomcat 6, we will use libtomcat7-java package
    127127#with-libtomcat7-java=true
    128 # Don't include standard.jar, we will use libjakarta-taglibs-standard-java package
    129 #with-libjakarta-taglibs-standard-java=true
    130 # Don't include jstl.jar, we will use libjstl1.1-java package
    131 #with-libjstl1.1-java=true
     128# Don't include jstl.jar and standard.jar, we will use glassfish-javaee package
     129#with-glassfish-javaee=true
  • build.xml

    rae5828f r5c8eab9  
    6565            <echo message="&quot;quilt&quot; and &quot;build-essential&quot;!" />
    6666            <echo message="" />
    67             <echo message="The following command will install all of the dependencies for you:" />
     67            <echo message="The following command will install the build dependencies for you:" />
    6868            <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 dh-systemd libservice-wrapper-java devscripts"  />
     69            <echo message="sudo apt-get install debhelper ant debconf default-jdk gettext libgmp-dev po-debconf fakeroot \" />
     70            <echo message="  build-essential quilt libcommons-logging-java dh-apparmor dh-systemd libservice-wrapper-java \"  />
     71            <echo message="  devscripts libjetty8-java glassfish-javaee"  />
     72            <echo message=" " />
     73            <echo message="The following command will install the additional runtime dependencies:" />
     74            <echo message="sudo apt-get install libecj-java geoip-database" />
    7175            <echo message=" " />
    7276            <echo message="Once the dependencies are installed, run &quot;ant debian&quot;"/>
     
    12181222    </target>
    12191223
    1220     <target name="copyjstl-unlesspkg" unless="${with-libjstl1.1-java}" >
     1224    <target name="copyjstl-unlesspkg" unless="${with-glassfish-javaee}" >
    12211225        <copy file="apps/susidns/src/WEB-INF/lib/jstl.jar" todir="pkg-temp/lib/" />
    12221226    </target>
    12231227
    1224     <target name="copystandard-unlesspkg" unless="${with-libjakarta-taglibs-standard-java}" >
     1228    <target name="copystandard-unlesspkg" unless="${with-glassfish-javaee}" >
    12251229        <copy file="apps/susidns/src/WEB-INF/lib/standard.jar" todir="pkg-temp/lib/" />
    12261230    </target>
     
    20142018            <file name="../i2p-${Extended.Version}/installer/resources/geoipv6.dat.gz" />
    20152019            <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-8.1.17.v20150415" />
     2020            <file name="../i2p-${Extended.Version}/apps/susidns/src/WEB-INF/lib/jstl.jar" />
     2021            <file name="../i2p-${Extended.Version}/apps/susidns/src/WEB-INF/lib/standard.jar" />
    20162022          <!--
    20172023            <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat" />
    20182024            <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat-deployer/" />
    2019             <file name="../i2p-${Extended.Version}/apps/susidns/src/WEB-INF/lib/jstl.jar" />
    2020             <file name="../i2p-${Extended.Version}/apps/susidns/src/WEB-INF/lib/standard.jar" />
    20212025           -->
    20222026            <!-- anything added above, add in debian-release-tarball also -->
     
    20312035                <exclude name="installer/resources/geoipv6.dat.gz"/>
    20322036                <exclude name="apps/jetty/jetty-distribution-*/**"/>
     2037                <exclude name="apps/susidns/src/WEB-INF/lib/jstl.jar" />
     2038                <exclude name="apps/susidns/src/WEB-INF/lib/standard.jar" />
    20332039          <!--
    20342040                <exclude name="apps/jetty/apache-tomcat/**"/>
    20352041                <exclude name="apps/jetty/apache-tomcat-deployer/**"/>
    2036                 <exclude name="apps/susidns/src/WEB-INF/lib/jstl.jar" />
    2037                 <exclude name="apps/susidns/src/WEB-INF/lib/standard.jar" />
    20382042           -->
    20392043                <!-- anything added above, add in debian-release-tarball also -->
     
    20742078            <file name="../i2p-${Extended.Version}/installer/resources/geoipv6.dat.gz" />
    20752079            <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-8.1.17.v20150415" />
     2080            <file name="../i2p-${Extended.Version}/apps/susidns/src/WEB-INF/lib/jstl.jar" />
     2081            <file name="../i2p-${Extended.Version}/apps/susidns/src/WEB-INF/lib/standard.jar" />
    20762082          <!--
    20772083            <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat" />
    20782084            <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat-deployer/" />
    2079             <file name="../i2p-${Extended.Version}/apps/susidns/src/WEB-INF/lib/jstl.jar" />
    2080             <file name="../i2p-${Extended.Version}/apps/susidns/src/WEB-INF/lib/standard.jar" />
    20812085           -->
    20822086            <!-- anything added above, add in debian-tarball also -->
     
    20912095                <exclude name="installer/resources/geoipv6.dat.gz"/>
    20922096                <exclude name="apps/jetty/jetty-distribution-*/**"/>
     2097                <exclude name="apps/susidns/src/WEB-INF/lib/jstl.jar" />
     2098                <exclude name="apps/susidns/src/WEB-INF/lib/standard.jar" />
    20932099          <!--
    20942100                <exclude name="apps/jetty/apache-tomcat/**"/>
    20952101                <exclude name="apps/jetty/apache-tomcat-deployer/**"/>
    2096                 <exclude name="apps/susidns/src/WEB-INF/lib/jstl.jar" />
    2097                 <exclude name="apps/susidns/src/WEB-INF/lib/standard.jar" />
    20982102           -->
    20992103                <!-- anything added above, add in debian-tarball also -->
  • debian-alt/doc/debian-build.txt

    rae5828f r5c8eab9  
    6565# with reprepro update, skip this?
    6666reprepro includedsc unstable i2p_0.9.XX-1.dsc
     67
     68
     69# To copy precise to wheezy if you build precise on launchpad
     70# and then did a reprepro update:
     71# Note that syntax is reprepro copysrc TO FROM package!
     72reprepro copysrc wheezy precise i2p
  • debian/control

    rae5828f r5c8eab9  
    1212 ,openjdk-7-jdk
    1313 ,libjetty8-java, libservlet3.0-java
     14 ,glassfish-javaee
    1415 ,dh-apparmor
    1516 ,gettext
     
    7576 libecj-java,
    7677 geoip-database,
    77  libjetty8-java, libservlet3.0-java
     78 libjetty8-java, libservlet3.0-java,
     79 glassfish-javaee
    7880Replaces: i2p ( << 0.8.6-5)
    7981Breaks: i2p (<< 0.8.6-5)
  • debian/i2p-router.install

    rae5828f r5c8eab9  
    3737
    3838# uncomment if not building with libjetty8-java
    39 # ubuntu: only in wily
     39# ubuntu: in trusty vivid wily xenial
    4040# debian: in wheezy jessie stretch sid
    4141#pkg-temp/lib/jetty-continuation.jar usr/share/i2p/lib
     
    7272
    7373
    74 # uncomment if not building with libjakarta-taglibs-standard-java
    75 # ubuntu: only in wily
    76 # debian: in wheezy jessie stretch sid
    77 pkg-temp/lib/jstl.jar usr/share/i2p/lib
    78 
    79 
    80 # uncomment if not building with libjstl1.1-java
    81 # ubuntu: in precise trusty vivid wily xenial
    82 # debian: in wheezy jessie stretch sid
    83 pkg-temp/lib/standard.jar usr/share/i2p/lib
     74# uncomment if not building with glassfish-javaee
     75# ubuntu and debian: everywhere
     76#pkg-temp/lib/jstl.jar usr/share/i2p/lib
     77#pkg-temp/lib/standard.jar usr/share/i2p/lib
  • debian/i2p-router.links

    rae5828f r5c8eab9  
    88
    99# comment out if not building with libjetty8-java
    10 # ubuntu: only in wily
     10# ubuntu: in trusty vivid wily xenial
    1111# debian: in wheezy jessie stretch sid
    1212usr/share/java/jetty8-continuation.jar usr/share/i2p/lib/jetty-continuation.jar
     
    5151
    5252
    53 # comment out if not building with libjakarta-taglibs-standard-java
    54 # ubuntu: only in wily
    55 # debian: in wheezy jessie stretch sid
    56 #usr/share/java/standard.jar usr/share/i2p/lib/standard.jar
    57 
    58 
    59 # comment out if not building with libjstl1.1-java
    60 # ubuntu: in precise trusty vivid wily xenial
    61 # debian: in wheezy jessie stretch sid
    62 #usr/share/java/jstl1.1.jar usr/share/i2p/lib/jstl.jar
     53# comment out if not building with glassfish-javaee
     54# ubuntu and debian: everywhere
     55usr/share/java/glassfish-javaee.jar usr/share/i2p/lib/jstl.jar
     56usr/share/java/glassfish-appserv-jstl.jar usr/share/i2p/lib/standard.jar
  • debian/rules

    rae5828f r5c8eab9  
    7373        @echo "Already found deb in version, not doing anything"
    7474endif
    75         # build options
     75        @# build options
    7676        @/bin/echo -e "javac.version=1.7" > $(CURDIR)/override.properties
    7777        @/bin/echo -e "javac.compilerargs=-bootclasspath $(JAVA_HOME)/jre/lib/rt.jar:$(JAVA_HOME)/jre/lib/jce.jar" >> $(CURDIR)/override.properties
     
    7979        @/bin/echo -e "build.built-by=debian" >> $(CURDIR)/override.properties
    8080
    81         # debian and ubuntu: everywhere
     81        @# debian and ubuntu: everywhere
    8282        @/bin/echo -e "with-geoip-database=true" >> $(CURDIR)/override.properties
    8383
    84         # ubuntu: only in wily
    85         # debian: in wheezy jessie stretch sid
     84        @# ubuntu: not in precise
     85        @# debian: in wheezy jessie stretch sid
    8686        @/bin/echo -e "with-libjetty8-java=true" >> $(CURDIR)/override.properties
    8787        mkdir -p $(CURDIR)/apps/jetty/jettylib
     
    100100        ln -sf /usr/share/java/jetty8-server.jar $(CURDIR)/apps/jetty/jettylib/org.mortbay.jetty.jar
    101101        ln -sf /usr/share/java/jetty8-jmx.jar $(CURDIR)/apps/jetty/jettylib/org.mortbay.jmx.jar
    102         # following two are from libservlet3.0-java which is a dependency of libjetty8-java
     102        @# following two are from libservlet3.0-java which is a dependency of libjetty8-java
    103103        ln -sf /usr/share/java/servlet-api-3.0.jar $(CURDIR)/apps/jetty/jettylib/javax.servlet.jar
    104104        ln -sf /usr/share/java/jsp-api-2.1.jar $(CURDIR)/apps/jetty/jettylib/jsp-api.jar
    105105
    106         # ubuntu: only in wily
    107         # debian: in wheezy jessie stretch sid
    108         #mkdir -p $(CURDIR)/apps/jetty/jettylib
    109         #@/bin/echo -e "with-libservlet2.5-java=true" >> $(CURDIR)/override.properties
    110         #ln -sf /usr/share/java/el-api-2.1.jar $(CURDIR)/apps/jetty/jettylib/commons-el.jar
     106        @# ubuntu: only in wily
     107        @# debian: in wheezy jessie stretch sid
     108        @#mkdir -p $(CURDIR)/apps/jetty/jettylib
     109        @#@/bin/echo -e "with-libservlet2.5-java=true" >> $(CURDIR)/override.properties
     110        @#ln -sf /usr/share/java/el-api-2.1.jar $(CURDIR)/apps/jetty/jettylib/commons-el.jar
    111111
    112         # ubuntu: only in precise trusty vivid
    113         # debian: only in wheezy
    114         #@/bin/echo -e "with-libtomcat6-java=true" >> $(CURDIR)/override.properties
    115         #mkdir -p $(CURDIR)/apps/jetty/jettylib
    116         #ln -sf /usr/share/java/jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-compiler.jar
    117         #ln -sf /usr/share/java/jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-runtime.jar
    118         #ln -sf /usr/share/java/tomcat-coyote.jar $(CURDIR)/apps/jetty/jettylib/tomcat-coyote.jar
    119         #ln -sf /usr/share/java/tomcat-juli.jar $(CURDIR)/apps/jetty/jettylib/commons-logging.jar
     112        @# ubuntu: only in precise trusty vivid
     113        @# debian: only in wheezy
     114        @#@/bin/echo -e "with-libtomcat6-java=true" >> $(CURDIR)/override.properties
     115        @#mkdir -p $(CURDIR)/apps/jetty/jettylib
     116        @#ln -sf /usr/share/java/jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-compiler.jar
     117        @#ln -sf /usr/share/java/jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-runtime.jar
     118        @#ln -sf /usr/share/java/tomcat-coyote.jar $(CURDIR)/apps/jetty/jettylib/tomcat-coyote.jar
     119        @#ln -sf /usr/share/java/tomcat-juli.jar $(CURDIR)/apps/jetty/jettylib/commons-logging.jar
    120120
    121         # debian and ubuntu: everywhere
    122         #@/bin/echo -e "with-libtomcat7-java=true" >> $(CURDIR)/override.properties
    123         #mkdir -p $(CURDIR)/apps/jetty/jettylib
    124         #ln -sf /usr/share/java/tomcat-jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-compiler.jar
    125         #ln -sf /usr/share/java/tomcat-jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-runtime.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
     121        @# debian and ubuntu: everywhere
     122        @#@/bin/echo -e "with-libtomcat7-java=true" >> $(CURDIR)/override.properties
     123        @#mkdir -p $(CURDIR)/apps/jetty/jettylib
     124        @#ln -sf /usr/share/java/tomcat-jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-compiler.jar
     125        @#ln -sf /usr/share/java/tomcat-jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-runtime.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
    128128
    129         # ubuntu: only in wily
    130         # debian: in wheezy jessie stretch sid
    131         #@/bin/echo -e "with-libjakarta-taglibs-standard-java=true" >> $(CURDIR)/override.properties
    132         #ln -sf /usr/share/java/standard.jar $(CURDIR)/apps/susidns/src/WEB-INF/lib/standard.jar
    133 
    134         # debian and ubuntu: everywhere
    135         #@/bin/echo -e "with-libjstl1.1-java=true" >> $(CURDIR)/override.properties
    136         #ln -sf /usr/share/java/jstl1.1.jar $(CURDIR)/apps/susidns/src/WEB-INF/lib/jstl.jar
     129        @# debian and ubuntu: everywhere
     130        @/bin/echo -e "with-glassfish-javaee=true" >> $(CURDIR)/override.properties
     131        ln -sf /usr/share/java/glassfish-javaee.jar $(CURDIR)/apps/susidns/src/WEB-INF/lib/jstl.jar
     132        ln -sf /usr/share/java/glassfish-appserv-jstl.jar $(CURDIR)/apps/susidns/src/WEB-INF/lib/standard.jar
    137133
    138134        TZ=UTC JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8 ant preppkg-unix javadoc
Note: See TracChangeset for help on using the changeset viewer.