Changeset e68182a
- Timestamp:
- Oct 10, 2018 12:30:34 PM (2 years ago)
- Branches:
- master
- Children:
- 2de36ee, 4887707
- Parents:
- 06914f9
- Files:
-
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
apps/i2psnark/java/build.xml
r06914f9 re68182a 26 26 </target> 27 27 28 <!-- only used if not set by a higher build.xml --> 28 29 <property name="javac.compilerargs" value="" /> 29 30 <property name="javac.version" value="1.7" /> 30 31 <property name="require.gettext" value="true" /> 32 <property name="manifest.classpath.name" value="Class-Path" /> 31 33 32 34 <condition property="no.bundle"> … … 80 82 <manifest> 81 83 <attribute name="Main-Class" value="org.klomp.snark.CommandLine" /> 82 <attribute name=" Class-Path" value="i2p.jar mstreaming.jar streaming.jar" />84 <attribute name="${manifest.classpath.name}" value="i2p.jar mstreaming.jar streaming.jar" /> 83 85 <attribute name="Implementation-Version" value="${full.version}" /> 84 86 <attribute name="Built-By" value="${build.built-by}" /> -
apps/i2ptunnel/java/build.xml
r06914f9 re68182a 31 31 <property name="javac.version" value="1.7" /> 32 32 <property name="require.gettext" value="true" /> 33 <property name="manifest.classpath.name" value="Class-Path" /> 33 34 34 35 <!-- Compile includes ui/ classes but not web/ classes here --> … … 84 85 <manifest> 85 86 <attribute name="Main-Class" value="net.i2p.i2ptunnel.I2PTunnel" /> 86 <attribute name=" Class-Path" value="i2p.jar mstreaming.jar" />87 <attribute name="${manifest.classpath.name}" value="i2p.jar mstreaming.jar" /> 87 88 <attribute name="Implementation-Version" value="${full.version}" /> 88 89 <attribute name="Built-By" value="${build.built-by}" /> … … 325 326 <pathelement location="../../jetty/jettylib/jasper-el.jar" /> 326 327 <pathelement location="../../jetty/jettylib/commons-el.jar" /> 328 <pathelement location="../../jetty/jettylib/jetty-xml.jar" /> 327 329 <pathelement location="../../jetty/jettylib/jetty-util.jar" /> 328 330 <pathelement location="${ant.home}/lib/ant.jar" /> … … 359 361 360 362 <pathelement location="../../jetty/jettylib/commons-el.jar" /> 363 <pathelement location="../../jetty/jettylib/jetty-xml.jar" /> 361 364 <pathelement location="../../jetty/jettylib/jetty-util.jar" /> 362 365 <pathelement location="build/i2ptunnel.jar" /> -
apps/jetty/build.xml
r06914f9 re68182a 26 26 <property name="javac.compilerargs" value="" /> 27 27 <property name="javac.version" value="1.7" /> 28 <property name="manifest.classpath.name" value="Class-Path" /> 28 29 29 30 <!-- everything we need is in the deployer package, except for tomcat-api.jar in the full package, … … 411 412 <attribute name="Base-Revision" value="${workspace.version}" /> 412 413 <!-- needed by JettyStart for pre-0.7.5 wrapper.config --> 413 <attribute name=" Class-Path" value="jetty-deploy.jar jetty-xml.jar" />414 <attribute name="${manifest.classpath.name}" value="jetty-deploy.jar jetty-xml.jar" /> 414 415 <attribute name="Workspace-Changes" value="${workspace.changes.tr}" /> 415 416 <attribute name="X-Compile-Source-JDK" value="${javac.version}" /> -
apps/jrobin/java/build.xml
r06914f9 re68182a 20 20 </target> 21 21 22 <!-- only used if not set by a higher build.xml --> 22 23 <property name="javac.compilerargs" value="" /> 23 24 <property name="javac.version" value="1.7" /> 25 <property name="manifest.classpath.name" value="Class-Path" /> 24 26 25 27 <target name="compile" depends="depend"> … … 61 63 <jar destfile="./build/jrobin.jar" basedir="./build/obj" includes="**/*.class"> 62 64 <manifest> 63 <attribute name=" Class-Path" value="i2p.jar" />65 <attribute name="${manifest.classpath.name}" value="i2p.jar" /> 64 66 <attribute name="Implementation-Version" value="1.6.0-1" /> 65 67 <attribute name="Built-By" value="${build.built-by}" /> -
apps/ministreaming/java/build.xml
r06914f9 re68182a 25 25 <property name="javac.version" value="1.7" /> 26 26 <property name="require.gettext" value="true" /> 27 <property name="manifest.classpath.name" value="Class-Path" /> 27 28 28 29 <condition property="no.bundle"> … … 77 78 <jar destfile="./build/mstreaming.jar" basedir="./build/obj" includes="**/*.class" > 78 79 <manifest> 79 <attribute name=" Class-Path" value="i2p.jar streaming.jar" />80 <attribute name="${manifest.classpath.name}" value="i2p.jar streaming.jar" /> 80 81 <attribute name="Specification-Title" value="I2P Streaming API" /> 81 82 <attribute name="Specification-Version" value="${release.number}" /> -
apps/routerconsole/java/build.xml
r06914f9 re68182a 47 47 </target> 48 48 49 <!-- only used if not set by a higher build.xml --> 49 50 <property name="javac.compilerargs" value="" /> 50 51 <property name="javac.version" value="1.7" /> 52 <property name="manifest.classpath.name" value="Class-Path" /> 51 53 52 54 <target name="compile" depends="prepare, depend, dependVersion"> … … 129 131 <!-- very old installs don't have i2psnark,jstl,standard in the classpath... not added in WebAppConfiguration any more --> 130 132 <!-- All new jetty 7 jars should have been in 0.9.6, added in 0.9.7 --> 131 <attribute name=" Class-Path" value="i2p.jar router.jar jrobin.jar desktopgui.jar i2psnark.jar jstl.jar standard.jar jstlel.jar jetty-continuation.jar jetty-http.jar jetty-io.jar jetty-security.jar jetty-servlet.jar jetty-servlets.jar jetty-util.jar jetty-webapp.jar" />133 <attribute name="${manifest.classpath.name}" value="i2p.jar router.jar jrobin.jar desktopgui.jar i2psnark.jar jstl.jar standard.jar jstlel.jar jetty-continuation.jar jetty-http.jar jetty-io.jar jetty-security.jar jetty-servlet.jar jetty-servlets.jar jetty-util.jar jetty-webapp.jar" /> 132 134 <attribute name="Implementation-Version" value="${full.version}" /> 133 135 <attribute name="Built-By" value="${build.built-by}" /> -
apps/sam/java/build.xml
r06914f9 re68182a 23 23 </target> 24 24 25 <!-- only used if not set by a higher build.xml --> 25 26 <property name="javac.compilerargs7" value="" /> 26 27 <property name="javac.version" value="1.7" /> 28 <property name="manifest.classpath.name" value="Class-Path" /> 27 29 28 30 <!-- compile everything including client classes --> … … 72 74 <manifest> 73 75 <attribute name="Main-Class" value="net.i2p.sam.SAMBridge" /> 74 <attribute name=" Class-Path" value="i2p.jar mstreaming.jar streaming.jar" />76 <attribute name="${manifest.classpath.name}" value="i2p.jar mstreaming.jar streaming.jar" /> 75 77 <attribute name="Implementation-Version" value="${full.version}" /> 76 78 <attribute name="Built-By" value="${build.built-by}" /> -
build.properties
r06914f9 re68182a 171 171 # Ubuntu: Only in wily and later 172 172 #with-libhttpclient-java=true 173 174 ### Redhat packages ### 175 # uncomment to prevent classpaths in jar manifests 176 # https://fedoraproject.org/wiki/Packaging:Java 177 # without-manifest-classpath=true -
build.xml
r06914f9 re68182a 444 444 </target> 445 445 446 <target name="buildProperties" depends="getMtnRev, getReleaseNumber, getBuildNumber, setBuildTimestamp " >446 <target name="buildProperties" depends="getMtnRev, getReleaseNumber, getBuildNumber, setBuildTimestamp, disableManifestClasspath" > 447 447 <!-- default if not set above --> 448 448 <property name="workspace.version" value="unknown" /> 449 449 <!-- default if not set by setBuildTimestamp --> 450 450 <property name="build.timestamp" value="reproducible" /> 451 <!-- default if not set by disableManifestClasspath --> 452 <property name="manifest.classpath.name" value="Class-Path" /> 451 453 <property name="full.version" value="${release.number}-${i2p.build.number}${build.extra}" /> 452 454 <echo message="Building version ${full.version} (mtn rev ${workspace.version})" /> … … 457 459 <format property="build.timestamp" pattern="yyyy-MM-dd HH:mm:ss z" timezone="UTC" locale="en" /> 458 460 </tstamp> 461 </target> 462 463 <!-- Disable Class-Path in jar manifests by renaming it (Fedora) --> 464 <target name="disableManifestClasspath" if="${without-manifest-classpath}" > 465 <property name="manifest.classpath.name" value="Disabled-Class-Path" /> 459 466 </target> 460 467 -
core/java/build.xml
r06914f9 re68182a 21 21 <property name="javac.classpath" value="" /> 22 22 <property name="javac.version" value="1.7" /> 23 <property name="manifest.classpath.name" value="Class-Path" /> 23 24 24 25 <!-- fixups if we're using libintl.jar for GettextResource.java --> … … 97 98 <fileset dir="src" includes="${translation.includes}" /> 98 99 <manifest> 99 <attribute name=" Class-Path" value="${gettext.jar} ${getopt.jar} ${httpclient.jar}" />100 <attribute name="${manifest.classpath.name}" value="${gettext.jar} ${getopt.jar} ${httpclient.jar}" /> 100 101 <attribute name="Specification-Title" value="I2P Core API" /> 101 102 <attribute name="Specification-Version" value="${release.number}" /> -
router/java/build.xml
r06914f9 re68182a 35 35 <property name="javac.compilerargs" value="" /> 36 36 <property name="javac.version" value="1.7" /> 37 <property name="manifest.classpath.name" value="Class-Path" /> 37 38 38 39 <target name="compile" depends="depend, dependVersion"> … … 67 68 <manifest> 68 69 <!-- so people with very old wrapper.config files will still work with Jetty 6 --> 69 <attribute name=" Class-Path" value="i2p.jar addressbook.jar jetty-i2p.jar jetty-rewrite-handler.jar jetty-start.jar jetty-util.jar" />70 <attribute name="${manifest.classpath.name}" value="i2p.jar addressbook.jar jetty-i2p.jar jetty-rewrite-handler.jar jetty-start.jar jetty-util.jar" /> 70 71 <attribute name="Specification-Title" value="I2P Router" /> 71 72 <attribute name="Specification-Version" value="${release.number}" />
Note: See TracChangeset
for help on using the changeset viewer.