Changeset d263e42
- Timestamp:
- Nov 19, 2018 2:58:20 PM (2 years ago)
- Branches:
- master
- Children:
- 97e7a98
- Parents:
- 54184f2
- Files:
-
- 21 edited
Legend:
- Unmodified
- Added
- Removed
-
LICENSE.txt
r54184f2 rd263e42 87 87 See licenses/LICENSE-Apache2.0.txt 88 88 89 json-smart-v1 1.3.1+ 90 Copyright 2011 JSON-SMART authors 89 json-simple 1.1.1 91 90 See licenses/LICENSE-Apache2.0.txt 92 91 -
apps/routerconsole/java/build.xml
r54184f2 rd263e42 82 82 <!-- following jars only present for debian builds --> 83 83 <pathelement location="../../jetty/jettylib/tomcat-api.jar" /> 84 <pathelement location="../../../core/java/build/json-simple.jar" /> 84 85 </classpath> 85 86 </javac> -
build.properties
r54184f2 rd263e42 165 165 # Don't bundle flags, we will use famfamfam-flag-png package 166 166 #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 167 169 # Don't compile org.apache.http classes, we will use libhttpclient-java and libhttpcore-java packages 168 170 # 2 MB of dependencies vs. 20 KB of copied source -
build.xml
r54184f2 rd263e42 826 826 doctitle="I2P Javadocs for Release ${release.number} Build ${i2p.build.number}${build.extra}" 827 827 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.*" /> 829 829 <group title="Streaming Library" packages="net.i2p.client.streaming:net.i2p.client.streaming.impl" /> 830 830 <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.*" /> … … 889 889 <pathelement location="core/java/build/libintl.jar" /> 890 890 <pathelement location="core/java/build/gnu-getopt.jar" /> 891 <pathelement location="core/java/build/json-simple.jar" /> 891 892 </classpath> 892 893 <!-- These variables are stored in build.properties. … … 2458 2459 <!-- libgetopt-java --> 2459 2460 <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" /> 2460 2463 <!-- libhttpclient-java and libhttpcore-java --> 2461 2464 <!-- … … 2623 2626 <fileset dir="../i2p-${Extended.Version}/core/java/src/gnu/gettext" /> 2624 2627 <fileset dir="../i2p-${Extended.Version}/core/java/src/gnu/getopt" /> 2628 <fileset dir="../i2p-${Extended.Version}/core/java/src/org/json" /> 2625 2629 <!-- 2626 2630 <fileset dir="../i2p-${Extended.Version}/core/java/src/org/apache/http" /> … … 2696 2700 <fileset dir="../i2p-${Extended.Version}/core/java/src/gnu/gettext" /> 2697 2701 <fileset dir="../i2p-${Extended.Version}/core/java/src/gnu/getopt" /> 2702 <fileset dir="../i2p-${Extended.Version}/core/java/src/org/json" /> 2698 2703 <!-- 2699 2704 <fileset dir="../i2p-${Extended.Version}/core/java/src/org/apache/http" /> -
core/java/build.xml
r54184f2 rd263e42 47 47 <istrue value="${with-libhttpclient-java}" /> 48 48 </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}" /> 50 57 51 58 <!-- jar classpath fixups --> … … 58 65 <condition property="httpclient.jar" value="/usr/share/java/httpclient.jar /usr/share/java/httpcore.jar" else="" > 59 66 <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}" /> 60 70 </condition> 61 71 … … 73 83 <exclude name="${source.exclude2}" /> 74 84 <exclude name="${source.exclude3}" /> 85 <exclude name="${source.exclude4}" /> 75 86 </javac> 76 87 </target> -
debian-alt/bionic/rules
r54184f2 rd263e42 155 155 ln -sf /usr/share/java/gnu-getopt.jar $(CURDIR)/core/java/build/gnu-getopt.jar 156 156 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 157 162 @# debian: everywhere; ubuntu: trusty+ 158 163 @/bin/echo -e "with-famfamfam-flag-png=true" >> $(CURDIR)/override.properties -
debian-alt/buster/control
r54184f2 rd263e42 18 18 ,gettext 19 19 ,libgetopt-java 20 ,libjson-simple-java (< 3) 20 21 ,libgmp-dev (>= 2:5.0.5) 21 22 ,libservice-wrapper-java … … 79 80 gettext-base, 80 81 libgetopt-java, 82 libjson-simple-java (< 3), 81 83 libjetty9-java, 82 84 libtaglibs-standard-jstlel-java, -
debian-alt/buster/rules
r54184f2 rd263e42 155 155 ln -sf /usr/share/java/gnu-getopt.jar $(CURDIR)/core/java/build/gnu-getopt.jar 156 156 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 157 162 @# debian: everywhere; ubuntu: trusty+ 158 163 @/bin/echo -e "with-famfamfam-flag-png=true" >> $(CURDIR)/override.properties -
debian-alt/doc/dependencies.txt
r54184f2 rd263e42 9 9 instructions are at https://geti2p.net/debian 10 10 11 This document is current as of release 0.9.3 7, 2018-10-04.11 This document is current as of release 0.9.38, 2018-01-xx. 12 12 13 13 … … 46 46 For /usr/share/java/gnu-getopt.jar. 47 47 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. 48 53 49 54 * libjetty9-java -
debian-alt/jessie/control
r54184f2 rd263e42 17 17 ,gettext 18 18 ,libgetopt-java 19 ,libjson-simple-java (< 3) 19 20 ,libgmp-dev (>= 2:5.0.2) 20 21 ,libservice-wrapper-java … … 79 80 geoip-database, 80 81 gettext-base, 82 libjson-simple-java (< 3), 81 83 libgetopt-java, 82 84 famfamfam-flag-png -
debian-alt/jessie/i2p-router.links
r54184f2 rd263e42 77 77 78 78 79 # comment out if not building with libjson-simple-java 80 # ubuntu: trusty+; debian: jessie+ 81 usr/share/java/json-simple.jar usr/share/i2p/lib/json-simple.jar 82 83 79 84 # comment out if not building with famfamfam-flag-png 80 85 # ubuntu: trusty+ -
debian-alt/jessie/rules
r54184f2 rd263e42 144 144 ln -sf /usr/share/java/gnu-getopt.jar $(CURDIR)/core/java/build/gnu-getopt.jar 145 145 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 146 151 @# debian: everywhere; ubuntu: trusty+ 147 152 @/bin/echo -e "with-famfamfam-flag-png=true" >> $(CURDIR)/override.properties -
debian-alt/trusty/control
r54184f2 rd263e42 19 19 ,gettext 20 20 ,libgetopt-java 21 ,libjson-simple-java (< 3) 21 22 ,libgmp-dev (>= 2:5.0.2) 22 23 ,libservice-wrapper-java … … 81 82 gettext-base, 82 83 libgetopt-java, 84 libjson-simple-java (< 3), 83 85 glassfish-javaee, 84 86 famfamfam-flag-png -
debian-alt/trusty/i2p-router.links
r54184f2 rd263e42 77 77 78 78 79 # comment out if not building with libjson-simple-java 80 # ubuntu: trusty+; debian: jessie+ 81 usr/share/java/json-simple.jar usr/share/i2p/lib/json-simple.jar 82 83 79 84 # comment out if not building with famfamfam-flag-png 80 85 # ubuntu: trusty+ -
debian-alt/trusty/rules
r54184f2 rd263e42 144 144 ln -sf /usr/share/java/gnu-getopt.jar $(CURDIR)/core/java/build/gnu-getopt.jar 145 145 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 146 151 @# debian: everywhere; ubuntu: trusty+ 147 152 @/bin/echo -e "with-famfamfam-flag-png=true" >> $(CURDIR)/override.properties -
debian-alt/xenial/control
r54184f2 rd263e42 18 18 ,gettext 19 19 ,libgetopt-java 20 ,libjson-simple-java (< 3); 20 21 ,libgmp-dev (>= 2:5.0.2) 21 22 ,libservice-wrapper-java … … 83 84 gettext-base, 84 85 libgetopt-java, 86 libjson-simple-java (< 3), 85 87 famfamfam-flag-png 86 88 Replaces: i2p ( << 0.8.6-5) -
debian-alt/xenial/i2p-router.links
r54184f2 rd263e42 77 77 78 78 79 # comment out if not building with libjson-simple-java 80 # ubuntu: trusty+; debian: jessie+ 81 usr/share/java/json-simple.jar usr/share/i2p/lib/json-simple.jar 82 83 79 84 # comment out if not building with famfamfam-flag-png 80 85 # ubuntu: trusty+ -
debian-alt/xenial/rules
r54184f2 rd263e42 143 143 ln -sf /usr/share/java/gnu-getopt.jar $(CURDIR)/core/java/build/gnu-getopt.jar 144 144 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 145 150 @# debian: everywhere; ubuntu: trusty+ 146 151 @/bin/echo -e "with-famfamfam-flag-png=true" >> $(CURDIR)/override.properties -
debian/control
r54184f2 rd263e42 17 17 ,gettext 18 18 ,libgetopt-java 19 ,libjson-simple-java (< 3) 19 20 ,libgmp-dev (>= 2:5.0.5) 20 21 ,libservice-wrapper-java … … 78 79 gettext-base, 79 80 libgetopt-java, 81 libjson-simple-java (< 3), 80 82 libjetty9-java, 81 83 libtaglibs-standard-jstlel-java, -
debian/i2p-router.links
r54184f2 rd263e42 83 83 84 84 85 # comment out if not building with libjson-simple-java 86 # ubuntu: trusty+; debian: jessie+ 87 usr/share/java/json-simple.jar usr/share/i2p/lib/json-simple.jar 88 89 85 90 # comment out if not building with famfamfam-flag-png 86 91 # ubuntu: trusty+ -
debian/rules
r54184f2 rd263e42 153 153 ln -sf /usr/share/java/gnu-getopt.jar $(CURDIR)/core/java/build/gnu-getopt.jar 154 154 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 155 160 @# debian: everywhere; ubuntu: trusty+ 156 161 @/bin/echo -e "with-famfamfam-flag-png=true" >> $(CURDIR)/override.properties
Note: See TracChangeset
for help on using the changeset viewer.