From dc05441b446aa4cf7e6eaa941c6dd623131bdcff Mon Sep 17 00:00:00 2001
From: LV-426 <lv-426@taproot.org.il>
Date: Sun, 3 May 2015 16:51:39 +0300
Subject: deb-pkg, build.ant: introducing 'single' and 'mux' debian package
 variants

Currently both share the same control script, generating a 'rhizi' named package
---
 build.ant | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

(limited to 'build.ant')

diff --git a/build.ant b/build.ant
index 78807c58..e13b620b 100644
--- a/build.ant
+++ b/build.ant
@@ -195,13 +195,30 @@
       </parallel>
    </target>
 
-   <target name="pkg-deb" depends="clean" description="package as .deb">
+   <target name="pkg-deb__mux" depends="clean" description="package as .deb">
+      <antcall target="pkg-deb__common">
+         <!-- FIXME: use rhizi-mux -->
+         <param name="pkg_name" value="rhizi" />
+         <param name="pkg_variant" value="rhizi-mux" />
+      </antcall>
+   </target>
+
+   <target name="pkg-deb__single" depends="clean" description="package as .deb">
+      <antcall target="pkg-deb__common">
+         <param name="pkg_name" value="rhizi" />
+         <param name="pkg_variant" value="rhizi-single" />
+      </antcall>
+   </target>
+
+   <target name="pkg-deb__common" depends="clean" description="package as .deb">
+
+      <fail unless="pkg_variant" />
+      <fail unless="pkg_name" />
 
-      <property name="pkg_name" value="rhizi" />
       <property name="pkg_version" value="0.1.0" />
       <property name="pkg_debname" value="${pkg_name}_${pkg_version}" />
       <property name="pkg_fullname" value="${pkg_name}-${pkg_version}" />
-      <property name="build_dir__deb_pkg" value="${buildDir}/${pkg_fullname}" />
+      <property name="build_dir__deb_pkg" value="${buildDir}/deb-pkg__${pkg_variant}/${pkg_fullname}" />
 
       <mkdir dir="dist" />
       <mkdir dir="${build_dir__deb_pkg}" />
@@ -215,7 +232,8 @@
 
       <generate_version_tag output="${build_dir__deb_pkg}/res/templates/fragment/" />
       <copy todir="${build_dir__deb_pkg}/debian">
-         <fileset dir="res/debian" />
+         <fileset dir="res/debian/pkg__rhizi-common" />
+         <fileset dir="res/debian/pkg__${pkg_variant}" />
       </copy>
 
       <delete verbose="true" includeemptydirs="true">
-- 
cgit v1.3.1