Add VSYASM integration files for Visual Studio 2010 (and remove incorrect YASM ones)

svn path=/trunk/yasm/; revision=2297

5 files changed, 133 insertions, 120 deletions

diff --git a/Mkfiles/vc10/vsyasm.props b/Mkfiles/vc10/vsyasm.props
new file mode 100644
index 00000000..4f2cc764
--- /dev/null
+++ b/Mkfiles/vc10/vsyasm.props
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <PropertyGroup

+    Condition="'$(YASMBeforeTargets)' == '' and '$(YASMAfterTargets)' == '' and '$(ConfigurationType)' != 'Makefile'">

+    <YASMBeforeTargets>Midl</YASMBeforeTargets>

+    <YASMAfterTargets>CustomBuild</YASMAfterTargets>

+  </PropertyGroup>

+  <PropertyGroup>

+    <YASMDependsOn

+      Condition="'$(ConfigurationType)' != 'Makefile'">_SelectedFiles;$(YASMDependsOn)</YASMDependsOn>

+  </PropertyGroup>

+  <ItemDefinitionGroup>

+    <YASM>

+      <Debug>False</Debug>

+      <ObjectFileName>$(IntDir)$(TargetName)</ObjectFileName>

+      <PreProc>0</PreProc>

+      <Parser>0</Parser>

+      <CommandLineTemplate>vsyasm -Xvc -f $(Platform) [AllOptions] [AdditionalOptions] [Inputs]</CommandLineTemplate>

+      <Outputs>%(ObjectFileName)</Outputs>

+      <ExecutionDescription>Assembling %(Filename)%(Extension)</ExecutionDescription>

+      <ShowOnlyRuleProperties>false</ShowOnlyRuleProperties>

+    </YASM>

+  </ItemDefinitionGroup>

+</Project>
\ No newline at end of file
diff --git a/Mkfiles/vc10/vsyasm.targets b/Mkfiles/vc10/vsyasm.targets
new file mode 100644
index 00000000..a250afbb
--- /dev/null
+++ b/Mkfiles/vc10/vsyasm.targets
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup>

+    <PropertyPageSchema

+      Include="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).xml" />

+    <AvailableItemName

+      Include="YASM">

+      <Targets>_YASM</Targets>

+    </AvailableItemName>

+  </ItemGroup>

+  <UsingTask

+    TaskName="YASM"

+    TaskFactory="XamlTaskFactory"

+    AssemblyName="Microsoft.Build.Tasks.v4.0">

+    <Task>$(MSBuildThisFileDirectory)$(MSBuildThisFileName).xml</Task>

+  </UsingTask>

+  <Target

+    Name="_YASM"

+    BeforeTargets="$(YASMBeforeTargets)"

+    AfterTargets="$(YASMAfterTargets)"

+    Condition="'@(YASM)' != ''"

+    DependsOnTargets="$(YASMDependsOn);ComputeYASMOutput"

+    Outputs="@(YASM->'%(ObjectFileName)')"

+    Inputs="@(YASM);%(YASM.AdditionalDependencies);$(MSBuildProjectFile)">

+    <ItemGroup

+      Condition="'@(SelectedFiles)' != ''">

+      <YASM

+        Remove="@(YASM)"

+        Condition="'%(Identity)' != '@(SelectedFiles)'" />

+    </ItemGroup>

+    <ItemGroup>

+      <YASM_tlog

+        Include="%(YASM.ObjectFileName)"

+        Condition="'%(YASM.ObjectFileName)' != '' and '%(YASM.ExcludedFromBuild)' != 'true'">

+        <Source>@(YASM, '|')</Source>

+      </YASM_tlog>

+    </ItemGroup>

+    <Message

+      Importance="High"

+      Text="%(YASM.ExecutionDescription)" />

+    <WriteLinesToFile

+      Condition="'@(YASM_tlog)' != '' and '%(YASM_tlog.ExcludedFromBuild)' != 'true'"

+      File="$(IntDir)$(ProjectName).write.1.tlog"

+      Lines="^%(YASM_tlog.Source);@(YASM_tlog->'%(Fullpath)')" />

+    <YASM

