Changeset d263e42


Ignore:
Timestamp:
Nov 19, 2018 2:58:20 PM (2 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
97e7a98
Parents:
54184f2
Message:

Debian: Add libjson-simple-java dependency

Files:
21 edited

Legend:

Unmodified
Added
Removed

  • LICENSE.txt

    r54184f2 rd263e42  
    8787   See licenses/LICENSE-Apache2.0.txt
    8888
    89    json-smart-v1 1.3.1+
    90    Copyright 2011 JSON-SMART authors
     89   json-simple 1.1.1
    9190   See licenses/LICENSE-Apache2.0.txt
    9291

  • apps/routerconsole/java/build.xml

    r54184f2 rd263e42  
    8282                <!-- following jars only present for debian builds -->
    8383                <pathelement location="../../jetty/jettylib/tomcat-api.jar" />
     84                <pathelement location="../../../core/java/build/json-simple.jar" />
    8485            </classpath>
    8586        </javac>

  • build.properties

    r54184f2 rd263e42  
    165165# Don't bundle flags, we will use famfamfam-flag-png package
    166166#with-famfamfam-flag-png=true
     167# Don't include json-simple library, we will use libjson-simple-java package
     168#with-libjson-simple-java=true
    167169# Don't compile org.apache.http classes, we will use libhttpclient-java and libhttpcore-java packages
    168170# 2 MB of dependencies vs. 20 KB of copied source

  • build.xml

    r54184f2 rd263e42  
    826826            doctitle="I2P Javadocs for Release ${release.number} Build ${i2p.build.number}${build.extra}"
    827827            windowtitle="I2P Anonymous Network - Java Documentation - Version ${release.number}">
    828             <group title="Core SDK (i2p.jar)" packages="net.i2p:net.i2p.*:net.i2p.client:net.i2p.client.*:net.i2p.internal:net.i2p.internal.*:freenet.support.CPUInformation:org.bouncycastle.oldcrypto:org.bouncycastle.oldcrypto.*:gnu.crypto.*:gnu.getopt:gnu.gettext:com.nettgryppa.security:org.apache.http.conn.ssl:org.apache.http.conn.util:org.apache.http.util:net.minidev.json:net.minidev.json.*" />
     828            <group title="Core SDK (i2p.jar)" packages="net.i2p:net.i2p.*:net.i2p.client:net.i2p.client.*:net.i2p.internal:net.i2p.internal.*:freenet.support.CPUInformation:org.bouncycastle.oldcrypto:org.bouncycastle.oldcrypto.*:gnu.crypto.*:gnu.getopt:gnu.gettext:com.nettgryppa.security:org.apache.http.conn.ssl:org.apache.http.conn.util:org.apache.http.util:org.json.simple:org.json.simple.*" />
    829829            <group title="Streaming Library" packages="net.i2p.client.streaming:net.i2p.client.streaming.impl" />
    830830            <group title="Router" packages="net.i2p.router:net.i2p.router.*:net.i2p.data.i2np:net.i2p.data.router:org.cybergarage:org.cybergarage.*:org.freenetproject:org.xlattice.crypto.filters:com.maxmind.geoip:com.southernstorm.noise.*" />
    … …  
    889889                <pathelement location="core/java/build/libintl.jar" />
    890890                <pathelement location="core/java/build/gnu-getopt.jar" />
     891                <pathelement location="core/java/build/json-simple.jar" />
    891892            </classpath>
    892893            <!-- These variables are stored in build.properties.
    … …  
    24582459            <!-- libgetopt-java -->
    24592460            <fileset dir="../i2p-${Extended.Version}/core/java/src/gnu/getopt" />
     2461            <!-- libjson-simple-java -->
     2462            <fileset dir="../i2p-${Extended.Version}/core/java/src/org/json" />
    24602463            <!-- libhttpclient-java and libhttpcore-java -->
    24612464          <!--
    … …  
    26232626            <fileset dir="../i2p-${Extended.Version}/core/java/src/gnu/gettext" />
    26242627            <fileset dir="../i2p-${Extended.Version}/core/java/src/gnu/getopt" />
     2628            <fileset dir="../i2p-${Extended.Version}/core/java/src/org/json" />
    26252629          <!--
    26262630            <fileset dir="../i2p-${Extended.Version}/core/java/src/org/apache/http" />
    … …  
    26962700            <fileset dir="../i2p-${Extended.Version}/core/java/src/gnu/gettext" />
    26972701            <fileset dir="../i2p-${Extended.Version}/core/java/src/gnu/getopt" />
     2702            <fileset dir="../i2p-${Extended.Version}/core/java/src/org/json" />
    26982703          <!--
    26992704            <fileset dir="../i2p-${Extended.Version}/core/java/src/org/apache/http" />

  • core/java/build.xml

    r54184f2 rd263e42  
    4747        <istrue value="${with-libhttpclient-java}" />
    4848    </condition>
    49     <property name="javac.classpath.mod" value="${javac.classpath.mod1}${javac.classpath.mod2}${javac.classpath.mod3}${javac.classpath}" />
     49    <!-- fixups if we're using json-simple.jar for org.json.simple classes -->
     50    <condition property="source.exclude4" value="org/json/simple/**" else="NOTHING" >
     51        <istrue value="${with-libjson-simple-java}" />
     52    </condition>
     53    <condition property="javac.classpath.mod4" value="build/json-simple.jar:" else="" >
     54        <istrue value="${with-libjson-simple-java}" />
     55    </condition>
     56    <property name="javac.classpath.mod" value="${javac.classpath.mod1}${javac.classpath.mod2}${javac.classpath.mod3}${javac.classpath.mod4}${javac.classpath}" />
    5057
    5158    <!-- jar classpath fixups -->
    … …  
    5865    <condition property="httpclient.jar" value="/usr/share/java/httpclient.jar /usr/share/java/httpcore.jar" else="" >
    5966        <istrue value="${with-libhttpclient-java}" />
     67    </condition>
     68    <condition property="json-simple.jar" value="/usr/share/java/json-simple.jar" else="" >
     69        <istrue value="${with-libjson-simple-java}" />
    6070    </condition>
    6171
    … …  
    7383            <exclude name="${source.exclude2}" />
    7484            <exclude name="${source.exclude3}" />
     85            <exclude name="${source.exclude4}" />
    7586        </javac>
    7687    </target>

  • debian-alt/bionic/rules

    r54184f2 rd263e42  
    155155        ln -sf /usr/share/java/gnu-getopt.jar $(CURDIR)/core/java/build/gnu-getopt.jar
    156156
     157        @# debian: jessie+; ubuntu: trusty+
     158        @/bin/echo -e "with-libjson-simple-java=true" >> $(CURDIR)/override.properties
     159        @mkdir -p $(CURDIR)/core/java/build
     160        ln -sf /usr/share/java/json-simple.jar $(CURDIR)/core/java/build/json-simple.jar
     161
    157162        @# debian: everywhere; ubuntu: trusty+
    158163        @/bin/echo -e "with-famfamfam-flag-png=true" >> $(CURDIR)/override.properties

  • debian-alt/buster/control

    r54184f2 rd263e42  
    1818 ,gettext
    1919 ,libgetopt-java
     20 ,libjson-simple-java (< 3)
    2021 ,libgmp-dev (>= 2:5.0.5)
    2122 ,libservice-wrapper-java
    … …  
    7980 gettext-base,
    8081 libgetopt-java,
     82 libjson-simple-java (< 3),
    8183 libjetty9-java,
    8284 libtaglibs-standard-jstlel-java,

  • debian-alt/buster/rules

    r54184f2 rd263e42  
    155155        ln -sf /usr/share/java/gnu-getopt.jar $(CURDIR)/core/java/build/gnu-getopt.jar
    156156
     157        @# debian: jessie+; ubuntu: trusty+
     158        @/bin/echo -e "with-libjson-simple-java=true" >> $(CURDIR)/override.properties
     159        @mkdir -p $(CURDIR)/core/java/build
     160        ln -sf /usr/share/java/json-simple.jar $(CURDIR)/core/java/build/json-simple.jar
     161
    157162        @# debian: everywhere; ubuntu: trusty+
    158163        @/bin/echo -e "with-famfamfam-flag-png=true" >> $(CURDIR)/override.properties

  • debian-alt/doc/dependencies.txt

    r54184f2 rd263e42  
    99instructions are at https://geti2p.net/debian
    1010
    11 This document is current as of release 0.9.37, 2018-10-04.
     11This document is current as of release 0.9.38, 2018-01-xx.
    1212
    1313
    … …  
    4646  For /usr/share/java/gnu-getopt.jar.
    4747  In non-Debian builds we bundle the source code; it's removed in the Debian source package.
     48
     49* libjson-simple-java (jessie and later, trusty and later only)
     50  For /usr/share/java/json-simple.jar.
     51  In non-Debian builds we bundle the 1.1.1 source code; it's removed in the Debian source package.
     52  Compatible with 1.x and 2.x only; not compatible with 3.x.
    4853
    4954* libjetty9-java

  • debian-alt/jessie/control

    r54184f2 rd263e42  
    1717 ,gettext
    1818 ,libgetopt-java
     19 ,libjson-simple-java (< 3)
    1920 ,libgmp-dev (>= 2:5.0.2)
    2021 ,libservice-wrapper-java
    … …  
    7980 geoip-database,
    8081 gettext-base,
     82 libjson-simple-java (< 3),
    8183 libgetopt-java,
    8284 famfamfam-flag-png

  • debian-alt/jessie/i2p-router.links

    r54184f2 rd263e42  
    7777
    7878
     79# comment out if not building with libjson-simple-java
     80# ubuntu: trusty+; debian: jessie+
     81usr/share/java/json-simple.jar usr/share/i2p/lib/json-simple.jar
     82
     83
    7984# comment out if not building with famfamfam-flag-png
    8085# ubuntu: trusty+

  • debian-alt/jessie/rules

    r54184f2 rd263e42  
    144144        ln -sf /usr/share/java/gnu-getopt.jar $(CURDIR)/core/java/build/gnu-getopt.jar
    145145
     146        @# debian: jessie+; ubuntu: trusty+
     147        @/bin/echo -e "with-libjson-simple-java=true" >> $(CURDIR)/override.properties
     148        @mkdir -p $(CURDIR)/core/java/build
     149        ln -sf /usr/share/java/json-simple.jar $(CURDIR)/core/java/build/json-simple.jar
     150
    146151        @# debian: everywhere; ubuntu: trusty+
    147152        @/bin/echo -e "with-famfamfam-flag-png=true" >> $(CURDIR)/override.properties

  • debian-alt/trusty/control

    r54184f2 rd263e42  
    1919 ,gettext
    2020 ,libgetopt-java
     21 ,libjson-simple-java (< 3)
    2122 ,libgmp-dev (>= 2:5.0.2)
    2223 ,libservice-wrapper-java
    … …  
    8182 gettext-base,
    8283 libgetopt-java,
     84 libjson-simple-java (< 3),
    8385 glassfish-javaee,
    8486 famfamfam-flag-png

  • debian-alt/trusty/i2p-router.links

    r54184f2 rd263e42  
    7777
    7878
     79# comment out if not building with libjson-simple-java
     80# ubuntu: trusty+; debian: jessie+
     81usr/share/java/json-simple.jar usr/share/i2p/lib/json-simple.jar
     82
     83
    7984# comment out if not building with famfamfam-flag-png
    8085# ubuntu: trusty+

  • debian-alt/trusty/rules

    r54184f2 rd263e42  
    144144        ln -sf /usr/share/java/gnu-getopt.jar $(CURDIR)/core/java/build/gnu-getopt.jar
    145145
     146        @# debian: jessie+; ubuntu: trusty+
     147        @/bin/echo -e "with-libjson-simple-java=true" >> $(CURDIR)/override.properties
     148        @mkdir -p $(CURDIR)/core/java/build
     149        ln -sf /usr/share/java/json-simple.jar $(CURDIR)/core/java/build/json-simple.jar
     150
    146151        @# debian: everywhere; ubuntu: trusty+
    147152        @/bin/echo -e "with-famfamfam-flag-png=true" >> $(CURDIR)/override.properties

  • debian-alt/xenial/control

    r54184f2 rd263e42  
    1818 ,gettext
    1919 ,libgetopt-java
     20 ,libjson-simple-java (< 3);
    2021 ,libgmp-dev (>= 2:5.0.2)
    2122 ,libservice-wrapper-java
    … …  
    8384 gettext-base,
    8485 libgetopt-java,
     86 libjson-simple-java (< 3),
    8587 famfamfam-flag-png
    8688Replaces: i2p ( << 0.8.6-5)

  • debian-alt/xenial/i2p-router.links

    r54184f2 rd263e42  
    7777
    7878
     79# comment out if not building with libjson-simple-java
     80# ubuntu: trusty+; debian: jessie+
     81usr/share/java/json-simple.jar usr/share/i2p/lib/json-simple.jar
     82
     83
    7984# comment out if not building with famfamfam-flag-png
    8085# ubuntu: trusty+

  • debian-alt/xenial/rules

    r54184f2 rd263e42  
    143143        ln -sf /usr/share/java/gnu-getopt.jar $(CURDIR)/core/java/build/gnu-getopt.jar
    144144
     145        @# debian: jessie+; ubuntu: trusty+
     146        @/bin/echo -e "with-libjson-simple-java=true" >> $(CURDIR)/override.properties
     147        @mkdir -p $(CURDIR)/core/java/build
     148        ln -sf /usr/share/java/json-simple.jar $(CURDIR)/core/java/build/json-simple.jar
     149
    145150        @# debian: everywhere; ubuntu: trusty+
    146151        @/bin/echo -e "with-famfamfam-flag-png=true" >> $(CURDIR)/override.properties

  • debian/control

    r54184f2 rd263e42  
    1717 ,gettext
    1818 ,libgetopt-java
     19 ,libjson-simple-java (< 3)
    1920 ,libgmp-dev (>= 2:5.0.5)
    2021 ,libservice-wrapper-java
    … …  
    7879 gettext-base,
    7980 libgetopt-java,
     81 libjson-simple-java (< 3),
    8082 libjetty9-java,
    8183 libtaglibs-standard-jstlel-java,

  • debian/i2p-router.links

    r54184f2 rd263e42  
    8383
    8484
     85# comment out if not building with libjson-simple-java
     86# ubuntu: trusty+; debian: jessie+
     87usr/share/java/json-simple.jar usr/share/i2p/lib/json-simple.jar
     88
     89
    8590# comment out if not building with famfamfam-flag-png
    8691# ubuntu: trusty+

  • debian/rules

    r54184f2 rd263e42  
    153153        ln -sf /usr/share/java/gnu-getopt.jar $(CURDIR)/core/java/build/gnu-getopt.jar
    154154
     155        @# debian: jessie+; ubuntu: trusty+
     156        @/bin/echo -e "with-libjson-simple-java=true" >> $(CURDIR)/override.properties
     157        @mkdir -p $(CURDIR)/core/java/build
     158        ln -sf /usr/share/java/json-simple.jar $(CURDIR)/core/java/build/json-simple.jar
     159
    155160        @# debian: everywhere; ubuntu: trusty+
    156161        @/bin/echo -e "with-famfamfam-flag-png=true" >> $(CURDIR)/override.properties
Note: See TracChangeset for help on using the changeset viewer.