mirror of
https://github.com/acidanthera/audk.git
synced 2025-07-21 12:44:50 +02:00
Add judgement if filepath is . or not.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1254 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
parent
03af6beba5
commit
32a47954e2
@ -71,7 +71,16 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
|
|||||||
</cc>
|
</cc>
|
||||||
</sequential>
|
</sequential>
|
||||||
</OnDependency>
|
</OnDependency>
|
||||||
<var name="OBJECTS" value="${OBJECTS} ${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj" />
|
<!-- Since fileset can't scan file start with ./, remove ./ in previous. -->
|
||||||
|
<if>
|
||||||
|
<equals arg1="@{FILEPATH}" arg2="." />
|
||||||
|
<then>
|
||||||
|
<var name="OBJECTS" value="${OBJECTS} @{FILENAME}.obj" />
|
||||||
|
</then>
|
||||||
|
<else>
|
||||||
|
<var name="OBJECTS" value="${OBJECTS} @{FILEPATH}/@{FILENAME}.obj" />
|
||||||
|
</else>
|
||||||
|
</if>
|
||||||
</sequential>
|
</sequential>
|
||||||
</macrodef>
|
</macrodef>
|
||||||
|
|
||||||
@ -120,7 +129,16 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
|
|||||||
</cc>
|
</cc>
|
||||||
</sequential>
|
</sequential>
|
||||||
</OnDependency>
|
</OnDependency>
|
||||||
<var name="OBJECTS" value="${OBJECTS} ${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj" />
|
<!-- Since fileset can't scan file start with ./, remove ./ in previous. -->
|
||||||
|
<if>
|
||||||
|
<equals arg1="@{FILEPATH}" arg2="." />
|
||||||
|
<then>
|
||||||
|
<var name="OBJECTS" value="${OBJECTS} @{FILENAME}.obj" />
|
||||||
|
</then>
|
||||||
|
<else>
|
||||||
|
<var name="OBJECTS" value="${OBJECTS} @{FILEPATH}/@{FILENAME}.obj" />
|
||||||
|
</else>
|
||||||
|
</if>
|
||||||
</sequential>
|
</sequential>
|
||||||
</macrodef>
|
</macrodef>
|
||||||
|
|
||||||
@ -265,7 +283,16 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
|
|||||||
</cc>
|
</cc>
|
||||||
</sequential>
|
</sequential>
|
||||||
</OnDependency>
|
</OnDependency>
|
||||||
<var name="OBJECTS" value="${OBJECTS} ${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj" />
|
<!-- Since fileset can't scan file start with ./, remove ./ in previous. -->
|
||||||
|
<if>
|
||||||
|
<equals arg1="@{FILEPATH}" arg2="." />
|
||||||
|
<then>
|
||||||
|
<var name="OBJECTS" value="${OBJECTS} @{FILENAME}.obj" />
|
||||||
|
</then>
|
||||||
|
<else>
|
||||||
|
<var name="OBJECTS" value="${OBJECTS} @{FILEPATH}/@{FILENAME}.obj" />
|
||||||
|
</else>
|
||||||
|
</if>
|
||||||
</sequential>
|
</sequential>
|
||||||
</macrodef>
|
</macrodef>
|
||||||
|
|
||||||
@ -307,7 +334,16 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
|
|||||||
</cc>
|
</cc>
|
||||||
</sequential>
|
</sequential>
|
||||||
</OnDependency>
|
</OnDependency>
|
||||||
<var name="OBJECTS" value="${OBJECTS} ${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj" />
|
<!-- Since fileset can't scan file start with ./, remove ./ in previous. -->
|
||||||
|
<if>
|
||||||
|
<equals arg1="@{FILEPATH}" arg2="." />
|
||||||
|
<then>
|
||||||
|
<var name="OBJECTS" value="${OBJECTS} @{FILENAME}.obj" />
|
||||||
|
</then>
|
||||||
|
<else>
|
||||||
|
<var name="OBJECTS" value="${OBJECTS} @{FILEPATH}/@{FILENAME}.obj" />
|
||||||
|
</else>
|
||||||
|
</if>
|
||||||
</sequential>
|
</sequential>
|
||||||
</macrodef>
|
</macrodef>
|
||||||
|
|
||||||
@ -364,7 +400,16 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
|
|||||||
</cc>
|
</cc>
|
||||||
</sequential>
|
</sequential>
|
||||||
</OnDependency>
|
</OnDependency>
|
||||||
<var name="OBJECTS" value="${OBJECTS} ${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj" />
|
<!-- Since fileset can't scan file start with ./, remove ./ in previous. -->
|
||||||
|
<if>
|
||||||
|
<equals arg1="@{FILEPATH}" arg2="." />
|
||||||
|
<then>
|
||||||
|
<var name="OBJECTS" value="${OBJECTS} @{FILENAME}.obj" />
|
||||||
|
</then>
|
||||||
|
<else>
|
||||||
|
<var name="OBJECTS" value="${OBJECTS} @{FILEPATH}/@{FILENAME}.obj" />
|
||||||
|
</else>
|
||||||
|
</if>
|
||||||
</sequential>
|
</sequential>
|
||||||
</macrodef>
|
</macrodef>
|
||||||
|
|
||||||
@ -412,7 +457,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
|
|||||||
|
|
||||||
<OnDependency>
|
<OnDependency>
|
||||||
<sourcefiles>
|
<sourcefiles>
|
||||||
<file list="${OBJECTS}" />
|
<fileset dir="${DEST_DIR_OUTPUT}" includes="${OBJECTS}" />
|
||||||
</sourcefiles>
|
</sourcefiles>
|
||||||
<targetfiles>
|
<targetfiles>
|
||||||
<file name="${BIN_DIR}/@{FILENAME}.lib"/>
|
<file name="${BIN_DIR}/@{FILENAME}.lib"/>
|
||||||
@ -424,7 +469,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
|
|||||||
outputFile="${BIN_DIR}/@{FILENAME}.lib">
|
outputFile="${BIN_DIR}/@{FILENAME}.lib">
|
||||||
<argument value="${SLINK_FLAGS}"/>
|
<argument value="${SLINK_FLAGS}"/>
|
||||||
|
|
||||||
<argument value="${OBJECTS}"/>
|
<fileset dir="${DEST_DIR_OUTPUT}" includes="${OBJECTS}"/>
|
||||||
</command>
|
</command>
|
||||||
</cc>
|
</cc>
|
||||||
</sequential>
|
</sequential>
|
||||||
@ -541,7 +586,16 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
|
|||||||
</cc>
|
</cc>
|
||||||
</sequential>
|
</sequential>
|
||||||
</OnDependency>
|
</OnDependency>
|
||||||
<var name="OBJECTS" value="${OBJECTS} ${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}Strings.obj" />
|
<!-- Since fileset can't scan file start with ./, remove ./ in previous. -->
|
||||||
|
<if>
|
||||||
|
<equals arg1="@{FILEPATH}" arg2="." />
|
||||||
|
<then>
|
||||||
|
<var name="OBJECTS" value="${OBJECTS} @{FILENAME}Strings.obj" />
|
||||||
|
</then>
|
||||||
|
<else>
|
||||||
|
<var name="OBJECTS" value="${OBJECTS} @{FILEPATH}/@{FILENAME}Strings.obj" />
|
||||||
|
</else>
|
||||||
|
</if>
|
||||||
</sequential>
|
</sequential>
|
||||||
</macrodef>
|
</macrodef>
|
||||||
|
|
||||||
@ -595,7 +649,16 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
|
|||||||
<delete file="${PLATFORM_DIR}/@{FILENAME}.i" />
|
<delete file="${PLATFORM_DIR}/@{FILENAME}.i" />
|
||||||
</sequential>
|
</sequential>
|
||||||
</OnDependency>
|
</OnDependency>
|
||||||
<var name="OBJECTS" value="${OBJECTS} ${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}.obj" />
|
<!-- Since fileset can't scan file start with ./, remove ./ in previous. -->
|
||||||
|
<if>
|
||||||
|
<equals arg1="@{FILEPATH}" arg2="." />
|
||||||
|
<then>
|
||||||
|
<var name="OBJECTS" value="${OBJECTS} @{FILENAME}.obj" />
|
||||||
|
</then>
|
||||||
|
<else>
|
||||||
|
<var name="OBJECTS" value="${OBJECTS} @{FILEPATH}/@{FILENAME}.obj" />
|
||||||
|
</else>
|
||||||
|
</if>
|
||||||
</sequential>
|
</sequential>
|
||||||
</macrodef>
|
</macrodef>
|
||||||
|
|
||||||
@ -635,7 +698,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
|
|||||||
<OnDependency>
|
<OnDependency>
|
||||||
<sourcefiles>
|
<sourcefiles>
|
||||||
<file list="${LIBS}"/>
|
<file list="${LIBS}"/>
|
||||||
<file list="${OBJECTS}"/>
|
<fileset dir="${DEST_DIR_OUTPUT}" includes="${OBJECTS}" />
|
||||||
</sourcefiles>
|
</sourcefiles>
|
||||||
<targetfiles>
|
<targetfiles>
|
||||||
<file name="${DEST_DIR_DEBUG}/@{FILEPATH}/@{FILENAME}.dll"/>
|
<file name="${DEST_DIR_DEBUG}/@{FILEPATH}/@{FILENAME}.dll"/>
|
||||||
@ -647,7 +710,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
|
|||||||
outputFile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}Local.lib">
|
outputFile="${DEST_DIR_OUTPUT}/@{FILEPATH}/@{FILENAME}Local.lib">
|
||||||
<argument value="${SLINK_FLAGS}"/>
|
<argument value="${SLINK_FLAGS}"/>
|
||||||
|
|
||||||
<argument value="${OBJECTS}"/>
|
<fileset dir="${DEST_DIR_OUTPUT}" includes="${OBJECTS}"/>
|
||||||
</command>
|
</command>
|
||||||
</cc>
|
</cc>
|
||||||
<cc userdefine="on">
|
<cc userdefine="on">
|
||||||
|
Loading…
x
Reference in New Issue
Block a user