From 653c0b2061b609e9fc1c660dd0169b12bf2ac162 Mon Sep 17 00:00:00 2001
From: Eduardo Lundgren <eduardolundgren@gmail.com>
Date: Tue, 16 Feb 2010 10:05:47 -0800
Subject: [PATCH 1/3] Move paths for the templates to an argument on the
 macrodef

---
 componentbuild/shared/macrolib.xml | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/componentbuild/shared/macrolib.xml b/componentbuild/shared/macrolib.xml
index ffde60e..73890e2 100644
--- a/componentbuild/shared/macrolib.xml
+++ b/componentbuild/shared/macrolib.xml
@@ -142,8 +142,9 @@
         <attribute name="module" />
         <attribute name="classname" />
         <attribute name="file" />
+        <attribute name="versioncode" default="${builddir}/files/versioncode.txt" />
         <sequential>
-            <loadfile srcfile="${builddir}/files/versioncode.txt" property="@{module}-@{classname}-version" >
+            <loadfile srcfile="@{versioncode}" property="@{module}-@{classname}-version" >
                 <filterchain>
                     <replacetokens>
                         <token key="MODULE" value="@{module}"/>
@@ -162,7 +163,8 @@
         <attribute name="module" />
         <attribute name="dest" />
         <attribute name="lang" default="" />
-    	<attribute name="details" default = ""/>
+    	<attribute name="details" default=""/>
+    	<attribute name="langtemplate" default="${builddir}/files/langtemplate.txt"/>
 
         <sequential>
             <if>
@@ -189,7 +191,7 @@
 
             <echo level="info">Wrapping @{dir}/${@{module}@{lang}_strs} in YUI.add, Y.Intl.add</echo>
 
-            <copy file="${builddir}/files/langtemplate.txt" tofile="@{dest}/${@{module}@{lang}_strs}" overwrite="true">
+            <copy file="@{langtemplate}" tofile="@{dest}/${@{module}@{lang}_strs}" overwrite="true">
                 <filterset>
                 	<!-- TODO - Integration -->
                 	<filter token="LANG" value="@{lang}" />
@@ -208,6 +210,7 @@
         <attribute name="file" />
         <attribute name="module" />
         <attribute name="details" default="" />
+        <attribute name="moduletemplate" default="${builddir}/files/moduletemplate.txt" />
 
         <sequential>
             <if>
@@ -221,7 +224,7 @@
             </if>
             <loadfile srcfile="@{file}" property="@{module}-@{file}-code" />
             <echo level="info">Wrapping @{file} in YUI.add module</echo>
-            <copy file="${builddir}/files/moduletemplate.txt" tofile="@{file}" overwrite="true">
+            <copy file="@{moduletemplate}" tofile="@{file}" overwrite="true">
                 <filterset>
                     <filter token="CODE" value="${@{module}-@{file}-code}" />
                     <filter token="YUIVAR" value="${yui.variable}" />
@@ -236,6 +239,7 @@
         <attribute name="file" />
         <attribute name="module" />
         <attribute name="details" default="" />
+        <attribute name="rolluptemplate" default="${builddir}/files/rolluptemplate.txt" />
 
         <sequential>
             <if>
@@ -249,7 +253,7 @@
             </if>
             <loadfile srcfile="@{file}" property="@{module}-@{file}-code" />
             <echo level="info">Adding Rollup @{file} using YUI.add</echo>
-            <copy file="${builddir}/files/rolluptemplate.txt" tofile="@{file}" overwrite="true">
+            <copy file="@{rolluptemplate}" tofile="@{file}" overwrite="true">
                 <filterset>
                     <filter token="CODE" value="${@{module}-@{file}-code}"/>
                     <filter token="YUIVAR" value="${yui.variable}" />

From 95b1ae18971033f66f574b42a1b8270345101319 Mon Sep 17 00:00:00 2001
From: Eduardo Lundgren <eduardolundgren@gmail.com>
Date: Tue, 11 Jan 2011 20:09:29 -0300
Subject: [PATCH 2/3] Move versioncode to be an argument to allow macrodef
 overload

