Changeset 2e15488


Ignore:
Timestamp:
Apr 29, 2016 6:40:02 PM (4 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
c3f5c04
Parents:
f2239ba
Message:

Debian: Add runtime dependency on libgetopt-java,
link to /usr/share/java/gnu-getopt.jar,
don't build gnu/getopt source

Files:
6 edited

Legend:

Unmodified
Added
Removed

  • build.properties

    rf2239ba r2e15488  
    132132# Don't compile GettextResource.java, we will use libintl.jar from the gettext-base package
    133133#with-gettext-base=true
     134# Don't compile gnu/getopt classes, we will use libgetopt-java package
     135#with-libgetopt-java=true

  • build.xml

    rf2239ba r2e15488  
    20292029            <!-- gettext-base -->
    20302030            <fileset dir="../i2p-${Extended.Version}/core/java/src/gnu/gettext" />
     2031            <!-- libgetopt-java -->
     2032            <fileset dir="../i2p-${Extended.Version}/core/java/src/gnu/geopt" />
    20312033            <!-- systray4j -->
    20322034            <fileset dir="../i2p-${Extended.Version}/apps/systray/java/lib" />
    … …  
    20982100            <fileset dir="../i2p-${Extended.Version}/_MTN" />
    20992101            <fileset dir="../i2p-${Extended.Version}/core/java/src/gnu/gettext" />
     2102            <fileset dir="../i2p-${Extended.Version}/core/java/src/gnu/geopt" />
    21002103            <fileset dir="../i2p-${Extended.Version}/apps/systray/java/lib" />
    21012104            <file name="../i2p-${Extended.Version}/apps/systray/java/src/net/i2p/apps/systray/SysTrayImpl.java" />

  • core/java/build.xml

    rf2239ba r2e15488  
    2323
    2424    <!-- fixups if we're using libintl.jar for GettextResource.java -->
    25     <condition property="source.exclude" value="src/gnu/gettext/GettextResource.java" else="" >
     25    <condition property="source.exclude1" value="gnu/gettext/GettextResource.java" else="NOTHING" >
    2626        <istrue value="${with-gettext-base}" />
    2727    </condition>
    28     <condition property="javac.classpath.mod" value="/usr/share/java/libintl.jar ${javac.classpath}" else="${javac.classpath}" >
     28    <condition property="javac.classpath.mod1" value="/usr/share/java/libintl.jar:" else="" >
    2929        <istrue value="${with-gettext-base}" />
    3030    </condition>
     31    <!-- fixups if we're using gnu-getopt.jar for gnu/getopt/* -->
     32    <condition property="source.exclude2" value="gnu/getopt/**" else="NOTHING" >
     33        <istrue value="${with-libgetopt-java}" />
     34    </condition>
     35    <condition property="javac.classpath.mod2" value="/usr/share/java/gnu-getopt.jar:" else="" >
     36        <istrue value="${with-libgetopt-java}" />
     37    </condition>
     38    <condition property="translation.includes" value="NOTHING" else="gnu/getopt/*.properties" >
     39        <istrue value="${with-libgetopt-java}" />
     40    </condition>
     41    <property name="javac.classpath.mod" value="${javac.classpath.mod1}${javac.classpath.mod2}${javac.classpath}" />
    3142
    3243    <target name="compile" depends="depend">
    3344        <mkdir dir="./build" />
    3445        <mkdir dir="./build/obj" />
    35         <javac srcdir="./src" debug="true" source="${javac.version}" target="${javac.version}" deprecation="on"
     46        <!-- sourcepath="" necessary for excludes to work, see ant manual for javac -->
     47        <javac sourcepath="" srcdir="./src" debug="true" source="${javac.version}" target="${javac.version}" deprecation="on"
    3648               debuglevel="lines,vars,source"
    3749               includeAntRuntime="false"
    38                excludes="${source.exclude}"
    3950               destdir="./build/obj" classpath="${javac.classpath.mod}" >
    4051            <compilerarg line="${javac.compilerargs}" />
     52            <include name="**/*.java" />
     53            <exclude name="${source.exclude1}" />
     54            <exclude name="${source.exclude2}" />
    4155        </javac>
    4256    </target>
    … …  
    6276            <fileset dir="./build/obj" includes="**/*.class" />
    6377            <!-- the getopt translation files -->
    64             <fileset dir="src" includes="gnu/getopt/*.properties" />
     78            <fileset dir="src" includes="${translation.includes}" />
    6579            <manifest>
    6680                <attribute name="Implementation-Version" value="${full.version}" />

  • debian/control

    rf2239ba r2e15488  
    1515 ,dh-apparmor
    1616 ,gettext
     17 ,libgetopt-java
    1718 ,libgmp-dev (>= 2:5.0.5)
    1819 ,libservice-wrapper-java
    … …  
    7778 geoip-database,
    7879 gettext-base,
     80 libgetopt-java,
    7981 libjetty8-java, libservlet3.0-java,
    8082 glassfish-javaee

  • debian/i2p-router.links

    rf2239ba r2e15488  
    8585# ubuntu and debian: everywhere
    8686usr/share/java/libintl.jar usr/share/i2p/lib/libintl.jar
     87
     88
     89# comment out if not building with libgetopt-java
     90# ubuntu and debian: everywhere
     91usr/share/java/gnu-getopt.jar usr/share/i2p/lib/gnu-getopt.jar

  • debian/rules

    rf2239ba r2e15488  
    143143        @/bin/echo -e "with-gettext-base=true" >> $(CURDIR)/override.properties
    144144
     145        @# debian and ubuntu: everywhere
     146        @/bin/echo -e "with-libgetopt-java=true" >> $(CURDIR)/override.properties
     147
    145148        TZ=UTC JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8 ant preppkg-unix javadoc
    146149        echo router.updateDisabled=true > $(I2P)/router.config
Note: See TracChangeset for help on using the changeset viewer.