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

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

diff --git a/Mkfiles/vc10/vsyasm.props b/Mkfiles/vc10/vsyasm.props
new file mode 100644 (file)
index 0000000..4f2cc76
--- /dev/null
+++ b/Mkfiles/vc10/vsyasm.props
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <PropertyGroup\r
+    Condition="'$(YASMBeforeTargets)' == '' and '$(YASMAfterTargets)' == '' and '$(ConfigurationType)' != 'Makefile'">\r
+    <YASMBeforeTargets>Midl</YASMBeforeTargets>\r
+    <YASMAfterTargets>CustomBuild</YASMAfterTargets>\r
+  </PropertyGroup>\r
+  <PropertyGroup>\r
+    <YASMDependsOn\r
+      Condition="'$(ConfigurationType)' != 'Makefile'">_SelectedFiles;$(YASMDependsOn)</YASMDependsOn>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+    <YASM>\r
+      <Debug>False</Debug>\r
+      <ObjectFileName>$(IntDir)$(TargetName)</ObjectFileName>\r
+      <PreProc>0</PreProc>\r
+      <Parser>0</Parser>\r
+      <CommandLineTemplate>vsyasm -Xvc -f $(Platform) [AllOptions] [AdditionalOptions] [Inputs]</CommandLineTemplate>\r
+      <Outputs>%(ObjectFileName)</Outputs>\r
+      <ExecutionDescription>Assembling %(Filename)%(Extension)</ExecutionDescription>\r
+      <ShowOnlyRuleProperties>false</ShowOnlyRuleProperties>\r
+    </YASM>\r
+  </ItemDefinitionGroup>\r
+</Project>
\ No newline at end of file

