Standardized property name WORKSPACE and fixed cleanall messages.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1725 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
lhauch 2006-10-11 16:40:33 +00:00
parent 4110971635
commit d7bb51136b
14 changed files with 55 additions and 10 deletions

View File

@ -40,6 +40,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<equals arg1="${ToolChain}" arg2="msvc"/>
<then>
<exec dir="${PACKAGE_DIR}/Pccts/antlr" executable="nmake" failonerror="TRUE">
<arg line="/NOLOGO"/>
<arg line="-f AntlrMS.mak"/>
</exec>
</then>
@ -55,6 +56,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<istrue value="${gcc}"/>
<then>
<exec dir="${PACKAGE_DIR}/Pccts/antlr" executable="make" failonerror="TRUE">
<arg line="-s"/>
<arg line="-f makefile BIN_DIR=${BIN_DIR}"/>
</exec>
</then>
@ -69,6 +71,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<equals arg1="${ToolChain}" arg2="msvc"/>
<then>
<exec dir="${PACKAGE_DIR}/Pccts/antlr" executable="nmake" failonerror="TRUE">
<arg line="/C"/>
<arg line="/NOLOGO"/>
<arg line="-f AntlrMS.mak clean"/>
</exec>
</then>
@ -84,6 +88,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<istrue value="${gcc}"/>
<then>
<exec dir="${PACKAGE_DIR}/Pccts/antlr" executable="make" failonerror="TRUE">
<arg line="-s"/>
<arg line="-f makefile clean"/>
</exec>
</then>
@ -97,7 +102,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<equals arg1="${ToolChain}" arg2="msvc"/>
<then>
<exec dir="${PACKAGE_DIR}/Pccts/antlr" executable="nmake" failonerror="FALSE">
<arg line="-f AntlrMS.mak clean"/>
<arg line="/C"/>
<arg line="/NOLOGO"/>
<arg line="/f AntlrMS.mak clean"/>
</exec>
</then>
<elseif>
@ -105,6 +112,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<then>
<echo message="Building antlr with cygwin gcc"/>
<exec dir="${PACKAGE_DIR}/Pccts/antlr" executable="make" failonerror="FALSE">
<arg line="-s"/>
<arg line="-f makefile.cygwin clean"/>
</exec>
</then>
@ -114,6 +122,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<then>
<echo message="Building antlr with gcc"/>
<exec dir="${PACKAGE_DIR}/Pccts/antlr" executable="make" failonerror="FALSE">
<arg line="-s"/>
<arg line="-f makefile clean"/>
</exec>
</then>

View File

@ -41,6 +41,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
</target>
<target name="cleanall">
<echo message="Removing Object Files and the Executables from the package: Pccts"/>
<ant dir="${PACKAGE_DIR}/Pccts/antlr" target="cleanall" inheritAll="true"/>
<ant dir="${PACKAGE_DIR}/Pccts/dlg" target="cleanall" inheritAll="true"/>
</target>

View File

@ -42,6 +42,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<equals arg1="${ToolChain}" arg2="msvc"/>
<then>
<exec dir="${PACKAGE_DIR}/Pccts/dlg" executable="nmake" failonerror="TRUE">
<arg line="/NOLOGO"/>
<arg line="-f DlgMS.mak"/>
</exec>
</then>
@ -57,6 +58,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<equals arg1="${ToolChain}" arg2="gcc"/>
<then>
<exec dir="${PACKAGE_DIR}/Pccts/dlg" executable="make" failonerror="TRUE">
<arg line="-s"/>
<arg line="-f makefile BIN_DIR=${BIN_DIR}"/>
</exec>
</then>
@ -71,6 +73,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<equals arg1="${ToolChain}" arg2="msvc"/>
<then>
<exec dir="${PACKAGE_DIR}/Pccts/dlg" executable="nmake" failonerror="TRUE">
<arg line="/C"/>
<arg line="/NOLOGO"/>
<arg line="-f DlgMS.mak clean"/>
</exec>
</then>
@ -86,6 +90,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<equals arg1="${ToolChain}" arg2="gcc"/>
<then>
<exec dir="${PACKAGE_DIR}/Pccts/dlg" executable="make" failonerror="TRUE">
<arg line="-s"/>
<arg line="-f makefile clean"/>
</exec>
</then>
@ -99,6 +104,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<equals arg1="${ToolChain}" arg2="msvc"/>
<then>
<exec dir="${PACKAGE_DIR}/Pccts/dlg" executable="nmake" failonerror="FALSE">
<arg line="/C"/>
<arg line="/NOLOGO"/>
<arg line="-f DlgMS.mak clean"/>
</exec>
</then>
@ -106,6 +113,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<equals arg1="${ToolChain}" arg2="gcc"/>
<then>
<exec dir="${PACKAGE_DIR}/Pccts/dlg" executable="make" failonerror="FALSE">
<arg line="-s"/>
<arg line="-f makefile clean"/>
</exec>
</then>

