- Timestamp:
- Apr 1, 2016 6:19:06 PM (5 years ago)
- Branches:
- master
- Children:
- d6b1f81
- Parents:
- a493a28
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
build.xml
ra493a28 re2f048b 765 765 <echo message="Warning, javadoc embeds timestamps in the output, run with 'TZ=UTC ant javadoc' if you plan to distribute" /> 766 766 </target> 767 767 768 <target name="javadoc-zip" depends="javadoc"> 768 769 <zip destfile="javadoc.zip" basedir="build" level="9" includes="javadoc\**" /> … … 1063 1064 </target> 1064 1065 1066 <!-- This is the target called by debian/rules --> 1065 1067 <target name="preppkg-unix" depends="preppkg-base, prep-script-translation" > 1066 1068 <copy file="installer/resources/runplain.sh" todir="pkg-temp/" /> … … 1141 1143 </target> 1142 1144 1143 <target name="preppkg-base" depends="build, preplicenses, prepConsoleDocs, prepthemeupdates, prepCertificates, prepRouterInfos"> 1145 <!-- see targets below for conditional copying --> 1146 <target name="preppkg-base" depends="build, preplicenses, prepConsoleDocs, prepthemeupdates, prepCertificates, prepRouterInfos, copyjetty-unlesspkg, copytomcat-unlesspkg, copyjstl-unlesspkg, copystandard-unlesspkg"> 1144 1147 <!-- if updater200 was run previously, it left *.pack files in pkg-temp --> 1145 1148 <!-- Also remove deletelist.txt used for updater only --> … … 1149 1152 <copy file="build/i2p.jar" todir="pkg-temp/lib/" /> 1150 1153 <copy file="build/i2ptunnel.jar" todir="pkg-temp/lib/" /> 1151 <!-- all jetty stuff -->1152 <copy todir="pkg-temp/lib" >1153 <fileset dir="build" includes="commons*.jar jasper*.jar javax*.jar jetty*.jar jsp*.jar org.mortbay.*.jar" />1154 </copy>1155 1154 <copy file="build/mstreaming.jar" todir="pkg-temp/lib/" /> 1156 1155 <copy file="build/streaming.jar" todir="pkg-temp/lib/" /> … … 1171 1170 <copy file="build/susidns.war" todir="pkg-temp/webapps/" /> 1172 1171 <copy file="build/imagegen.war" todir="pkg-temp/webapps/" /> 1173 <copy file="apps/susidns/src/WEB-INF/lib/jstl.jar" todir="pkg-temp/lib/" />1174 <copy file="apps/susidns/src/WEB-INF/lib/standard.jar" todir="pkg-temp/lib/" />1175 1172 <copy file="build/i2psnark.war" todir="pkg-temp/webapps/" /> 1176 1173 <copy file="apps/i2psnark/i2psnark.config" todir="pkg-temp/" /> … … 1205 1202 </target> 1206 1203 1204 <target name="copyjetty-unlesspkg" unless="${with-libjetty8-java}" > 1205 <copy todir="pkg-temp/lib" > 1206 <fileset dir="build" includes="javax.servlet.jar jetty*.jar org.mortbay.*.jar" /> 1207 </copy> 1208 </target> 1209 1210 <target name="copytomcat-unlesspkg" unless="${with-libservlet2.5-java}" > 1211 <copy todir="pkg-temp/lib" > 1212 <fileset dir="build" includes="commons*.jar jasper*.jar javax*.jar" /> 1213 </copy> 1214 </target> 1215 1216 <target name="copyjstl-unlesspkg" unless="${with-libjstl1.1-java}" > 1217 <copy file="apps/susidns/src/WEB-INF/lib/jstl.jar" todir="pkg-temp/lib/" /> 1218 </target> 1219 1220 <target name="copystandard-unlesspkg" unless="${with-libjakarta-taglibs-standard-java}" > 1221 <copy file="apps/susidns/src/WEB-INF/lib/standard.jar" todir="pkg-temp/lib/" /> 1222 </target> 1223 1207 1224 <!-- does NOT include launch4j licenses for Windows builds --> 1208 <target name="preplicenses" >1225 <target name="preplicenses" depends="preplicenses-unlesspkg" > 1209 1226 <copy file="LICENSE.txt" todir="pkg-temp/" /> 1210 1227 <copy todir="pkg-temp/licenses/" > 1211 1228 <fileset dir="licenses/" /> 1212 1229 </copy> 1230 <copy file="apps/imagegen/identicon/README.md" tofile="pkg-temp/licenses/LICENSE-Identicon.txt" /> 1231 </target> 1232 1233 <target name="preplicenses-unlesspkg" unless="${with-libjetty8-java}" > 1213 1234 <copy file="apps/jetty/apache-tomcat-deployer/NOTICE" tofile="pkg-temp/licenses/NOTICE-Tomcat.txt" /> 1214 <copy file="apps/imagegen/identicon/README.md" tofile="pkg-temp/licenses/LICENSE-Identicon.txt" /> 1215 </target> 1216 1235 </target> 1217 1236 1218 1237 <!-- DOES include launch4j licenses for Windows builds --> … … 1990 2009 <fileset dir="../i2p-${Extended.Version}/Slackware" /> 1991 2010 <fileset dir="../i2p-${Extended.Version}/_MTN" /> 2011 <file name="../i2p-${Extended.Version}/installer/resources/geoip.txt" /> 2012 <file name="../i2p-${Extended.Version}/installer/resources/geoipv6.dat.gz" /> 2013 <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat" /> 2014 <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat-deployer/" /> 2015 <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-8.1.17.v20150415" /> 2016 <file name="../i2p-${Extended.Version}/apps/susidns/src/WEB-INF/lib/jstl.jar" /> 2017 <file name="../i2p-${Extended.Version}/apps/susidns/src/WEB-INF/lib/standard.jar" /> 2018 <!-- anything added above, add in debian-release-tarball also --> 1992 2019 </delete> 1993 2020 <tar longfile="gnu" destfile="../${debian.tarball.name}" compression="bzip2"> … … 1999 2026 <exclude name="installer/resources/geoip.txt"/> 2000 2027 <exclude name="installer/resources/geoipv6.dat.gz"/> 2028 <exclude name="apps/jetty/apache-tomcat/**"/> 2029 <exclude name="apps/jetty/apache-tomcat-deployer/**"/> 2030 <exclude name="apps/jetty/jetty-distribution-*/**"/> 2031 <exclude name="apps/susidns/src/WEB-INF/lib/jstl.jar" /> 2032 <exclude name="apps/susidns/src/WEB-INF/lib/standard.jar" /> 2033 <!-- anything added above, add in debian-release-tarball also --> 2001 2034 </tarfileset> 2002 2035 <tarfileset dir="../i2p-${Extended.Version}" prefix="/i2p-${Extended.Version}" filemode="755"> … … 2034 2067 <fileset dir="../i2p-${Extended.Version}/Slackware" /> 2035 2068 <fileset dir="../i2p-${Extended.Version}/_MTN" /> 2069 <file name="../i2p-${Extended.Version}/installer/resources/geoip.txt" /> 2070 <file name="../i2p-${Extended.Version}/installer/resources/geoipv6.dat.gz" /> 2071 <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat" /> 2072 <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat-deployer/" /> 2073 <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-8.1.17.v20150415" /> 2074 <file name="../i2p-${Extended.Version}/apps/susidns/src/WEB-INF/lib/jstl.jar" /> 2075 <file name="../i2p-${Extended.Version}/apps/susidns/src/WEB-INF/lib/standard.jar" /> 2076 <!-- anything added above, add in debian-tarball also --> 2036 2077 </delete> 2037 2078 <tar longfile="gnu" destfile="../${debian.tarball.name}" compression="bzip2"> … … 2041 2082 <exclude name="debian-alt/**"/> 2042 2083 <exclude name="**/*.sh"/> 2084 <exclude name="installer/resources/geoip.txt"/> 2085 <exclude name="installer/resources/geoipv6.dat.gz"/> 2086 <exclude name="apps/jetty/apache-tomcat/**"/> 2087 <exclude name="apps/jetty/apache-tomcat-deployer/**"/> 2088 <exclude name="apps/jetty/jetty-distribution-*/**"/> 2089 <exclude name="apps/susidns/src/WEB-INF/lib/jstl.jar" /> 2090 <exclude name="apps/susidns/src/WEB-INF/lib/standard.jar" /> 2091 <!-- anything added above, add in debian-tarball also --> 2043 2092 </tarfileset> 2044 2093 <tarfileset dir="../i2p-${Extended.Version}" prefix="/i2p-${release.number}" filemode="755">
Note: See TracChangeset
for help on using the changeset viewer.