diff --git a/Mkfiles/vc10/vsyasm.targets b/Mkfiles/vc10/vsyasm.targets
new file mode 100644 (file)
index 0000000..a250afb
--- /dev/null
+++ b/Mkfiles/vc10/vsyasm.targets
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup>\r
+    <PropertyPageSchema\r
+      Include="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).xml" />\r
+    <AvailableItemName\r
+      Include="YASM">\r
+      <Targets>_YASM</Targets>\r
+    </AvailableItemName>\r
+  </ItemGroup>\r
+  <UsingTask\r
+    TaskName="YASM"\r
+    TaskFactory="XamlTaskFactory"\r
+    AssemblyName="Microsoft.Build.Tasks.v4.0">\r
+    <Task>$(MSBuildThisFileDirectory)$(MSBuildThisFileName).xml</Task>\r
+  </UsingTask>\r
+  <Target\r
+    Name="_YASM"\r
+    BeforeTargets="$(YASMBeforeTargets)"\r
+    AfterTargets="$(YASMAfterTargets)"\r
+    Condition="'@(YASM)' != ''"\r
+    DependsOnTargets="$(YASMDependsOn);ComputeYASMOutput"\r
+    Outputs="@(YASM->'%(ObjectFileName)')"\r
+    Inputs="@(YASM);%(YASM.AdditionalDependencies);$(MSBuildProjectFile)">\r
+    <ItemGroup\r
+      Condition="'@(SelectedFiles)' != ''">\r
+      <YASM\r
+        Remove="@(YASM)"\r
+        Condition="'%(Identity)' != '@(SelectedFiles)'" />\r
+    </ItemGroup>\r
+    <ItemGroup>\r
+      <YASM_tlog\r
+        Include="%(YASM.ObjectFileName)"\r
+        Condition="'%(YASM.ObjectFileName)' != '' and '%(YASM.ExcludedFromBuild)' != 'true'">\r
+        <Source>@(YASM, '|')</Source>\r
+      </YASM_tlog>\r
+    </ItemGroup>\r
+    <Message\r
+      Importance="High"\r
+      Text="%(YASM.ExecutionDescription)" />\r
+    <WriteLinesToFile\r
+      Condition="'@(YASM_tlog)' != '' and '%(YASM_tlog.ExcludedFromBuild)' != 'true'"\r
+      File="$(IntDir)$(ProjectName).write.1.tlog"\r
+      Lines="^%(YASM_tlog.Source);@(YASM_tlog->'%(Fullpath)')" />\r
+    <YASM\r
+      Condition="'@(YASM)' != '' and '%(YASM.ExcludedFromBuild)' != 'true'"\r
+      CommandLineTemplate="%(YASM.CommandLineTemplate)"\r
+      Debug="%(YASM.Debug)"\r
+      Defines="%(YASM.Defines)"\r
+      IncludePaths="%(YASM.IncludePaths)"\r
+      UnDefines="%(YASM.UnDefines)"\r
+      ObjectFileName="%(YASM.ObjectFileName)"\r
+      ListFileName="%(YASM.ListFileName)"\r
+      PreIncludeFile="%(YASM.PreIncludeFile)"\r
+      PreProc="%(YASM.PreProc)"\r
+      Parser="%(YASM.Parser)"\r
+      AdditionalOptions="%(YASM.AdditionalOptions)"\r
+      Inputs="@(YASM)" />\r
+  </Target>\r
+  <PropertyGroup>\r
+    <ComputeLinkInputsTargets>\r
+            $(ComputeLinkInputsTargets);\r
+            ComputeYASMOutput;\r
+          </ComputeLinkInputsTargets>\r
+    <ComputeLibInputsTargets>\r
+            $(ComputeLibInputsTargets);\r
+            ComputeYASMOutput;\r
+          </ComputeLibInputsTargets>\r
+  </PropertyGroup>\r
+  <Target\r
+    Name="ComputeYASMOutput"\r
+    Condition="'@(YASM)' != ''">\r
+    <ItemGroup>\r
+      <YASMDirsToMake\r
+        Condition="'@(YASM)' != '' and '%(YASM.ExcludedFromBuild)' != 'true' and !HasTrailingSlash('%(YASM.ObjectFileName)')"\r
+        Include="%(YASM.ObjectFileName)" />\r
+      <Link\r
+        Include="%(YASMDirsToMake.Identity)"\r
+        Condition="'%(Extension)'=='.obj' or '%(Extension)'=='.res' or '%(Extension)'=='.rsc' or '%(Extension)'=='.lib'" />\r
+      <Lib\r
+        Include="%(YASMDirsToMake.Identity)"\r
+        Condition="'%(Extension)'=='.obj' or '%(Extension)'=='.res' or '%(Extension)'=='.rsc' or '%(Extension)'=='.lib'" />\r
+      <ImpLib\r
+        Include="%(YASMDirsToMake.Identity)"\r
+        Condition="'%(Extension)'=='.obj' or '%(Extension)'=='.res' or '%(Extension)'=='.rsc' or '%(Extension)'=='.lib'" />\r
+    </ItemGroup>\r
+    <ItemGroup>\r
+      <YASMDirsToMake\r
+        Condition="'@(YASM)' != '' and '%(YASM.ExcludedFromBuild)' != 'true' and HasTrailingSlash('%(YASM.ObjectFileName)')"\r
+        Include="@(YASM->'%(ObjectFileName)%(Filename).obj')" />\r
+      <Link\r
+        Include="%(YASMDirsToMake.Identity)"\r
+        Condition="'%(Extension)'=='.obj' or '%(Extension)'=='.res' or '%(Extension)'=='.rsc' or '%(Extension)'=='.lib'" />\r
+      <Lib\r
+        Include="%(YASMDirsToMake.Identity)"\r
+        Condition="'%(Extension)'=='.obj' or '%(Extension)'=='.res' or '%(Extension)'=='.rsc' or '%(Extension)'=='.lib'" />\r
+      <ImpLib\r
+        Include="%(YASMDirsToMake.Identity)"\r
+        Condition="'%(Extension)'=='.obj' or '%(Extension)'=='.res' or '%(Extension)'=='.rsc' or '%(Extension)'=='.lib'" />\r
+    </ItemGroup>\r
+    <MakeDir\r
+      Directories="@(YASMDirsToMake->'%(RootDir)%(Directory)')" />\r
+  </Target>\r
+</Project>
\ No newline at end of file

diff --git a/Mkfiles/vc10/yasm.xml b/Mkfiles/vc10/vsyasm.xml
similarity index 92%
rename from Mkfiles/vc10/yasm.xml
rename to Mkfiles/vc10/vsyasm.xml
index 631b613dcfa32d12ef0644f3d666b0d0e983ea19..a2170083064c1b79f93a0c2274dda1451d76f158 100644 (file)
--- a/Mkfiles/vc10/yasm.xml
+++ b/Mkfiles/vc10/vsyasm.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>\r
-<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">\r
+<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">\r
   <Rule\r
     Name="YASM"\r
     PageTemplate="tool"\r
