Changeset 2fe1f97

Timestamp:

Apr 30, 2016 6:08:50 PM (5 years ago)

Author:

zzz <zzz@…>

Branches:

master

Children:

33629d0, 6bfd39d5

Parents:

30ecded

Message:

Debian: Add runtime dependency on libhttpclient-java,
link to /usr/share/java/httpclient.jar and httpcore.jar.
This is 2 MB of dependencies to replace 20 KB of copied code,
so may not be worth it, esp. for Tails.

Files:

• build.properties (modified) (1 diff)
• build.xml (modified) (2 diffs)
• core/java/build.xml (modified) (2 diffs)
• debian/control (modified) (2 diffs)
• debian/i2p-router.links (modified) (1 diff)
• debian/rules (modified) (1 diff)
• router/java/build.xml (modified) (2 diffs)

build.properties

@@ -132 +132 @@
 # Don't compile GettextResource.java, we will use libintl.jar from the gettext-base package
 #with-gettext-base=true
-# Don't compile gnu/getopt classes, we will use libgetopt-java package
+# Don't compile gnu.getopt classes, we will use libgetopt-java package
 #with-libgetopt-java=true
+# Don't compile org.apache.http classes, we will use libhttpclient-java and libhttpcore-java packages
+#with-libhttpclient-java=true

build.xml

@@ -2032 +2032 @@
             <!-- libgetopt-java -->
             <fileset dir="../i2p-${Extended.Version}/core/java/src/gnu/getopt" />
+            <!-- libhttpclient-java and libhttpcore-java -->
+            <fileset dir="../i2p-${Extended.Version}/core/java/src/org/apache/http" />
             <!-- systray4j -->
             <fileset dir="../i2p-${Extended.Version}/apps/systray/java/lib" />
@@ -2102 +2104 @@
             <fileset dir="../i2p-${Extended.Version}/core/java/src/gnu/gettext" />
             <fileset dir="../i2p-${Extended.Version}/core/java/src/gnu/getopt" />
+            <fileset dir="../i2p-${Extended.Version}/core/java/src/org/apache/http" />
             <fileset dir="../i2p-${Extended.Version}/apps/systray/java/lib" />
             <file name="../i2p-${Extended.Version}/apps/systray/java/src/net/i2p/apps/systray/SysTrayImpl.java" />

core/java/build.xml

@@ -39 +39 @@
         <istrue value="${with-libgetopt-java}" />
     </condition>
-    <property name="javac.classpath.mod" value="${javac.classpath.mod1}${javac.classpath.mod2}${javac.classpath}" />
+    <!-- fixups if we're using httpclient.jar and httpcore.jar for org.apache.http classes -->
+    <condition property="source.exclude3" value="org/apache/http/**" else="NOTHING" >
+        <istrue value="${with-libhttpclient-java}" />
+    </condition>
+    <condition property="javac.classpath.mod3" value="build/httpclient.jar:build/httpcore.jar:" else="" >
+        <istrue value="${with-libhttpclient-java}" />
+    </condition>
+    <property name="javac.classpath.mod" value="${javac.classpath.mod1}${javac.classpath.mod2}${javac.classpath.mod3}${javac.classpath}" />
 
     <target name="compile" depends="depend">
@@ -53 +60 @@
             <exclude name="${source.exclude1}" />
             <exclude name="${source.exclude2}" />
+            <exclude name="${source.exclude3}" />
         </javac>
     </target>

debian/control

@@ -16 +16 @@
  ,gettext
  ,libgetopt-java
+ ,libhttpclient-java, libhttpcore-java
  ,libgmp-dev (>= 2:5.0.5)
  ,libservice-wrapper-java
@@ -79 +80 @@
  gettext-base,
  libgetopt-java,
+ libhttpclient-java, libhttpcore-java,
  libjetty8-java, libservlet3.0-java,
  glassfish-javaee

debian/i2p-router.links

@@ -90 +90 @@
 # ubuntu and debian: everywhere
 usr/share/java/gnu-getopt.jar usr/share/i2p/lib/gnu-getopt.jar
+
+
+# comment out if not building with libhttpclient-java and libhttpcore-java
+# ubuntu and debian: everywhere
+usr/share/java/httpclient.jar usr/share/i2p/lib/httpclient.jar
+usr/share/java/httpcore.jar usr/share/i2p/lib/httpcore.jar

debian/rules

@@ -150 +150 @@
         ln -sf /usr/share/java/gnu-getopt.jar $(CURDIR)/core/java/build/gnu-getopt.jar
 
+        @# debian and ubuntu: everywhere
+        @/bin/echo -e "with-libhttpclient-java=true" >> $(CURDIR)/override.properties
+        @mkdir -p $(CURDIR)/core/java/build
+        ln -sf /usr/share/java/httpclient.jar $(CURDIR)/core/java/build/httpclient.jar
+        ln -sf /usr/share/java/httpcore.jar $(CURDIR)/core/java/build/httpcore.jar
+
         TZ=UTC JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8 ant preppkg-unix javadoc
         echo router.updateDisabled=true > $(I2P)/router.config

router/java/build.xml

@@ -17 +17 @@
             <classpath>
                 <pathelement location="../../core/java/build/obj" />
+                <pathelement location="../../core/java/build/gnu-getopt.jar" />
+                <pathelement location="../../core/java/build/httpclient.jar" />
+                <pathelement location="../../core/java/build/httpcore.jar" />
             </classpath>
         </depend>
@@ -39 +42 @@
                debuglevel="lines,vars,source"
                includeAntRuntime="false"
-               destdir="./build/obj" classpath="../../core/java/build/obj:../../core/java/build/i2p.jar:../../core/java/build/gnu-getopt.jar" >
+               destdir="./build/obj" classpath="../../core/java/build/obj:../../core/java/build/i2p.jar:../../core/java/build/gnu-getopt.jar:../../core/java/build/httpclient.jar:../../core/java/build/httpcore.jar" >
             <compilerarg line="${javac.compilerargs}" />
         </javac>