+      Condition="'@(YASM)' != '' and '%(YASM.ExcludedFromBuild)' != 'true'"

+      CommandLineTemplate="%(YASM.CommandLineTemplate)"

+      Debug="%(YASM.Debug)"

+      Defines="%(YASM.Defines)"

+      IncludePaths="%(YASM.IncludePaths)"

+      UnDefines="%(YASM.UnDefines)"

+      ObjectFileName="%(YASM.ObjectFileName)"

+      ListFileName="%(YASM.ListFileName)"

+      PreIncludeFile="%(YASM.PreIncludeFile)"

+      PreProc="%(YASM.PreProc)"

+      Parser="%(YASM.Parser)"

+      AdditionalOptions="%(YASM.AdditionalOptions)"

+      Inputs="@(YASM)" />

+  </Target>

+  <PropertyGroup>

+    <ComputeLinkInputsTargets>

+            $(ComputeLinkInputsTargets);

+            ComputeYASMOutput;

+          </ComputeLinkInputsTargets>

+    <ComputeLibInputsTargets>

+            $(ComputeLibInputsTargets);

+            ComputeYASMOutput;

+          </ComputeLibInputsTargets>

+  </PropertyGroup>

+  <Target

+    Name="ComputeYASMOutput"

+    Condition="'@(YASM)' != ''">

+    <ItemGroup>

+      <YASMDirsToMake

+        Condition="'@(YASM)' != '' and '%(YASM.ExcludedFromBuild)' != 'true' and !HasTrailingSlash('%(YASM.ObjectFileName)')"

+        Include="%(YASM.ObjectFileName)" />

+      <Link

+        Include="%(YASMDirsToMake.Identity)"

+        Condition="'%(Extension)'=='.obj' or '%(Extension)'=='.res' or '%(Extension)'=='.rsc' or '%(Extension)'=='.lib'" />

+      <Lib

+        Include="%(YASMDirsToMake.Identity)"

+        Condition="'%(Extension)'=='.obj' or '%(Extension)'=='.res' or '%(Extension)'=='.rsc' or '%(Extension)'=='.lib'" />

+      <ImpLib

+        Include="%(YASMDirsToMake.Identity)"

+        Condition="'%(Extension)'=='.obj' or '%(Extension)'=='.res' or '%(Extension)'=='.rsc' or '%(Extension)'=='.lib'" />

+    </ItemGroup>

+    <ItemGroup>

+      <YASMDirsToMake

+        Condition="'@(YASM)' != '' and '%(YASM.ExcludedFromBuild)' != 'true' and HasTrailingSlash('%(YASM.ObjectFileName)')"

+        Include="@(YASM->'%(ObjectFileName)%(Filename).obj')" />

+      <Link

+        Include="%(YASMDirsToMake.Identity)"

+        Condition="'%(Extension)'=='.obj' or '%(Extension)'=='.res' or '%(Extension)'=='.rsc' or '%(Extension)'=='.lib'" />

+      <Lib

+        Include="%(YASMDirsToMake.Identity)"

+        Condition="'%(Extension)'=='.obj' or '%(Extension)'=='.res' or '%(Extension)'=='.rsc' or '%(Extension)'=='.lib'" />

+      <ImpLib

+        Include="%(YASMDirsToMake.Identity)"

+        Condition="'%(Extension)'=='.obj' or '%(Extension)'=='.res' or '%(Extension)'=='.rsc' or '%(Extension)'=='.lib'" />

+    </ItemGroup>

+    <MakeDir

+      Directories="@(YASMDirsToMake->'%(RootDir)%(Directory)')" />

+  </Target>

+</Project>
\ No newline at end of file
diff --git a/Mkfiles/vc10/yasm.xml b/Mkfiles/vc10/vsyasm.xml
index 631b613d..a2170083 100644
--- a/Mkfiles/vc10/yasm.xml
+++ b/Mkfiles/vc10/vsyasm.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>