@@ -59,7 +59,7 @@
       DisplayName="Include Paths"\r
       Description="Set the paths for any additional include files"\r
       Separator=";"\r
-      Switch="-i [value]" />\r
+      Switch="-i &quot;[value]&quot;" />\r
     <StringListProperty\r
       Name="UnDefines"\r
       Subcategory="Pre-Defined Symbols"\r
@@ -74,21 +74,21 @@
       HelpContext="0"\r
       DisplayName="Object File Name"\r
       Description="Select the output file name"\r
-      Switch="-o [value]" />\r
+      Switch="-o &quot;[value]&quot;" />\r
     <StringProperty\r
       Name="ListFileName"\r
       Subcategory="Output"\r
       HelpContext="0"\r
       DisplayName="List File Name"\r
       Description="Select an output listing by setting its file name"\r
-      Switch="-l [value]" />\r
+      Switch="-l &quot;[value]&quot;" />\r
     <StringProperty\r
       Name="PreIncludeFile"\r
       Subcategory="Configuration"\r
       HelpContext="0"\r
       DisplayName="Pre Include File"\r
       Description="Select a pre-included file by setting its name"\r
-      Switch="-P [value]" />\r
+      Switch="-P &quot;[value]&quot;" />\r
     <EnumProperty\r
       Name="PreProc"\r
       Subcategory="Configuration"\r

diff --git a/Mkfiles/vc10/yasm.props b/Mkfiles/vc10/yasm.props
deleted file mode 100644 (file)
index 1d7edca..0000000
--- a/Mkfiles/vc10/yasm.props
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-<PropertyGroup\r
-    Condition="'$(YASMBeforeTargets)' == '' and '$(YASMAfterTargets)' == '' and '$(ConfigurationType)' != 'Makefile'">\r
-    <YASMBeforeTargets>Midl</YASMBeforeTargets>\r
-    <YASMAfterTargets>CustomBuild</YASMAfterTargets>\r
-</PropertyGroup>\r
-<PropertyGroup>\r
-    <YASMDependsOn\r
-     Condition="'$(ConfigurationType)' != 'Makefile'">_SelectedFiles;$(YASMDependsOn)</YASMDependsOn>\r
-</PropertyGroup>\r
-<ItemDefinitionGroup>\r
-    <YASM>\r
-     <Debug>False</Debug>\r
-     <ObjectFileName>$(IntDir)%(FileName).obj</ObjectFileName>\r
-     <PreProc>0</PreProc>\r
-     <Parser>0</Parser>\r
-     <CommandLineTemplate>yasm -Xvc -f $(Platform) [AllOptions] [AdditionalOptions] [Inputs]</CommandLineTemplate>\r
-     <Outputs>%(ObjectFileName)</Outputs>\r
-     <ExecutionDescription>Assembling %(Filename)%(Extension)</ExecutionDescription>\r
-     <ShowOnlyRuleProperties>false</ShowOnlyRuleProperties>\r
-    </YASM>\r
-</ItemDefinitionGroup>\r
-</Project>\r

