Changeset f2239ba


Ignore:
Timestamp:
Apr 29, 2016 4:39:16 PM (4 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
2e15488
Parents:
5067b000
Message:

Debian: Add runtime dependency on gettext-base,
link to /usr/share/java/libintl.java,
don't build GettextResource?.java

Files:
6 edited

Legend:

Unmodified
Added
Removed
  • build.properties

    r5067b000 rf2239ba  
    130130# Don't include jstl.jar, we will use libjstl1.1-java package
    131131#with-libjstl1.1-java=true
     132# Don't compile GettextResource.java, we will use libintl.jar from the gettext-base package
     133#with-gettext-base=true
  • build.xml

    r5067b000 rf2239ba  
    20272027            <fileset dir="../i2p-${Extended.Version}/Slackware" />
    20282028            <fileset dir="../i2p-${Extended.Version}/_MTN" />
     2029            <!-- gettext-base -->
     2030            <fileset dir="../i2p-${Extended.Version}/core/java/src/gnu/gettext" />
    20292031            <!-- systray4j -->
    20302032            <fileset dir="../i2p-${Extended.Version}/apps/systray/java/lib" />
     
    20952097            <fileset dir="../i2p-${Extended.Version}/Slackware" />
    20962098            <fileset dir="../i2p-${Extended.Version}/_MTN" />
     2099            <fileset dir="../i2p-${Extended.Version}/core/java/src/gnu/gettext" />
    20972100            <fileset dir="../i2p-${Extended.Version}/apps/systray/java/lib" />
    20982101            <file name="../i2p-${Extended.Version}/apps/systray/java/src/net/i2p/apps/systray/SysTrayImpl.java" />
  • core/java/build.xml

    r5067b000 rf2239ba  
    2222    <property name="javac.version" value="1.6" />
    2323
     24    <!-- fixups if we're using libintl.jar for GettextResource.java -->
     25    <condition property="source.exclude" value="src/gnu/gettext/GettextResource.java" else="" >
     26        <istrue value="${with-gettext-base}" />
     27    </condition>
     28    <condition property="javac.classpath.mod" value="/usr/share/java/libintl.jar ${javac.classpath}" else="${javac.classpath}" >
     29        <istrue value="${with-gettext-base}" />
     30    </condition>
     31
    2432    <target name="compile" depends="depend">
    2533        <mkdir dir="./build" />
     
    2836               debuglevel="lines,vars,source"
    2937               includeAntRuntime="false"
    30                destdir="./build/obj" classpath="${javac.classpath}" >
     38               excludes="${source.exclude}"
     39               destdir="./build/obj" classpath="${javac.classpath.mod}" >
    3140            <compilerarg line="${javac.compilerargs}" />
    3241        </javac>
     
    95104        <scalac srcdir="./test/scalatest" destdir="./build/obj_scala" deprecation="on" >
    96105            <classpath>
    97                 <pathelement location="${javac.classpath}" />
     106                <pathelement location="${javac.classpath.mod}" />
    98107                <pathelement location="${scala-library.jar}" />
    99108                <pathelement location="${scalatest.jar}" />
     
    116125               debuglevel="lines,vars,source"
    117126               includeAntRuntime="true"
     127               excludes="${source.exclude}"
    118128               destdir="./build/obj" >
    119129            <classpath>
    120                 <pathelement path="${javac.classpath}" />
     130                <pathelement path="${javac.classpath.mod}" />
    121131                <pathelement location="${hamcrest.home}/hamcrest-core.jar" />
    122132                <pathelement location="${hamcrest.home}/hamcrest-library.jar" />
     
    239249            <classpath>
    240250                <pathelement location="../../installer/resources/" />
    241                 <pathelement path="${javac.classpath}" />
     251                <pathelement path="${javac.classpath.mod}" />
    242252                <pathelement location="${hamcrest.home}/hamcrest-core.jar" />
    243253                <pathelement location="${hamcrest.home}/hamcrest-library.jar" />
  • debian/control

    r5067b000 rf2239ba  
    7676 libecj-java,
    7777 geoip-database,
     78 gettext-base,
    7879 libjetty8-java, libservlet3.0-java,
    7980 glassfish-javaee
  • debian/i2p-router.links

    r5067b000 rf2239ba  
    8080# ubuntu and debian: everywhere
    8181#usr/share/java/jstl1.1.jar usr/share/i2p/lib/jstl.jar
     82
     83
     84# comment out if not building with gettext-base
     85# ubuntu and debian: everywhere
     86usr/share/java/libintl.jar usr/share/i2p/lib/libintl.jar
  • debian/rules

    r5067b000 rf2239ba  
    140140        @#ln -sf /usr/share/java/jstl1.1.jar $(CURDIR)/apps/susidns/src/lib/jstl.jar
    141141
     142        @# debian and ubuntu: everywhere
     143        @/bin/echo -e "with-gettext-base=true" >> $(CURDIR)/override.properties
     144
    142145        TZ=UTC JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8 ant preppkg-unix javadoc
    143146        echo router.updateDisabled=true > $(I2P)/router.config
Note: See TracChangeset for help on using the changeset viewer.