Changeset e68182a


Ignore:
Timestamp:
Oct 10, 2018 12:30:34 PM (2 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
2de36ee, 4887707
Parents:
06914f9
Message:

Build: Provide option to prevent Class-Path in manifests (ticket #2317)

Files:
11 edited

Legend:

Unmodified
Added
Removed

  • apps/i2psnark/java/build.xml

    r06914f9 re68182a  
    2626    </target>
    2727
     28    <!-- only used if not set by a higher build.xml -->
    2829    <property name="javac.compilerargs" value="" />
    2930    <property name="javac.version" value="1.7" />
    3031    <property name="require.gettext" value="true" />
     32    <property name="manifest.classpath.name" value="Class-Path" />
    3133
    3234    <condition property="no.bundle">
    … …  
    8082            <manifest>
    8183                <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" />
    8385                <attribute name="Implementation-Version" value="${full.version}" />
    8486                <attribute name="Built-By" value="${build.built-by}" />

  • apps/i2ptunnel/java/build.xml

    r06914f9 re68182a  
    3131    <property name="javac.version" value="1.7" />
    3232    <property name="require.gettext" value="true" />
     33    <property name="manifest.classpath.name" value="Class-Path" />
    3334
    3435    <!-- Compile includes ui/ classes but not web/ classes here -->
    … …  
    8485            <manifest>
    8586                <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" />
    8788                <attribute name="Implementation-Version" value="${full.version}" />
    8889                <attribute name="Built-By" value="${build.built-by}" />
    … …  
    325326                <pathelement location="../../jetty/jettylib/jasper-el.jar" />
    326327                <pathelement location="../../jetty/jettylib/commons-el.jar" />
     328                <pathelement location="../../jetty/jettylib/jetty-xml.jar" />
    327329                <pathelement location="../../jetty/jettylib/jetty-util.jar" />
    328330                <pathelement location="${ant.home}/lib/ant.jar" />
    … …  
    359361
    360362                <pathelement location="../../jetty/jettylib/commons-el.jar" />
     363                <pathelement location="../../jetty/jettylib/jetty-xml.jar" />
    361364                <pathelement location="../../jetty/jettylib/jetty-util.jar" />
    362365                <pathelement location="build/i2ptunnel.jar" />

  • apps/jetty/build.xml

    r06914f9 re68182a  
    2626    <property name="javac.compilerargs" value="" />
    2727    <property name="javac.version" value="1.7" />
     28    <property name="manifest.classpath.name" value="Class-Path" />
    2829
    2930    <!-- everything we need is in the deployer package, except for tomcat-api.jar in the full package,
    … …  
    411412                <attribute name="Base-Revision" value="${workspace.version}" />
    412413                <!-- 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" />
    414415                <attribute name="Workspace-Changes" value="${workspace.changes.tr}" />
    415416                <attribute name="X-Compile-Source-JDK" value="${javac.version}" />

  • apps/jrobin/java/build.xml

    r06914f9 re68182a  
    2020    </target>
    2121
     22    <!-- only used if not set by a higher build.xml -->
    2223    <property name="javac.compilerargs" value="" />
    2324    <property name="javac.version" value="1.7" />
     25    <property name="manifest.classpath.name" value="Class-Path" />
    2426
    2527    <target name="compile" depends="depend">
    … …  
    6163        <jar destfile="./build/jrobin.jar" basedir="./build/obj" includes="**/*.class">
    6264            <manifest>
    63                 <attribute name="Class-Path" value="i2p.jar" />
     65                <attribute name="${manifest.classpath.name}" value="i2p.jar" />
    6466                <attribute name="Implementation-Version" value="1.6.0-1" />
    6567                <attribute name="Built-By" value="${build.built-by}" />

  • apps/ministreaming/java/build.xml

    r06914f9 re68182a  
    2525    <property name="javac.version" value="1.7" />
    2626    <property name="require.gettext" value="true" />
     27    <property name="manifest.classpath.name" value="Class-Path" />
    2728
    2829    <condition property="no.bundle">
    … …  
    7778        <jar destfile="./build/mstreaming.jar" basedir="./build/obj" includes="**/*.class" >
    7879            <manifest>
    79                 <attribute name="Class-Path" value="i2p.jar streaming.jar" />
     80                <attribute name="${manifest.classpath.name}" value="i2p.jar streaming.jar" />
    8081                <attribute name="Specification-Title" value="I2P Streaming API" />
    8182                <attribute name="Specification-Version" value="${release.number}" />

  • apps/routerconsole/java/build.xml

    r06914f9 re68182a  
    4747    </target>
    4848
     49    <!-- only used if not set by a higher build.xml -->
    4950    <property name="javac.compilerargs" value="" />
    5051    <property name="javac.version" value="1.7" />
     52    <property name="manifest.classpath.name" value="Class-Path" />
    5153
    5254    <target name="compile" depends="prepare, depend, dependVersion">
    … …  
    129131                <!-- very old installs don't have i2psnark,jstl,standard in the classpath... not added in WebAppConfiguration any more -->
    130132                <!-- 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" />
    132134                <attribute name="Implementation-Version" value="${full.version}" />
    133135                <attribute name="Built-By" value="${build.built-by}" />

  • apps/sam/java/build.xml

    r06914f9 re68182a  
    2323    </target>
    2424
     25    <!-- only used if not set by a higher build.xml -->
    2526    <property name="javac.compilerargs7" value="" />
    2627    <property name="javac.version" value="1.7" />
     28    <property name="manifest.classpath.name" value="Class-Path" />
    2729
    2830    <!-- compile everything including client classes -->
    … …  
    7274            <manifest>
    7375                <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" />
    7577                <attribute name="Implementation-Version" value="${full.version}" />
    7678                <attribute name="Built-By" value="${build.built-by}" />

  • build.properties

    r06914f9 re68182a  
    171171# Ubuntu: Only in wily and later
    172172#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  
    444444    </target>
    445445
    446     <target name="buildProperties" depends="getMtnRev, getReleaseNumber, getBuildNumber, setBuildTimestamp" >
     446    <target name="buildProperties" depends="getMtnRev, getReleaseNumber, getBuildNumber, setBuildTimestamp, disableManifestClasspath" >
    447447        <!-- default if not set above -->
    448448        <property name="workspace.version" value="unknown" />
    449449        <!-- default if not set by setBuildTimestamp -->
    450450        <property name="build.timestamp" value="reproducible" />
     451        <!-- default if not set by disableManifestClasspath -->
     452        <property name="manifest.classpath.name" value="Class-Path" />
    451453        <property name="full.version" value="${release.number}-${i2p.build.number}${build.extra}" />
    452454        <echo message="Building version ${full.version} (mtn rev ${workspace.version})" />
    … …  
    457459            <format property="build.timestamp" pattern="yyyy-MM-dd HH:mm:ss z" timezone="UTC" locale="en" />
    458460        </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" />
    459466    </target>
    460467

  • core/java/build.xml

    r06914f9 re68182a  
    2121    <property name="javac.classpath" value="" />
    2222    <property name="javac.version" value="1.7" />
     23    <property name="manifest.classpath.name" value="Class-Path" />
    2324
    2425    <!-- fixups if we're using libintl.jar for GettextResource.java -->
    … …  
    9798            <fileset dir="src" includes="${translation.includes}" />
    9899            <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}" />
    100101                <attribute name="Specification-Title" value="I2P Core API" />
    101102                <attribute name="Specification-Version" value="${release.number}" />

  • router/java/build.xml

    r06914f9 re68182a  
    3535    <property name="javac.compilerargs" value="" />
    3636    <property name="javac.version" value="1.7" />
     37    <property name="manifest.classpath.name" value="Class-Path" />
    3738
    3839    <target name="compile" depends="depend, dependVersion">
    … …  
    6768            <manifest>
    6869                <!-- 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" />
    7071                <attribute name="Specification-Title" value="I2P Router" />
    7172                <attribute name="Specification-Version" value="${release.number}" />
Note: See TracChangeset for help on using the changeset viewer.