View File

@ -44,6 +44,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
</target>
<target name="cleanall" depends="clean">
<echo message="Removing Class Files and the Java Archive: Common.jar"/>
<delete file="${installLocation}/Common.jar"/>
<if>
<available file="${installLocation}/Common.jar"/>

View File

@ -35,6 +35,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
</delete>
</target>
<target name="cleanall" depends="clean">
<echo message="Removing Class Files and the Java Archive: ContextTool.jar"/>
<delete file="${installLocation}/ContextTool.jar"/>
<if>
<available file="${installLocation}/ContextTool.jar"/>

View File

@ -12,9 +12,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<project name="CppTasks" default="CppTasks" basedir=".">
<taskdef resource="net/sf/antcontrib/antlib.xml"/>
<property environment="env"/>
<property name="workspace" value="${env.WORKSPACE}"/>
<property name="WORKSPACE" value="${env.WORKSPACE}"/>
<property name="buildDir" value="build"/>
<property name="installLocation" value="${workspace}/Tools/Jars"/>
<property name="installLocation" value="${WORKSPACE}/Tools/Jars"/>
<target name="CppTasks" depends="install"/>
<target name="init">
<uptodate property="jar.newer" targetfile="${installLocation}/cpptasks.jar">
@ -25,18 +25,19 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<mkdir dir="${buildDir}"/>
<javac srcdir="net" destdir="${buildDir}" source="1.4">
<classpath>
<fileset dir="${workspace}/Tools/Jars">
<fileset dir="${WORKSPACE}/Tools/Jars">
<include name="*.jar"/>
</fileset>
</classpath>
</javac>
</target>
<target name="clean">
<delete includeemptydirs="true" failonerror="false">
<delete includeemptydirs="true" failonerror="false" quiet="true">
<fileset dir="${WORKSPACE}/Tools/Java/Source/Cpptasks" includes="${buildDir}"/>
</delete>
</target>
<target name="cleanall" depends="clean">
<echo message="Removing Class Files and the Java Archive: cpptasks.jar"/>
<delete file="${installLocation}/cpptasks.jar"/>
<if>
<available file="${installLocation}/cpptasks.jar"/>

View File

@ -12,15 +12,15 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<project name="FrameworkTasks" default="FrameworkTasks">
<taskdef resource="net/sf/antcontrib/antlib.xml"/>
<property environment="env"/>
<property name="workspace" value="${env.WORKSPACE}"/>
<property name="WORKSPACE" value="${env.WORKSPACE}"/>
<property name="buildDir" value="build"/>
<property name="installLocation" value="${workspace}/Tools/Jars"/>
<property name="installLocation" value="${WORKSPACE}/Tools/Jars"/>
<target name="FrameworkTasks" depends="install"/>
<target name="source">
<mkdir dir="${buildDir}"/>
<javac srcdir="." destdir="${buildDir}">
<classpath>
<fileset dir="${workspace}/Tools/Jars">
<fileset dir="${WORKSPACE}/Tools/Jars">
<include name="*.jar"/>
</fileset>
</classpath>
@ -33,6 +33,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
</delete>
</target>
<target name="cleanall" depends="clean">
<echo message="Removing Class Files and the Java Archive: frameworktasks.jar"/>
<delete file="${installLocation}/frameworktasks.jar"/>
<if>
<available file="${installLocation}/frameworktasks.jar"/>