-<ProjectSchemaDefinitions xmlns="clr-namespace:Microsoft.Build.Framework.XamlTypes;assembly=Microsoft.Build.Framework" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:sys="clr-namespace:System;assembly=mscorlib" xmlns:transformCallback="Microsoft.Cpp.Dev10.ConvertPropertyCallback" xmlns:impl="clr-namespace:Microsoft.VisualStudio.Project.Contracts.Implementation;assembly=Microsoft.VisualStudio.Project.Contracts.Implementation">

+<ProjectSchemaDefinitions xmlns="clr-namespace:Microsoft.Build.Framework.XamlTypes;assembly=Microsoft.Build.Framework" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:sys="clr-namespace:System;assembly=mscorlib" xmlns:transformCallback="Microsoft.Cpp.Dev10.ConvertPropertyCallback">

   <Rule

     Name="YASM"

     PageTemplate="tool"

@@ -59,7 +59,7 @@
       DisplayName="Include Paths"

       Description="Set the paths for any additional include files"

       Separator=";"

-      Switch="-i [value]" />

+      Switch="-i &quot;[value]&quot;" />

     <StringListProperty

       Name="UnDefines"

       Subcategory="Pre-Defined Symbols"

@@ -74,21 +74,21 @@
       HelpContext="0"

       DisplayName="Object File Name"

       Description="Select the output file name"

-      Switch="-o [value]" />

+      Switch="-o &quot;[value]&quot;" />

     <StringProperty

       Name="ListFileName"

       Subcategory="Output"

       HelpContext="0"

       DisplayName="List File Name"

       Description="Select an output listing by setting its file name"

-      Switch="-l [value]" />

+      Switch="-l &quot;[value]&quot;" />

     <StringProperty

       Name="PreIncludeFile"

       Subcategory="Configuration"

       HelpContext="0"

       DisplayName="Pre Include File"

       Description="Select a pre-included file by setting its name"

-      Switch="-P [value]" />

+      Switch="-P &quot;[value]&quot;" />

     <EnumProperty

       Name="PreProc"

       Subcategory="Configuration"

diff --git a/Mkfiles/vc10/yasm.props b/Mkfiles/vc10/yasm.props
deleted file mode 100644
index 1d7edcae..00000000
--- a/Mkfiles/vc10/yasm.props
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-<PropertyGroup

-    Condition="'$(YASMBeforeTargets)' == '' and '$(YASMAfterTargets)' == '' and '$(ConfigurationType)' != 'Makefile'">

-    <YASMBeforeTargets>Midl</YASMBeforeTargets>

-    <YASMAfterTargets>CustomBuild</YASMAfterTargets>

-</PropertyGroup>

-<PropertyGroup>

-    <YASMDependsOn

-     Condition="'$(ConfigurationType)' != 'Makefile'">_SelectedFiles;$(YASMDependsOn)</YASMDependsOn>

-</PropertyGroup>

-<ItemDefinitionGroup>

-    <YASM>

-     <Debug>False</Debug>

-     <ObjectFileName>$(IntDir)%(FileName).obj</ObjectFileName>

-     <PreProc>0</PreProc>

-     <Parser>0</Parser>

-     <CommandLineTemplate>yasm -Xvc -f $(Platform) [AllOptions] [AdditionalOptions] [Inputs]</CommandLineTemplate>

-     <Outputs>%(ObjectFileName)</Outputs>

-     <ExecutionDescription>Assembling %(Filename)%(Extension)</ExecutionDescription>

-     <ShowOnlyRuleProperties>false</ShowOnlyRuleProperties>

-    </YASM>

-</ItemDefinitionGroup>

-</Project>

diff --git a/Mkfiles/vc10/yasm.targets b/Mkfiles/vc10/yasm.targets
deleted file mode 100644
index 92bdccc9..00000000
--- a/Mkfiles/vc10/yasm.targets
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <ItemGroup>

-    <PropertyPageSchema

-     Include="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).xml" />

-    <AvailableItemName

-     Include="YASM">

-      <Targets>_YASM</Targets>

-    </AvailableItemName>

-  </ItemGroup>

-  <UsingTask

-      TaskName="YASM"

-      TaskFactory="XamlTaskFactory"

-      AssemblyName="Microsoft.Build.Tasks.v4.0">

