Changeset ee138a2 for build.xml

Timestamp:

Mar 26, 2016 2:44:37 PM (4 years ago)

Author:

zzz <zzz@…>

Branches:

master

Children:

51e04f7

Parents:

5405792

Message:

Build:
Don't bundle launch4j licenses in non-windows builds
Clarify in LICENSES.txt that launch4j is not bundled in non-windows builds and packages
Debian:
Change maintainer
Remove Debian patch that drops the launch4j licenses

File:

• build.xml (modified) (6 diffs)

build.xml

@@ -68 +68 @@
             <echo message=" " />
             <echo message="apt-get install debhelper ant debconf default-jdk gettext libgmp3-dev po-debconf fakeroot build-essential \" />
-            <echo message="                   quilt libcommons-logging-java dh-apparmor" />
+            <echo message="                   quilt libcommons-logging-java dh-apparmor dh-systemd" />
             <echo message=" " />
             <echo message="Once the dependencies are installed, run &quot;ant debian&quot;"/>
@@ -1112 +1112 @@
     </target>
 
-    <target name="preppkg-windows" depends="preppkg-base, buildUtilityJar, buildexe">
+    <target name="preppkg-windows" depends="preppkg-base, preplicenses-windows, buildUtilityJar, buildexe">
         <copy file="build/i2p.exe" todir="pkg-temp/" failonerror="false" />
         <copy file="apps/systray/java/lib/systray4j.dll" todir="pkg-temp/lib" />
@@ -1202 +1202 @@
     </target>
 
+    <!-- does NOT include launch4j licenses for Windows builds -->
     <target name="preplicenses">
         <copy file="LICENSE.txt" todir="pkg-temp/" />
@@ -1207 +1208 @@
           <fileset dir="licenses/" />
         </copy>
+        <copy file="apps/jetty/apache-tomcat-deployer/NOTICE" tofile="pkg-temp/licenses/NOTICE-Tomcat.txt" />
+        <copy file="apps/imagegen/identicon/README.md" tofile="pkg-temp/licenses/LICENSE-Identicon.txt" />
+    </target>
+
+
+    <!-- DOES include launch4j licenses for Windows builds -->
+    <target name="preplicenses-windows" depends="preplicenses">
         <!--
               The license in launch4j/ is a BSD license for launch4j
@@ -1213 +1221 @@
          -->
         <copy file="installer/lib/launch4j/head/LICENSE.txt" tofile="pkg-temp/licenses/LICENSE-Launch4j.txt" />
-        <copy file="apps/jetty/apache-tomcat-deployer/NOTICE" tofile="pkg-temp/licenses/NOTICE-Tomcat.txt" />
         <!--  Not sure if these are used or should be included -->
         <copy file="installer/lib/launch4j/lib/foxtrot.LICENSE.txt" tofile="pkg-temp/licenses/LICENSE-Foxtrot.txt" />
@@ -1219 +1226 @@
         <copy file="installer/lib/launch4j/lib/JGoodies.Looks.LICENSE.txt" tofile="pkg-temp/licenses/LICENSE-JGoodies-Looks.txt" />
         <copy file="installer/lib/launch4j/lib/XStream.LICENSE.txt" tofile="pkg-temp/licenses/LICENSE-XStream.txt" />
-        <copy file="apps/imagegen/identicon/README.md" tofile="pkg-temp/licenses/LICENSE-Identicon.txt" />
     </target>