summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
03af6be)
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1254
6f19259b-4bc3-4df7-8a09-
765794883524
</cc>\r
</sequential>\r
</OnDependency>\r
</cc>\r
</sequential>\r
</OnDependency>\r
- <var name="OBJECTS" value="${OBJECTS} ${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj" />\r
+ <!-- Since fileset can't scan file start with ./, remove ./ in previous. -->\r
+ <if>\r
+ <equals arg1="@{FILEPATH}" arg2="." />\r
+ <then>\r
+ <var name="OBJECTS" value="${OBJECTS} @{FILENAME}.obj" />\r
+ </then>\r
+ <else>\r
+ <var name="OBJECTS" value="${OBJECTS} @{FILEPATH}/@{FILENAME}.obj" />\r
+ </else>\r
+ </if>\r
</sequential>\r
</macrodef>\r
\r
</sequential>\r
</macrodef>\r
\r
</cc>\r
</sequential>\r
</OnDependency>\r
</cc>\r
</sequential>\r
</OnDependency>\r
- <var name="OBJECTS" value="${OBJECTS} ${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj" />\r
+ <!-- Since fileset can't scan file start with ./, remove ./ in previous. -->\r
+ <if>\r
+ <equals arg1="@{FILEPATH}" arg2="." />\r
+ <then>\r
+ <var name="OBJECTS" value="${OBJECTS} @{FILENAME}.obj" />\r
+ </then>\r
+ <else>\r
+ <var name="OBJECTS" value="${OBJECTS} @{FILEPATH}/@{FILENAME}.obj" />\r
+ </else>\r
+ </if>\r
</sequential>\r
</macrodef>\r
\r
</sequential>\r
</macrodef>\r
\r
</cc>\r
</sequential>\r
</OnDependency>\r
</cc>\r
</sequential>\r
</OnDependency>\r
- <var name="OBJECTS" value="${OBJECTS} ${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj" />\r
+ <!-- Since fileset can't scan file start with ./, remove ./ in previous. -->\r
+ <if>\r
+ <equals arg1="@{FILEPATH}" arg2="." />\r
+ <then>\r
+ <var name="OBJECTS" value="${OBJECTS} @{FILENAME}.obj" />\r
+ </then>\r
+ <else>\r
+ <var name="OBJECTS" value="${OBJECTS} @{FILEPATH}/@{FILENAME}.obj" />\r
+ </else>\r
+ </if>\r
</sequential>\r
</macrodef>\r
\r
</sequential>\r
</macrodef>\r
\r
</cc>\r
</sequential>\r
</OnDependency>\r
</cc>\r
</sequential>\r
</OnDependency>\r
- <var name="OBJECTS" value="${OBJECTS} ${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj" />\r
+ <!-- Since fileset can't scan file start with ./, remove ./ in previous. -->\r
+ <if>\r
+ <equals arg1="@{FILEPATH}" arg2="." />\r
+ <then>\r
+ <var name="OBJECTS" value="${OBJECTS} @{FILENAME}.obj" />\r
+ </then>\r
+ <else>\r
+ <var name="OBJECTS" value="${OBJECTS} @{FILEPATH}/@{FILENAME}.obj" />\r
+ </else>\r
+ </if>\r
</sequential>\r
</macrodef>\r
\r
</sequential>\r
</macrodef>\r
\r
</cc>\r
</sequential>\r
</OnDependency>\r
</cc>\r
</sequential>\r
</OnDependency>\r
- <var name="OBJECTS" value="${OBJECTS} ${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj" />\r
+ <!-- Since fileset can't scan file start with ./, remove ./ in previous. -->\r
+ <if>\r
+ <equals arg1="@{FILEPATH}" arg2="." />\r
+ <then>\r
+ <var name="OBJECTS" value="${OBJECTS} @{FILENAME}.obj" />\r
+ </then>\r
+ <else>\r
+ <var name="OBJECTS" value="${OBJECTS} @{FILEPATH}/@{FILENAME}.obj" />\r
+ </else>\r
+ </if>\r
</sequential>\r
</macrodef>\r
\r
</sequential>\r
</macrodef>\r
\r
\r
<OnDependency>\r
<sourcefiles>\r
\r
<OnDependency>\r
<sourcefiles>\r
- <file list="${OBJECTS}" />\r
+ <fileset dir="${DEST_DIR_OUTPUT}" includes="${OBJECTS}" />\r
</sourcefiles>\r
<targetfiles>\r
<file name="${BIN_DIR}/@{FILENAME}.lib"/>\r
</sourcefiles>\r
<targetfiles>\r
<file name="${BIN_DIR}/@{FILENAME}.lib"/>\r
outputFile="${BIN_DIR}/@{FILENAME}.lib">\r
<argument value="${SLINK_FLAGS}"/>\r
\r
outputFile="${BIN_DIR}/@{FILENAME}.lib">\r
<argument value="${SLINK_FLAGS}"/>\r
\r
- <argument value="${OBJECTS}"/>\r
+ <fileset dir="${DEST_DIR_OUTPUT}" includes="${OBJECTS}"/>\r
</command>\r
</cc>\r
</sequential>\r
</command>\r
</cc>\r
</sequential>\r
</cc>\r
</sequential>\r
</OnDependency>\r
</cc>\r
</sequential>\r
</OnDependency>\r
- <var name="OBJECTS" value="${OBJECTS} ${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}Strings.obj" />\r
+ <!-- Since fileset can't scan file start with ./, remove ./ in previous. -->\r
+ <if>\r
+ <equals arg1="@{FILEPATH}" arg2="." />\r
+ <then>\r
+ <var name="OBJECTS" value="${OBJECTS} @{FILENAME}Strings.obj" />\r
+ </then>\r
+ <else>\r
+ <var name="OBJECTS" value="${OBJECTS} @{FILEPATH}/@{FILENAME}Strings.obj" />\r
+ </else>\r
+ </if>\r
</sequential>\r
</macrodef>\r
\r
</sequential>\r
</macrodef>\r
\r
<delete file="${PLATFORM_DIR}/@{FILENAME}.i" />\r
</sequential>\r
</OnDependency>\r
<delete file="${PLATFORM_DIR}/@{FILENAME}.i" />\r
</sequential>\r
</OnDependency>\r
- <var name="OBJECTS" value="${OBJECTS} ${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj" />\r
+ <!-- Since fileset can't scan file start with ./, remove ./ in previous. -->\r
+ <if>\r
+ <equals arg1="@{FILEPATH}" arg2="." />\r
+ <then>\r
+ <var name="OBJECTS" value="${OBJECTS} @{FILENAME}.obj" />\r
+ </then>\r
+ <else>\r
+ <var name="OBJECTS" value="${OBJECTS} @{FILEPATH}/@{FILENAME}.obj" />\r
+ </else>\r
+ </if>\r
</sequential>\r
</macrodef>\r
\r
</sequential>\r
</macrodef>\r
\r
<OnDependency>\r
<sourcefiles>\r
<file list="${LIBS}"/>\r
<OnDependency>\r
<sourcefiles>\r
<file list="${LIBS}"/>\r
- <file list="${OBJECTS}"/>\r
+ <fileset dir="${DEST_DIR_OUTPUT}" includes="${OBJECTS}" />\r
</sourcefiles>\r
<targetfiles>\r
<file name="${DEST_DIR_DEBUG}/@{FILEPATH}/@{FILENAME}.dll"/>\r
</sourcefiles>\r
<targetfiles>\r
<file name="${DEST_DIR_DEBUG}/@{FILEPATH}/@{FILENAME}.dll"/>\r
outputFile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}Local.lib">\r
<argument value="${SLINK_FLAGS}"/>\r
\r
outputFile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}Local.lib">\r
<argument value="${SLINK_FLAGS}"/>\r
\r
- <argument value="${OBJECTS}"/>\r
+ <fileset dir="${DEST_DIR_OUTPUT}" includes="${OBJECTS}"/>\r
</command>\r
</cc>\r
<cc userdefine="on">\r
</command>\r
</cc>\r
<cc userdefine="on">\r