From 9ae959fe5c02635cb542f8d1dd915c8f02ef8da0 Mon Sep 17 00:00:00 2001
From: LV-426 <lv-426@taproot.org.il>
Date: Sun, 3 May 2015 18:30:28 +0300
Subject: mv templates -> template.d

---
 build.ant | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

(limited to 'build.ant')

diff --git a/build.ant b/build.ant
index b2b7aaaa..ef000457 100644
--- a/build.ant
+++ b/build.ant
@@ -105,10 +105,10 @@
       <property name="src_server" value="src/server" />
 
       <mkdir dir="${targetDeploymentDir}/static" />
-      <mkdir dir="${targetDeploymentDir}/templates" />
-      <mkdir dir="${targetDeploymentDir}/templates/fragment" />
+      <mkdir dir="${targetDeploymentDir}/template.d" />
+      <mkdir dir="${targetDeploymentDir}/template.d/fragment.d" />
 
-      <generate_version_tag output="res/templates/fragment" />
+      <generate_version_tag output="res/template.d/fragment.d" />
 
       <!-- note: defaults to not overwriting, so rhizi-server.conf is safe  -->
 
@@ -131,7 +131,8 @@
 
          <!-- res -->
          <rsync src="res/client/" dst="${targetDeploymentDir}/static" />
-         <rsync src="res/templates/" dst="${targetDeploymentDir}/templates/" />
+         <rsync src="res/template.d/"
+                dst="${targetDeploymentDir}/template.d/" />
 
          <!-- auth-->
          <copy file="res/etc/user_db.db"
@@ -141,7 +142,7 @@
          <!-- domain specific defaults-->
          <copy file="res/etc/rhizi-server.conf.example"
                tofile="res/etc/rhizi-server.conf" />
-         <copy todir="${targetDeploymentDir}/templates/fragment"
+         <copy todir="${targetDeploymentDir}/template.d/fragment.d"
                failonerror="false">
             <fileset dir="res/local/template/fragment/by-domain/${defaultDomain}"
                      includes="*" />
@@ -156,7 +157,7 @@
          <!-- domain specific overrides -->
          <copy file="src/local/domain/${targetDomain}/domain_types.js"
                tofile="${targetDeploymentDir}/static/js/model/domain_types.js" />
-         <copy todir="${targetDeploymentDir}/templates/fragment"
+         <copy todir="${targetDeploymentDir}/template.d/fragment.d"
                overwrite="true"
                failonerror="false">
             <fileset dir="res/local/template/fragment/by-domain/${targetDomain}" />
@@ -222,6 +223,8 @@
 
       <mkdir dir="dist" />
       <mkdir dir="${build_dir__deb_pkg}" />
+      <mkdir dir="${build_dir__deb_pkg}/template.d" />
+      <mkdir dir="${build_dir__deb_pkg}/template.d/fragment.d" />
 
       <exec dir="${basedir}" executable="/usr/bin/git">
          <arg value="clone" />
@@ -230,12 +233,16 @@
          <arg value="${build_dir__deb_pkg}" />
       </exec>
 
-      <generate_version_tag output="${build_dir__deb_pkg}/res/templates/fragment/" />
       <copy todir="${build_dir__deb_pkg}/debian">
          <fileset dir="res/debian/pkg__rhizi-common" />
          <fileset dir="res/debian/pkg__${pkg_variant}" />
       </copy>
 
+      <generate_version_tag output="${build_dir__deb_pkg}/res/template.d/fragment.d/" />
+      <replace file="${build_dir__deb_pkg}/control"
+               token="\${package-name}"
+               value="${package_name}" />
+
       <delete verbose="true" includeemptydirs="true">
          <fileset dir="${build_dir__deb_pkg}" includes="Makefile" />
          <fileset dir="${build_dir__deb_pkg}" includes="**/*.scss" />
-- 
cgit v1.3.1