Changeset 7ae1483


Ignore:
Timestamp:
Apr 29, 2016 7:15:41 PM (4 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
9128c79
Parents:
c3f5c04
Message:

Fixes for building with libgetopt-java

Files:
8 edited

Legend:

Unmodified
Added
Removed
  • apps/i2psnark/java/build.xml

    rc3f5c04 r7ae1483  
    1717            <classpath>
    1818                <pathelement location="../../../core/java/build/obj" />
     19                <pathelement location="../../../core/java/build/gnu-getopt.jar" />
    1920                <pathelement location="../../ministreaming/java/build/obj" />
    2021                <pathelement location="../../jetty/jettylib/javax.servlet.jar" />
     
    4445            <classpath>
    4546                <pathelement location="../../../core/java/build/i2p.jar" />
     47                <!-- gnu-getopt.jar only present for debian builds -->
     48                <pathelement location="../../../core/java/build/gnu-getopt.jar" />
    4649                <pathelement location="../../ministreaming/java/build/mstreaming.jar" />
    4750                <pathelement location="../../jetty/jettylib/javax.servlet.jar" />
  • apps/i2ptunnel/java/build.xml

    rc3f5c04 r7ae1483  
    1717            <classpath>
    1818                <pathelement location="../../../core/java/build/obj" />
     19                <pathelement location="../../../core/java/build/gnu-getopt.jar" />
    1920                <pathelement location="../../ministreaming/java/build/obj" />
    2021            </classpath>
     
    3940            destdir="./build/obj"
    4041            includeAntRuntime="false"
    41             classpath="../../../core/java/build/i2p.jar:../../ministreaming/java/build/mstreaming.jar" >
     42            classpath="../../../core/java/build/i2p.jar:../../../core/java/build/gnu-getopt.jar:../../ministreaming/java/build/mstreaming.jar" >
    4243            <compilerarg line="${javac.compilerargs}" />
    4344        </javac>
  • apps/sam/java/build.xml

    rc3f5c04 r7ae1483  
    1717            <classpath>
    1818                <pathelement location="../../../core/java/build/obj" />
     19                <pathelement location="../../../core/java/build/gnu-getopt.jar" />
    1920                <pathelement location="../../ministreaming/java/build/obj" />
    2021            </classpath>
     
    3637            includeAntRuntime="false"
    3738            destdir="./build/obj"
    38             classpath="../../../core/java/build/i2p.jar:../../ministreaming/java/build/mstreaming.jar" >
     39            classpath="../../../core/java/build/i2p.jar:../../../core/java/build/gnu-getopt.jar:../../ministreaming/java/build/mstreaming.jar" >
    3940            <compilerarg line="${javac.compilerargs7}" />
    4041        </javac>
  • build.xml

    rc3f5c04 r7ae1483  
    12911291            <classpath>
    12921292                <pathelement location="build/i2p.jar" />
     1293                <pathelement location="core/java/build/gnu-getopt.jar" />
    12931294                <pathelement location="build/router.jar" />
    12941295                <pathelement location="build/tools.jar" />
  • core/java/build.xml

    rc3f5c04 r7ae1483  
    2626        <istrue value="${with-gettext-base}" />
    2727    </condition>
    28     <condition property="javac.classpath.mod1" value="/usr/share/java/libintl.jar:" else="" >
     28    <condition property="javac.classpath.mod1" value="build/libintl.jar:" else="" >
    2929        <istrue value="${with-gettext-base}" />
    3030    </condition>
     
    3333        <istrue value="${with-libgetopt-java}" />
    3434    </condition>
    35     <condition property="javac.classpath.mod2" value="/usr/share/java/gnu-getopt.jar:" else="" >
     35    <condition property="javac.classpath.mod2" value="build/gnu-getopt.jar:" else="" >
    3636        <istrue value="${with-libgetopt-java}" />
    3737    </condition>
  • debian/rules

    rc3f5c04 r7ae1483  
    142142        @# debian and ubuntu: everywhere
    143143        @/bin/echo -e "with-gettext-base=true" >> $(CURDIR)/override.properties
     144        @#mkdir -p $(CURDIR)/core/java/build
     145        ln -sf /usr/share/java/libintl.jar $(CURDIR)/core/java/build/libintl.jar
    144146
    145147        @# debian and ubuntu: everywhere
    146148        @/bin/echo -e "with-libgetopt-java=true" >> $(CURDIR)/override.properties
     149        @#mkdir -p $(CURDIR)/core/java/build
     150        ln -sf /usr/share/java/gnu-getopt.jar $(CURDIR)/core/java/build/gnu-getopt.jar
    147151
    148152        TZ=UTC JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8 ant preppkg-unix javadoc
  • installer/tools/java/build.xml

    rc3f5c04 r7ae1483  
    2727        <javac srcdir="./src" debug="true" source="${javac.version}" target="${javac.version}" deprecation="on"
    2828            includeAntRuntime="false"
    29             destdir="./build/obj" classpath="${javac.classpath}:../../../build/i2p.jar:../../../build/router.jar" >
     29            destdir="./build/obj" classpath="${javac.classpath}:../../../build/i2p.jar:../../../core/java/build/gnu-getopt.jar:../../../build/router.jar" >
    3030            <compilerarg line="${javac.compilerargs}" />
    3131        </javac>
  • router/java/build.xml

    rc3f5c04 r7ae1483  
    3939               debuglevel="lines,vars,source"
    4040               includeAntRuntime="false"
    41                destdir="./build/obj" classpath="../../core/java/build/obj:../../core/java/build/i2p.jar" >
     41               destdir="./build/obj" classpath="../../core/java/build/obj:../../core/java/build/i2p.jar:../../core/java/build/gnu-getopt.jar" >
    4242            <compilerarg line="${javac.compilerargs}" />
    4343        </javac>
Note: See TracChangeset for help on using the changeset viewer.