- Timestamp:
- Jun 10, 2011 2:53:59 PM (10 years ago)
- Branches:
- master
- Children:
- 4e99c45
- Parents:
- cbaa62d (diff), 162c5bc (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
rcbaa62d r2c0e6a3 160 160 </target> 161 161 162 <target name="buildProperties" > 162 <target name="checkForMtn" > 163 <available property="mtn.available" file="_MTN" type="dir" /> 164 </target> 165 166 <target name="getMtnRev" depends="checkForMtn" if="mtn.available" > 163 167 <exec executable="mtn" outputproperty="workspace.version" errorproperty="mtn.error1" failifexecutionfails="false" > 164 168 <arg value="automate" /> 165 169 <arg value="get_base_revision_id" /> 166 170 </exec> 171 </target> 172 173 <target name="buildProperties" depends="getMtnRev" > 174 <!-- default if not set above --> 175 <property name="workspace.version" value="unknown" /> 167 176 <tstamp> 168 177 <format property="build.timestamp" pattern="yyyy-MM-dd HH:mm:ss z" timezone="UTC" locale="en" /> … … 241 250 </target> 242 251 243 <target name="jbigi"> 252 <target name="jbigi-list-changes" depends="checkForMtn" if="mtn.available" > 253 <exec executable="mtn" outputproperty="workspace.changes.jbigi" errorproperty="mtn.error.jbigi" failifexecutionfails="false" > 254 <arg value="list" /> 255 <arg value="changed" /> 256 <arg value="installer/lib/jbigi" /> 257 </exec> 258 <!-- \n in an attribute value generates an invalid manifest --> 259 <exec executable="tr" inputstring="${workspace.changes.jbigi}" outputproperty="workspace.changes.jbigi.tr" errorproperty="mtn.error2" failifexecutionfails="false" > 260 <arg value="-s" /> 261 <arg value="[:space:]" /> 262 <arg value="," /> 263 </exec> 264 </target> 265 266 <target name="jbigi" depends="buildProperties, jbigi-list-changes" > 267 <!-- set if unset --> 268 <property name="workspace.changes.jbigi.tr" value="" /> 244 269 <jar destfile="build/jbigi.jar" whenmanifestonly="fail" > 245 270 <fileset dir="installer/lib/jbigi" includes="*.so *.dll *.jnilib" /> 271 <manifest> 272 <attribute name="Build-Date" value="${build.timestamp}" /> 273 <attribute name="Base-Revision" value="${workspace.version}" /> 274 <attribute name="Workspace-Changes" value="${workspace.changes.jbigi.tr}" /> 275 </manifest> 246 276 </jar> 247 277 </target> 248 278 249 <target name="jbigi-windows-only" > 279 <target name="jbigi-windows-only" depends="buildProperties, jbigi-list-changes" > 280 <!-- set if unset --> 281 <property name="workspace.changes.jbigi.tr" value="" /> 250 282 <jar destfile="build/jbigi.jar" whenmanifestonly="fail" > 251 283 <fileset dir="installer/lib/jbigi" includes="*windows*.dll" /> 284 <manifest> 285 <attribute name="Build-Date" value="${build.timestamp}" /> 286 <attribute name="Base-Revision" value="${workspace.version}" /> 287 <attribute name="Workspace-Changes" value="${workspace.changes.jbigi.tr}" /> 288 </manifest> 252 289 </jar> 253 290 </target> 254 291 255 <target name="jbigi-linux-only"> 292 <target name="jbigi-linux-only" depends="buildProperties, jbigi-list-changes" > 293 <!-- set if unset --> 294 <property name="workspace.changes.jbigi.tr" value="" /> 256 295 <jar destfile="build/jbigi.jar" whenmanifestonly="fail" > 257 296 <fileset dir="installer/lib/jbigi" includes="*linux*.so" /> 297 <manifest> 298 <attribute name="Build-Date" value="${build.timestamp}" /> 299 <attribute name="Base-Revision" value="${workspace.version}" /> 300 <attribute name="Workspace-Changes" value="${workspace.changes.jbigi.tr}" /> 301 </manifest> 258 302 </jar> 259 303 </target> … … 338 382 <pathelement location="apps/systray/java/lib/systray4j.jar" /> 339 383 <pathelement location="apps/jrobin/jrobin-1.5.9.1.jar" /> 340 <pathelement location="installer/lib/wrapper/ win32/wrapper.jar" />384 <pathelement location="installer/lib/wrapper/all/wrapper.jar" /> 341 385 <pathelement location="core/lib/junit.jar" /> 342 386 </classpath> … … 353 397 <delete file="i2psnark-standalone.zip" failonerror="false" quiet="true" /> 354 398 <delete file="BOB-one.jar" failonerror="false" quiet="true" /> 399 <delete dir="core/c/jbigi/bin" /> 400 <delete dir="core/c/jbigi/lib" /> 401 <delete dir="core/c/jcpuid/lib" /> 355 402 <delete dir="debian/tmp" /> 356 403 <delete dir="debian/db" /> … … 435 482 <fileset dir="installer/lib/wrapper/freebsd/" /> 436 483 </copy> 484 <copy todir="pkg-temp/lib/wrapper/freebsd64/"> 485 <fileset dir="installer/lib/wrapper/freebsd64" /> 486 </copy> 437 487 <copy todir="pkg-temp/lib/wrapper/macosx/"> 438 488 <fileset dir="installer/lib/wrapper/macosx/" /> … … 452 502 <copy file="installer/resources/fixperms.bat" todir="pkg-temp/" /> 453 503 <copy file="installer/resources/install_i2p_service_winnt.bat" todir="pkg-temp/" /> 454 <copy file="installer/resources/postinstall.bat" todir="pkg-temp/" />455 504 <copy file="installer/resources/set_config_dir_for_nt_service.bat" todir="pkg-temp/" /> 456 505 <copy file="installer/resources/uninstall_i2p_service_winnt.bat" todir="pkg-temp/" /> 506 <copy file="installer/lib/wrapper/all/wrapper.jar" todir="pkg-temp/lib" /> 457 507 <copy todir="pkg-temp/lib/wrapper/win32/"> 458 508 <fileset dir="installer/lib/wrapper/win32/" /> 509 </copy> 510 <copy todir="pkg-temp/lib/wrapper/win64/"> 511 <fileset dir="installer/lib/wrapper/win64/" /> 459 512 </copy> 460 513 </target> … … 463 516 <target name="preppkg-linux-only" depends="preppkg-linux, jbigi-linux-only" > 464 517 <copy file="build/jbigi.jar" todir="pkg-temp/lib" /> 518 <copy file="installer/lib/wrapper/all/wrapper.jar" todir="pkg-temp/lib" /> 465 519 </target> 466 520 467 521 <target name="preppkg-linux" depends="preppkg-base"> 468 522 <copy file="installer/resources/runplain.sh" todir="pkg-temp/" /> 469 <copy file="apps/i2psnark/launch-i2psnark" todir="pkg-temp/" />523 <!-- <copy file="apps/i2psnark/launch-i2psnark" todir="pkg-temp/" /> old feature that per zzz isn't used--> 470 524 <copy file="installer/resources/eepget" todir="pkg-temp/" /> 471 525 <copy file="installer/resources/i2prouter" todir="pkg-temp/" /> … … 747 801 <copy file="build/org.mortbay.jetty.jar" todir="pkg-temp/lib/" /> 748 802 </target> 749 <target name="installer" depends="preppkg, buildProperties"> 750 <taskdef name="izpack" classpath="${basedir}/installer/lib/izpack/standalone-compiler.jar" classname="com.izforge.izpack.ant.IzPackTask" /> 751 <mkdir dir="pkg-temp/installer" /> 803 804 <target name="util-list-changes" depends="checkForMtn" if="mtn.available" > 752 805 <exec executable="mtn" outputproperty="workspace.changes.util" errorproperty="mtn.error.util" failifexecutionfails="false" > 753 806 <arg value="list" /> … … 761 814 <arg value="," /> 762 815 </exec> 816 </target> 817 818 <target name="installer" depends="preppkg, buildProperties, util-list-changes" > 819 <taskdef name="izpack" classpath="${basedir}/installer/lib/izpack/standalone-compiler.jar" classname="com.izforge.izpack.ant.IzPackTask" /> 820 <mkdir dir="pkg-temp/installer" /> 821 <!-- set if unset --> 822 <property name="workspace.changes.util.tr" value="" /> 763 823 <jar destfile="./pkg-temp/installer/copy.jar" basedir="./core/java/build/obj" includes="net/i2p/util/Copy.class net/i2p/util/FileUtil.class"> 764 824 <manifest> … … 874 934 <arg value="i2p.fba"/> 875 935 <arg value="-auxclasspath"/> 876 <arg value="build/commons-el.jar:build/commons-logging.jar:build/jasper-compiler.jar:build/jasper-runtime.jar:build/javax.servlet.jar:build/org.mortbay.jetty.jar:apps/jrobin/jrobin-1.5.9.1.jar:apps/systray/java/lib/systray4j.jar:installer/lib/wrapper/ linux/wrapper.jar:apps/susidns/src/WEB-INF/lib/standard.jar:apps/susidns/src/WEB-INF/lib/jstl.jar:apps/jrobin/jrobin-1.5.9.1.jar"/>936 <arg value="build/commons-el.jar:build/commons-logging.jar:build/jasper-compiler.jar:build/jasper-runtime.jar:build/javax.servlet.jar:build/org.mortbay.jetty.jar:apps/jrobin/jrobin-1.5.9.1.jar:apps/systray/java/lib/systray4j.jar:installer/lib/wrapper/all/wrapper.jar:apps/susidns/src/WEB-INF/lib/standard.jar:apps/susidns/src/WEB-INF/lib/jstl.jar:apps/jrobin/jrobin-1.5.9.1.jar"/> 877 937 <arg value="-sourcepath"/> 878 938 <arg value="apps/BOB/src/:apps/addressbook/java/src/:apps/i2psnark/java/src/:apps/i2ptunnel/java/src/:apps/ministreaming/java/src/:apps/routerconsole/java/src/:apps/sam/java/src/:apps/streaming/java/src/:apps/susidns/src/java/src/:apps/susimail/src/src/:apps/systray/java/src/:core/java/src/:router/java/src/"/> … … 1180 1240 <!--wrapper - dont even think about it. i2p cosumes appreantly more mem without it on win32--> 1181 1241 <copy file="installer/lib/wrapper/win32/wrapper.dll" todir="pkg-temp/lib" /> 1182 <copy file="installer/lib/wrapper/ win32/wrapper.jar" todir="pkg-temp/lib" />1242 <copy file="installer/lib/wrapper/all/wrapper.jar" todir="pkg-temp/lib" /> 1183 1243 <copy file="installer/lib/wrapper/win32/I2Psvc.exe" tofile="pkg-temp/i2psvc.ex_" /> 1184 1244 <!-- copy the unpack/start batchfiles -->
Note: See TracChangeset
for help on using the changeset viewer.