-    <Task>$(MSBuildThisFileDirectory)$(MSBuildThisFileName).xml</Task>

-  </UsingTask>

-  <Target

-      Name="_YASM"

-      BeforeTargets="$(YASMBeforeTargets)"

-      AfterTargets="$(YASMAfterTargets)"

-      Condition="'@(YASM)' != ''"

-      DependsOnTargets="$(YASMDependsOn);ComputeYASMOutput"

-      Outputs="@(YASM->Metadata('Outputs')->Distinct())"

-      Inputs="@(YASM);%(YASM.AdditionalDependencies);$(MSBuildProjectFile)">

-    <ItemGroup

-     Condition="'@(SelectedFiles)' != ''">

-      <YASM

-         Remove="@(YASM)"

-         Condition="'%(Identity)' != '@(SelectedFiles)'" />

-    </ItemGroup>

-    <ItemGroup>

-      <YASM_tlog

-         Include="%(YASM.Outputs)"

-         Condition="'%(YASM.Outputs)' != '' and '%(YASM.ExcludedFromBuild)' != 'true'">

-        <Source>@(YASM, '|')</Source>

-      </YASM_tlog>

-    </ItemGroup>

-    <Message

-     Importance="High"

-     Text="%(YASM.ExecutionDescription)"

-     Condition="'@(YASM)' != ''" />

-    <WriteLinesToFile

-     Condition="'@(YASM_tlog)' != '' and '%(YASM_tlog.ExcludedFromBuild)' != 'true'"

-     File="$(IntDir)$(ProjectName).write.1.tlog"

-     Lines="^%(YASM_tlog.Source);@(YASM_tlog->'%(Fullpath)')" />

-    <YASM

-     Condition="'@(YASM)' != '' and '%(YASM.ExcludedFromBuild)' != 'true'"

-     CommandLineTemplate="%(YASM.CommandLineTemplate)"

-     Debug="%(YASM.Debug)"

-     Defines="%(YASM.Defines)"

-     IncludePaths="%(YASM.IncludePaths)"

-     UnDefines="%(YASM.UnDefines)"

-     ObjectFileName="%(YASM.ObjectFileName)"

-     ListFileName="%(YASM.ListFileName)"

-     PreIncludeFile="%(YASM.PreIncludeFile)"

-     PreProc="%(YASM.PreProc)"

-     Parser="%(YASM.Parser)"

-     AdditionalOptions="%(YASM.AdditionalOptions)"

-     Inputs="@(YASM)" />

-  </Target>

-  <PropertyGroup>

-    <ComputeLinkInputsTargets>

-      $(ComputeLinkInputsTargets);

-      ComputeYASMOutput;

-    </ComputeLinkInputsTargets>

-    <ComputeLibInputsTargets>

-      $(ComputeLibInputsTargets);

-      ComputeYASMOutput;

-    </ComputeLibInputsTargets>

-  </PropertyGroup>

-  <Target

-      Name="ComputeYASMOutput"

-      Condition="'@(YASM)' != ''">

-    <ItemGroup>

-      <YASMDirsToMake

-         Condition="'@(YASM)' != '' and '%(YASM.ExcludedFromBuild)' != 'true'"

-         Include="%(YASM.ObjectFileName)" />

-      <Link

-         Include="%(YASMDirsToMake.Identity)"

-         Condition="'%(Extension)'=='.obj' or '%(Extension)'=='.res' or '%(Extension)'=='.rsc' or '%(Extension)'=='.lib'" />

-      <Lib

-         Include="%(YASMDirsToMake.Identity)"

-         Condition="'%(Extension)'=='.obj' or '%(Extension)'=='.res' or '%(Extension)'=='.rsc' or '%(Extension)'=='.lib'" />

-      <ImpLib

-         Include="%(YASMDirsToMake.Identity)"

-         Condition="'%(Extension)'=='.obj' or '%(Extension)'=='.res' or '%(Extension)'=='.rsc' or '%(Extension)'=='.lib'" />

-    </ItemGroup>

-    <MakeDir

-     Directories="@(YASMDirsToMake->'%(RootDir)%(Directory)')" />

-  </Target>

-</Project>