- Timestamp:
- Mar 11, 2017 3:24:23 PM (4 years ago)
- Branches:
- master
- Children:
- aea20a5
- Parents:
- 072d990 (diff), db0381d (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. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
build.xml
r072d990 r0703a29 71 71 <echo message=" " /> 72 72 <echo message="sudo apt-get install debhelper ant debconf default-jdk gettext libgmp-dev po-debconf fakeroot \" /> 73 <echo message=" build-essential quilt libcommons-logging-javadh-apparmor dh-systemd libservice-wrapper-java \" />74 <echo message=" devscripts libjetty 8-java glassfish-javaee" />73 <echo message=" build-essential quilt dh-apparmor dh-systemd libservice-wrapper-java \" /> 74 <echo message=" devscripts libjetty9-java libtomcat8-java glassfish-javaee libgetopt-java" /> 75 75 <echo message=" " /> 76 76 <echo message="The following command will install the additional runtime dependencies:" /> … … 1243 1243 </target> 1244 1244 1245 <target name="copyjetty-unlesspkg" unless="${with-libjetty 8-java}" >1245 <target name="copyjetty-unlesspkg" unless="${with-libjetty9-java}" > 1246 1246 <copy todir="pkg-temp/lib" > 1247 1247 <fileset dir="build" includes="javax.servlet.jar jetty*.jar org.mortbay.*.jar" excludes="jetty-i2p.jar" /> … … 1290 1290 1291 1291 <target name="preplicenses-unlesspkg" depends="settomcatprop" unless="${with-libtomcat-java}" > 1292 <!-- replacement? 1292 1293 <copy file="apps/jetty/apache-tomcat-deployer/NOTICE" tofile="pkg-temp/licenses/NOTICE-Tomcat.txt" /> 1294 --> 1293 1295 </target> 1294 1296 … … 1463 1465 <exec executable="sh" osfamily="unix" failonerror="true"> 1464 1466 <arg value="-c" /> 1465 <arg value="for i in pkg-temp/lib/*.jar pkg-temp/webapps/*war; do if [ $i = pkg-temp/lib/ jasper-compiler.jar -o $i = pkg-temp/lib/jbigi.jar -o $i = pkg-temp/lib/jetty-java5-threadpool.jar -o $i = pkg-temp/lib/jetty-sslengine.jar ]; then continue; fi; echo pack200 $i; mv $i $i.jar; pack200 -g $i.pack $i.jar; rm -f $i.jar; done" />1467 <arg value="for i in pkg-temp/lib/*.jar pkg-temp/webapps/*war; do if [ $i = pkg-temp/lib/commons-logging.jar -o $i = pkg-temp/lib/jasper-compiler.jar -o $i = pkg-temp/lib/jbigi.jar -o $i = pkg-temp/lib/jetty-java5-threadpool.jar -o $i = pkg-temp/lib/jetty-sslengine.jar ]; then continue; fi; echo pack200 $i; mv $i $i.jar; pack200 -g $i.pack $i.jar; rm -f $i.jar; done" /> 1466 1468 </exec> 1467 1469 <exec executable="sh" osfamily="mac" failonerror="true"> 1468 1470 <arg value="-c" /> 1469 <arg value="for i in pkg-temp/lib/*.jar pkg-temp/webapps/*war; do if [ $i = pkg-temp/lib/ jasper-compiler.jar -o $i = pkg-temp/lib/jbigi.jar -o $i = pkg-temp/lib/jetty-java5-threadpool.jar -o $i = pkg-temp/lib/jetty-sslengine.jar ]; then continue; fi; echo pack200 $i; mv $i $i.jar; pack200 -g $i.pack $i.jar; rm -f $i.jar; done" />1471 <arg value="for i in pkg-temp/lib/*.jar pkg-temp/webapps/*war; do if [ $i = pkg-temp/lib/commons-logging.jar -o $i = pkg-temp/lib/jasper-compiler.jar -o $i = pkg-temp/lib/jbigi.jar -o $i = pkg-temp/lib/jetty-java5-threadpool.jar -o $i = pkg-temp/lib/jetty-sslengine.jar ]; then continue; fi; echo pack200 $i; mv $i $i.jar; pack200 -g $i.pack $i.jar; rm -f $i.jar; done" /> 1470 1472 </exec> 1471 1473 <!-- windoz here : i admit, i hate escaped symbols in xml, indeed = =! --> … … 1596 1598 can't overwrite an existing eepsite dir in a non-split configuration. 1597 1599 --> 1598 <copy todir="pkg-temp/eepsite-jetty 7" >1600 <copy todir="pkg-temp/eepsite-jetty9" > 1599 1601 <fileset dir="installer/resources/eepsite" includes="*.xml contexts/* etc/*" /> 1600 1602 </copy> … … 1602 1604 1603 1605 <target name="delete-j6-update"> 1604 <delete dir="pkg-temp/eepsite-jetty 7" />1606 <delete dir="pkg-temp/eepsite-jetty9" /> 1605 1607 </target> 1606 1608 … … 2205 2207 <arg value="../i2p-${Extended.Version}" /> 2206 2208 </exec> 2207 <delete includeemptydirs="true" quiet="false" >2209 <delete includeemptydirs="true" quiet="false" failonerror="false"> 2208 2210 <fileset dir="../i2p-${Extended.Version}/debian-alt/" /> 2209 2211 <fileset dir="../i2p-${Extended.Version}/installer/lib/" /> … … 2221 2223 <file name="../i2p-${Extended.Version}/installer/resources/geoip.txt" /> 2222 2224 <file name="../i2p-${Extended.Version}/installer/resources/geoipv6.dat.gz" /> 2223 <!-- libjetty 8-java -->2224 <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution- 8.1.21.v20160908" />2225 <!-- libjetty9-java --> 2226 <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-9.2.21.v20170120" /> 2225 2227 <!-- libjstl1.1-java or glassfish-javaee --> 2226 2228 <!-- … … 2229 2231 <!-- libjakarta-taglibs-standard-java or glassfish-javaee --> 2230 2232 <file name="../i2p-${Extended.Version}/apps/susidns/src/lib/standard.jar" /> 2231 <!-- libtomcat6-java or libtomcat7-java -->2232 <!--2233 <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat" />2234 <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat-deployer/" />2235 -->2236 2233 <!-- anything added above, add in debian-release-tarball also --> 2237 2234 </delete> … … 2249 2246 --> 2250 2247 <exclude name="apps/susidns/src/lib/standard.jar" /> 2251 <!--2252 <exclude name="apps/jetty/apache-tomcat/**"/>2253 <exclude name="apps/jetty/apache-tomcat-deployer/**"/>2254 -->2255 2248 <!-- anything added above, add in debian-release-tarball also --> 2256 2249 </tarfileset> … … 2287 2280 <arg value="../i2p-${Extended.Version}" /> 2288 2281 </exec> 2289 <delete includeemptydirs="true" quiet="false" >2282 <delete includeemptydirs="true" quiet="false" failonerror="false"> 2290 2283 <fileset dir="../i2p-${Extended.Version}/debian-alt/" /> 2291 2284 <fileset dir="../i2p-${Extended.Version}/installer/lib/" /> … … 2303 2296 <file name="../i2p-${Extended.Version}/installer/resources/geoip.txt" /> 2304 2297 <file name="../i2p-${Extended.Version}/installer/resources/geoipv6.dat.gz" /> 2305 <!-- libjetty 8-java -->2298 <!-- libjetty9-java --> 2306 2299 <!-- 2307 <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution- 8.1.21.v20160908" />2300 <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-9.2.21.v20170120" /> 2308 2301 --> 2309 2302 <!-- libjstl1.1-java or glassfish-javaee --> … … 2313 2306 <!-- libjakarta-taglibs-standard-java or glassfish-javaee --> 2314 2307 <file name="../i2p-${Extended.Version}/apps/susidns/src/lib/standard.jar" /> 2315 <!-- libtomcat6-java or libtomcat7-java -->2316 <!--2317 <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat" />2318 <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat-deployer/" />2319 -->2320 2308 <!-- anything added above, add in debian-release-tarball also --> 2321 2309 </delete> … … 2335 2323 --> 2336 2324 <exclude name="apps/susidns/src/lib/standard.jar" /> 2337 <!--2338 <exclude name="apps/jetty/apache-tomcat/**"/>2339 <exclude name="apps/jetty/apache-tomcat-deployer/**"/>2340 -->2341 2325 <!-- anything added above, add in debian-release-tarball also --> 2342 2326 </tarfileset> … … 2370 2354 <arg value="../i2p-${Extended.Version}" /> 2371 2355 </exec> 2372 <delete includeemptydirs="true" quiet="false" >2356 <delete includeemptydirs="true" quiet="false" failonerror="false">ilonerror="false"> 2373 2357 <fileset dir="../i2p-${Extended.Version}/debian-alt/" /> 2374 2358 <fileset dir="../i2p-${Extended.Version}/installer/lib/" /> … … 2382 2366 <file name="../i2p-${Extended.Version}/installer/resources/geoip.txt" /> 2383 2367 <file name="../i2p-${Extended.Version}/installer/resources/geoipv6.dat.gz" /> 2384 <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution- 8.1.21.v20160908" />2368 <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-9.2.21.v20170120" /> 2385 2369 <!-- 2386 2370 <file name="../i2p-${Extended.Version}/apps/susidns/src/lib/jstl.jar" /> 2387 2371 --> 2388 2372 <file name="../i2p-${Extended.Version}/apps/susidns/src/lib/standard.jar" /> 2389 <!--2390 <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat" />2391 <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat-deployer/" />2392 -->2393 2373 <!-- anything added above, add in debian-tarball also --> 2394 2374 </delete> … … 2406 2386 --> 2407 2387 <exclude name="apps/susidns/src/lib/standard.jar" /> 2408 <!--2409 <exclude name="apps/jetty/apache-tomcat/**"/>2410 <exclude name="apps/jetty/apache-tomcat-deployer/**"/>2411 -->2412 2388 <!-- anything added above, add in debian-tarball also --> 2413 2389 </tarfileset>
Note: See TracChangeset
for help on using the changeset viewer.