---
 componentbuild/shared/macrolib.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/componentbuild/shared/macrolib.xml b/componentbuild/shared/macrolib.xml
index 46d821c..b57b7bf 100644
--- a/componentbuild/shared/macrolib.xml
+++ b/componentbuild/shared/macrolib.xml
@@ -173,8 +173,9 @@
         <attribute name="module" />
         <attribute name="classname" />
         <attribute name="file" />
+        <attribute name="versioncode" default="${builddir}/files/versioncode.txt" />
         <sequential>
-            <loadfile srcfile="${builddir}/files/versioncode.txt" property="@{module}-@{classname}-version" >
+            <loadfile srcfile="@{versioncode}" property="@{module}-@{classname}-version" >
                 <filterchain>
                     <replacetokens>
                         <token key="MODULE" value="@{module}"/>

From db65920788ff1ebaffa05ca7546c0af25b17625b Mon Sep 17 00:00:00 2001
From: Eduardo Lundgren <eduardolundgren@gmail.com>
Date: Tue, 11 Jan 2011 20:32:51 -0300
Subject: [PATCH 3/3] Move langtemplate, rolluptemplate and moduletemplate to
 be an argument to allow macrodef overload

---
 componentbuild/shared/macrolib.xml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/componentbuild/shared/macrolib.xml b/componentbuild/shared/macrolib.xml
index b57b7bf..109f174 100644
--- a/componentbuild/shared/macrolib.xml
+++ b/componentbuild/shared/macrolib.xml
@@ -195,6 +195,7 @@
         <attribute name="dest" />
         <attribute name="lang" default="" />
     	<attribute name="details" default = ""/>
+    	<attribute name="langtemplate" default="${builddir}/files/langtemplate.txt"/>
 
         <sequential>
             <if>
@@ -237,7 +238,7 @@
                 </else>
             </if>
 
-            <copy file="${builddir}/files/langtemplate.txt" tofile="@{dest}/${@{module}@{lang}_fullname}.js" overwrite="true" outputencoding="utf-8">
+            <copy file="@{langtemplate}" tofile="@{dest}/${@{module}@{lang}_fullname}.js" overwrite="true" outputencoding="utf-8">
                 <filterset>
                     <filter token="LANG" value="@{lang}" />
                     <filter token="LANG_MODULE" value="lang/${@{module}@{lang}_fullname}" />
@@ -255,6 +256,7 @@
         <attribute name="file" />
         <attribute name="module" />
         <attribute name="details" default="" />
+        <attribute name="moduletemplate" default="${builddir}/files/moduletemplate.txt" />
 
         <sequential>
             <if>
@@ -268,7 +270,7 @@
             </if>
             <loadfile srcfile="@{file}" property="@{module}-@{file}-code" />
             <echo level="info">Wrapping @{file} in YUI.add module</echo>
-            <copy file="${builddir}/files/moduletemplate.txt" tofile="@{file}" overwrite="true">
+            <copy file="@{moduletemplate}" tofile="@{file}" overwrite="true">
                 <filterset>
                     <filter token="CODE" value="${@{module}-@{file}-code}" />
                     <filter token="YUIVAR" value="${yui.variable}" />
@@ -283,6 +285,7 @@
         <attribute name="file" />
         <attribute name="module" />
         <attribute name="details" default="" />
+        <attribute name="rolluptemplate" default="${builddir}/files/rolluptemplate.txt" />
 
         <sequential>
             <if>
@@ -296,7 +299,7 @@
             </if>
             <loadfile srcfile="@{file}" property="@{module}-@{file}-code" />
             <echo level="info">Adding Rollup @{file} using YUI.add</echo>
-            <copy file="${builddir}/files/rolluptemplate.txt" tofile="@{file}" overwrite="true">
+            <copy file="@{rolluptemplate}" tofile="@{file}" overwrite="true">
                 <filterset>
                     <filter token="CODE" value="${@{module}-@{file}-code}"/>
                     <filter token="YUIVAR" value="${yui.variable}" />