Skip to content
This repository has been archived by the owner on Jan 10, 2020. It is now read-only.

Move langtemplate, rolluptemplate and moduletemplate to be an argument to allow macrodef overload #1

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Move langtemplate, rolluptemplate and moduletemplate to be an argument to allow macrodef overload #1

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
653c0b2
Move paths for the templates to an argument on the macrodef
eduardolundgren Feb 16, 2010
62c63ea
Merge remote branch 'yui/master'
eduardolundgren Jan 11, 2011
95b1ae1
Move versioncode to be an argument to allow macrodef overload
eduardolundgren Jan 11, 2011
db65920
Move langtemplate, rolluptemplate and moduletemplate to be an argumen…
eduardolundgren Jan 11, 2011
c40b67b
Merge branch 'master' of https://github.com/yui/builder
eduardolundgren Sep 30, 2011
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions componentbuild/shared/macrolib.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,8 +181,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}"/>
Expand All @@ -202,6 +203,7 @@
<attribute name="dest" />
<attribute name="lang" default="" />
<attribute name="details" default = ""/>
<attribute name="langtemplate" default="${builddir}/files/langtemplate.txt"/>

<sequential>
<if>
Expand Down Expand Up @@ -244,7 +246,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}" />
Expand All @@ -262,6 +264,7 @@
<attribute name="file" />
<attribute name="module" />
<attribute name="details" default="" />
<attribute name="moduletemplate" default="${builddir}/files/moduletemplate.txt" />

<sequential>
<if>
Expand All @@ -275,7 +278,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}" />
Expand All @@ -290,6 +293,7 @@
<attribute name="file" />
<attribute name="module" />
<attribute name="details" default="" />
<attribute name="rolluptemplate" default="${builddir}/files/rolluptemplate.txt" />

<sequential>
<if>
Expand All @@ -303,7 +307,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}" />
Expand Down