Changeset bfbd159 for build.xml

Timestamp:

Jun 7, 2016 7:15:00 PM (4 years ago)

Author:

zzz <zzz@…>

Branches:

master

Children:

471ff5b9

Parents:

aa8fd85

Message:

Release tarball build fixes
Precise build tweaks
Precise and Trusty changelogs

File:

• build.xml (modified) (4 diffs)

build.xml

@@ -2095 +2095 @@
     </target>
 
-    <!-- same as debian-tarball but with bundled jetty -->
-    <target name="precise-tarball" depends="getExtendedVersion">
+    <!-- same as debian-release-tarball but with bundled jetty
+      -  We add a 'p' to the release name and tarball since the source package is different;
+      -  Launchpad does not allow different source packages with the same name.
+      -->
+    <target name="precise-release-tarball" depends="getExtendedVersion">
         <!-- this will use the monotonerc file in the current workspace -->
         <fail message="This target cannot be used without Monotone! Use &quot;fakeroot debian/rules get-orig-source&quot; instead.">
@@ -2105 +2108 @@
             </condition>
         </fail>
-        <property name="debian.tarball.name" value="i2p_${Extended.Version}.orig.tar.bz2" />
+        <property name="debian.tarball.name" value="i2p_${release.number}p.orig.tar.bz2" />
         <echo message="Checking out fresh copy into ../i2p-${Extended.Version} for tarballing:" />
         <delete dir="../i2p-${Extended.Version}" />
@@ -2113 +2116 @@
             <arg value="-r" />
             <arg value="w:" />
+            <arg value="-b" />
+            <arg value="i2p.i2p" />
             <arg value="../i2p-${Extended.Version}" />
         </exec>
@@ -2193 +2198 @@
             <arg value="-r" />
             <arg value="w:" />
+            <arg value="-b" />
+            <arg value="i2p.i2p" />
             <arg value="../i2p-${Extended.Version}" />
         </exec>