View File

@ -34,6 +34,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
</delete>
</target>
<target name="cleanall" depends="clean">
<echo message="Removing Class Files and the Java Archive: FrameworkWizard.jar"/>
<delete file="${installLocation}/FrameworkWizard.jar"/>
</target>
<target name="install" depends="source">

View File

@ -36,6 +36,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
</delete>
</target>
<target name="cleanall" depends="clean">
<echo message="Removing Class Files and the Java Archive: GenBuild.jar"/>
<delete file="${installLocation}/GenBuild.jar"/>
<if>
<available file="${installLocation}/GenBuild.jar"/>

View File

@ -33,6 +33,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
</delete>
</target>
<target name="cleanall" depends="clean">
<echo message="Removing Class Files and the Java Archive: Merge.jar"/>
<delete file="${installLocation}/Merge.jar"/>
</target>
<target name="install" depends="source">

View File

@ -34,6 +34,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
</delete>
</target>
<target name="cleanall" depends="clean">
<echo message="Removing Class Files and the Java Archive: MigrationTools.jar"/>
<delete file="${installLocation}/MigrationTools.jar"/>
<if>
<available file="${installLocation}/MigrationTools.jar"/>

View File

@ -35,6 +35,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
</delete>
</target>
<target name="cleanall" depends="clean">
<echo message="Removing Class Files and the Java Archive: PcdTools.jar"/>
<delete file="${installLocation}/PcdTools.jar"/>
<if>
<available file="${installLocation}/PcdTools.jar"/>

View File

@ -200,6 +200,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
</target>
<target name="cleanall" depends="SurfaceArea.jar.clean">
<echo message="Removing Class Files and the Java Archive: SurfaceArea.jar"/>
<delete file="${WORKSPACE}/Tools/Jars/SurfaceArea.jar"/>
<if>
<available file="${WORKSPACE}/Tools/Jars/SurfaceArea.jar"/>

View File

@ -130,15 +130,32 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
Java/Source/PcdTools/build.xml
Java/Source/Common/build.xml
Java/Source/SurfaceArea/build.xml
CCode/Source/build.xml
Java/Source/MigrationTools/build.xml
Java/Source/ContextTool/build.xml
Java/Source/Merge/build.xml
CCode/Source/build.xml
"/>
</subant>
</target>
<target name="cleanall">
<echo message="Removing extra ${env.WORKSPACE} history.xml files!"/>
<if>
<available file="${env.WORKSPACE}/Tools/bin/history.xml"/>
<then>
<delete failonerror="false" quiet="true">
<fileset file="${env.WORKSPACE}/Tools/bin/history.xml"/>
</delete>
</then>
</if>
<if>
<available file="${env.WORKSPACE}/Tools/CCode/Source/Library/history.xml"/>
<then>
<delete failonerror="false" quiet="true">
<fileset file="${env.WORKSPACE}/Tools/CCode/Source/Library/history.xml"/>
</delete>
</then>
</if>
<available classname="org.tianocore.frameworkwizard.FrameworkWizardUI" property="FrameworkWizardUI.available"/>
<available classname="org.tianocore.build.GenBuildTask" property="GenBuildTask.available"/>
<available classname="org.tianocore.framework.tasks.Tool" property="Tool.available"/>
@ -164,10 +181,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
Java/Source/PcdTools/build.xml
Java/Source/Common/build.xml
Java/Source/SurfaceArea/build.xml
CCode/Source/build.xml
Java/Source/MigrationTools/build.xml
Java/Source/ContextTool/build.xml
Java/Source/Merge/build.xml
CCode/Source/build.xml
"/>
</subant>
</target>