- Timestamp:
- Nov 20, 2016 6:08:40 AM (4 years ago)
- Branches:
- master
- Children:
- 97af7d0
- Parents:
- 01cfb7b (diff), b0bba18 (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
r01cfb7b r11579b9 401 401 </target> 402 402 403 <target name="buildJrobin" depends="build Properties" >403 <target name="buildJrobin" depends="buildCore" > 404 404 <ant dir="apps/jrobin/java/" target="jar" /> 405 405 <copy file="apps/jrobin/java/build/jrobin.jar" todir="build/" /> … … 1185 1185 1186 1186 <!-- see targets below for conditional copying --> 1187 <target name="preppkg-base" depends="build, preplicenses, prepConsoleDocs, prepthemeupdates, prepCertificates, prepRouterInfos, copyjetty, copytomcat-unlesspkg, copyjstl-unlesspkg, copystandard-unlesspkg ">1187 <target name="preppkg-base" depends="build, preplicenses, prepConsoleDocs, prepthemeupdates, prepCertificates, prepRouterInfos, copyjetty, copytomcat-unlesspkg, copyjstl-unlesspkg, copystandard-unlesspkg, truncatehistory"> 1188 1188 <!-- if updater200 was run previously, it left *.pack files in pkg-temp --> 1189 1189 <!-- Also remove deletelist.txt used for updater only --> … … 1219 1219 <copy file="installer/resources/hosts.txt" todir="pkg-temp/" /> 1220 1220 <copy file="INSTALL-headless.txt" todir="pkg-temp/" /> 1221 <!-- overwrite the truncated history put in by the updater -->1222 <copy file="history.txt" todir="pkg-temp/" overwrite="true" />1223 1221 <mkdir dir="pkg-temp/scripts" /> 1224 1222 <copy file="apps/proxyscript/i2pProxy.pac" todir="pkg-temp/scripts/" /> … … 1507 1505 </target> 1508 1506 1509 <target name="prepupdate" depends="build2, prepupdateSmall, prepConsoleDocUpdates, prepCertificates, prep-script-translation ">1507 <target name="prepupdate" depends="build2, prepupdateSmall, prepConsoleDocUpdates, prepCertificates, prep-script-translation, truncatehistory"> 1510 1508 <copy file="build/BOB.jar" todir="pkg-temp/lib/" /> 1511 1509 <copy file="build/sam.jar" todir="pkg-temp/lib/" /> … … 1524 1522 --> 1525 1523 <copy file="build/i2psnark.war" todir="pkg-temp/webapps/" /> 1524 <copy file="installer/resources/deletelist.txt" todir="pkg-temp/" /> 1525 <copy file="installer/resources/blocklist.txt" todir="pkg-temp/" /> 1526 <copy todir="pkg-temp/man/"> 1527 <fileset dir="installer/resources/man/" /> 1528 </copy> 1529 </target> 1530 1531 <target name="truncatehistory"> 1526 1532 <copy file="history.txt" todir="pkg-temp/" /> 1527 1533 <!-- the following overwrites history.txt on unix to shrink the update file --> … … 1531 1537 </filterchain> 1532 1538 </copy> 1533 <concat append="true" destfile="pkg-temp/history.txt"> ---------------- EARLIER HISTORY IS AVAILABLE IN THE SOURCE PACKAGE"</concat> 1534 <copy file="installer/resources/deletelist.txt" todir="pkg-temp/" /> 1535 <copy file="installer/resources/blocklist.txt" todir="pkg-temp/" /> 1536 <copy todir="pkg-temp/man/"> 1537 <fileset dir="installer/resources/man/" /> 1538 </copy> 1539 <concat append="true" destfile="pkg-temp/history.txt"> ---------------- EARLIER HISTORY IS AVAILABLE IN THE SOURCE PACKAGE</concat> 1539 1540 </target> 1540 1541
Note: See TracChangeset
for help on using the changeset viewer.