diff --git a/Mkfiles/vc10/yasm.targets b/Mkfiles/vc10/yasm.targets
deleted file mode 100644 (file)
index 92bdccc..0000000
--- a/Mkfiles/vc10/yasm.targets
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <ItemGroup>\r
-    <PropertyPageSchema\r
-     Include="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).xml" />\r
-    <AvailableItemName\r
-     Include="YASM">\r
-      <Targets>_YASM</Targets>\r
-    </AvailableItemName>\r
-  </ItemGroup>\r
-  <UsingTask\r
-      TaskName="YASM"\r
-      TaskFactory="XamlTaskFactory"\r
-      AssemblyName="Microsoft.Build.Tasks.v4.0">\r
-    <Task>$(MSBuildThisFileDirectory)$(MSBuildThisFileName).xml</Task>\r
-  </UsingTask>\r
-  <Target\r
-      Name="_YASM"\r
-      BeforeTargets="$(YASMBeforeTargets)"\r
-      AfterTargets="$(YASMAfterTargets)"\r
-      Condition="'@(YASM)' != ''"\r
-      DependsOnTargets="$(YASMDependsOn);ComputeYASMOutput"\r
-      Outputs="@(YASM->Metadata('Outputs')->Distinct())"\r
-      Inputs="@(YASM);%(YASM.AdditionalDependencies);$(MSBuildProjectFile)">\r
-    <ItemGroup\r
-     Condition="'@(SelectedFiles)' != ''">\r
-      <YASM\r
-         Remove="@(YASM)"\r
-         Condition="'%(Identity)' != '@(SelectedFiles)'" />\r
-    </ItemGroup>\r
-    <ItemGroup>\r
-      <YASM_tlog\r
-         Include="%(YASM.Outputs)"\r
-         Condition="'%(YASM.Outputs)' != '' and '%(YASM.ExcludedFromBuild)' != 'true'">\r
-        <Source>@(YASM, '|')</Source>\r
-      </YASM_tlog>\r
-    </ItemGroup>\r
-    <Message\r
-     Importance="High"\r
-     Text="%(YASM.ExecutionDescription)"\r
-     Condition="'@(YASM)' != ''" />\r
-    <WriteLinesToFile\r
-     Condition="'@(YASM_tlog)' != '' and '%(YASM_tlog.ExcludedFromBuild)' != 'true'"\r
-     File="$(IntDir)$(ProjectName).write.1.tlog"\r
-     Lines="^%(YASM_tlog.Source);@(YASM_tlog->'%(Fullpath)')" />\r
-    <YASM\r
-     Condition="'@(YASM)' != '' and '%(YASM.ExcludedFromBuild)' != 'true'"\r
-     CommandLineTemplate="%(YASM.CommandLineTemplate)"\r
-     Debug="%(YASM.Debug)"\r
-     Defines="%(YASM.Defines)"\r
-     IncludePaths="%(YASM.IncludePaths)"\r
-     UnDefines="%(YASM.UnDefines)"\r
-     ObjectFileName="%(YASM.ObjectFileName)"\r
-     ListFileName="%(YASM.ListFileName)"\r
-     PreIncludeFile="%(YASM.PreIncludeFile)"\r
-     PreProc="%(YASM.PreProc)"\r
-     Parser="%(YASM.Parser)"\r
-     AdditionalOptions="%(YASM.AdditionalOptions)"\r
-     Inputs="@(YASM)" />\r
-  </Target>\r
-  <PropertyGroup>\r
-    <ComputeLinkInputsTargets>\r
-      $(ComputeLinkInputsTargets);\r
-      ComputeYASMOutput;\r
-    </ComputeLinkInputsTargets>\r
-    <ComputeLibInputsTargets>\r
-      $(ComputeLibInputsTargets);\r
-      ComputeYASMOutput;\r
-    </ComputeLibInputsTargets>\r
-  </PropertyGroup>\r
-  <Target\r
-      Name="ComputeYASMOutput"\r
-      Condition="'@(YASM)' != ''">\r
-    <ItemGroup>\r
-      <YASMDirsToMake\r
-         Condition="'@(YASM)' != '' and '%(YASM.ExcludedFromBuild)' != 'true'"\r
-         Include="%(YASM.ObjectFileName)" />\r
-      <Link\r
-         Include="%(YASMDirsToMake.Identity)"\r
-         Condition="'%(Extension)'=='.obj' or '%(Extension)'=='.res' or '%(Extension)'=='.rsc' or '%(Extension)'=='.lib'" />\r
-      <Lib\r
-         Include="%(YASMDirsToMake.Identity)"\r
-         Condition="'%(Extension)'=='.obj' or '%(Extension)'=='.res' or '%(Extension)'=='.rsc' or '%(Extension)'=='.lib'" />\r
-      <ImpLib\r
-         Include="%(YASMDirsToMake.Identity)"\r
-         Condition="'%(Extension)'=='.obj' or '%(Extension)'=='.res' or '%(Extension)'=='.rsc' or '%(Extension)'=='.lib'" />\r
-    </ItemGroup>\r
-    <MakeDir\r
-     Directories="@(YASMDirsToMake->'%(RootDir)%(Directory)')" />\r
-  </Target>\r
-</Project>\r