Changeset 5c8eab9 for build.xml


Ignore:
Timestamp:
Apr 4, 2016 6:07:43 PM (5 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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • 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 -->
Note: See TracChangeset for help on using the changeset viewer.