Improve VSYASM integration into Visual Studio 2010

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

diff --git a/Mkfiles/vc10/vsyasm.props b/Mkfiles/vc10/vsyasm.props
index 24d8972a57bac1f21fa69a221c31ec4f96acfc0d..c7a9749541425e5c0c3c579a00a00d93f1481a14 100644 (file)
--- a/Mkfiles/vc10/vsyasm.props
+++ b/Mkfiles/vc10/vsyasm.props
@@ -12,11 +12,11 @@
   <ItemDefinitionGroup>\r
     <YASM>\r
       <Debug>False</Debug>\r
-      <ObjectFileName>$(IntDir)</ObjectFileName>\r
+      <ObjectFile>$(IntDir)</ObjectFile>\r
       <PreProc>0</PreProc>\r
       <Parser>0</Parser>\r
       <CommandLineTemplate>vsyasm -Xvc -f $(Platform) [AllOptions] [AdditionalOptions] [Inputs]</CommandLineTemplate>\r
-      <Outputs>%(ObjectFileName)</Outputs>\r
+      <Outputs>%(ObjectFile)</Outputs>\r
       <ExecutionDescription>Assembling %(Filename)%(Extension)</ExecutionDescription>\r
       <ShowOnlyRuleProperties>false</ShowOnlyRuleProperties>\r
     </YASM>\r

diff --git a/Mkfiles/vc10/vsyasm.targets b/Mkfiles/vc10/vsyasm.targets
index a250afbb9476f6a5f08aa2d5f45b72bb6f12504c..c86180dd8764dc74a828326fd0945486a6428a2e 100644 (file)
--- a/Mkfiles/vc10/vsyasm.targets
+++ b/Mkfiles/vc10/vsyasm.targets
@@ -20,7 +20,7 @@
     AfterTargets="$(YASMAfterTargets)"\r
     Condition="'@(YASM)' != ''"\r
     DependsOnTargets="$(YASMDependsOn);ComputeYASMOutput"\r
-    Outputs="@(YASM->'%(ObjectFileName)')"\r
+    Outputs="@(YASM->'%(ObjectFile)')"\r
     Inputs="@(YASM);%(YASM.AdditionalDependencies);$(MSBuildProjectFile)">\r
     <ItemGroup\r
       Condition="'@(SelectedFiles)' != ''">\r
@@ -30,8 +30,8 @@
     </ItemGroup>\r
     <ItemGroup>\r
       <YASM_tlog\r
-        Include="%(YASM.ObjectFileName)"\r
-        Condition="'%(YASM.ObjectFileName)' != '' and '%(YASM.ExcludedFromBuild)' != 'true'">\r
+        Include="%(YASM.ObjectFile)"\r
+        Condition="'%(YASM.ObjectFile)' != '' and '%(YASM.ExcludedFromBuild)' != 'true'">\r
         <Source>@(YASM, '|')</Source>\r
       </YASM_tlog>\r
     </ItemGroup>\r
@@ -46,12 +46,16 @@
       Condition="'@(YASM)' != '' and '%(YASM.ExcludedFromBuild)' != 'true'"\r
       CommandLineTemplate="%(YASM.CommandLineTemplate)"\r
       Debug="%(YASM.Debug)"\r
-      Defines="%(YASM.Defines)"\r
+      PreIncludeFile="%(YASM.PreIncludeFile)"\r
       IncludePaths="%(YASM.IncludePaths)"\r
+      Defines="%(YASM.Defines)"\r
       UnDefines="%(YASM.UnDefines)"\r
-      ObjectFileName="%(YASM.ObjectFileName)"\r
-      ListFileName="%(YASM.ListFileName)"\r
-      PreIncludeFile="%(YASM.PreIncludeFile)"\r
+      ObjectFile="%(YASM.ObjectFile)"\r
+      ListFile="%(YASM.ListFile)"\r
+      MapFile="%(YASM.MapFile)"\r
+      ErrorFile="%(YASM.ErrorFile)"\r
+      SymbolPrefix="%(YASM.SymbolPrefix)"\r
+      SymbolSuffix="%(YASM.SymbolSuffix)"\r
       PreProc="%(YASM.PreProc)"\r
       Parser="%(YASM.Parser)"\r
       AdditionalOptions="%(YASM.AdditionalOptions)"\r
@@ -72,8 +76,8 @@
     Condition="'@(YASM)' != ''">\r
     <ItemGroup>\r
       <YASMDirsToMake\r
-        Condition="'@(YASM)' != '' and '%(YASM.ExcludedFromBuild)' != 'true' and !HasTrailingSlash('%(YASM.ObjectFileName)')"\r
-        Include="%(YASM.ObjectFileName)" />\r
+        Condition="'@(YASM)' != '' and '%(YASM.ExcludedFromBuild)' != 'true' and !HasTrailingSlash('%(YASM.ObjectFile)')"\r
+        Include="%(YASM.ObjectFile)" />\r
       <Link\r
         Include="%(YASMDirsToMake.Identity)"\r
         Condition="'%(Extension)'=='.obj' or '%(Extension)'=='.res' or '%(Extension)'=='.rsc' or '%(Extension)'=='.lib'" />\r
@@ -86,8 +90,8 @@
     </ItemGroup>\r
     <ItemGroup>\r
       <YASMDirsToMake\r
-        Condition="'@(YASM)' != '' and '%(YASM.ExcludedFromBuild)' != 'true' and HasTrailingSlash('%(YASM.ObjectFileName)')"\r
-        Include="@(YASM->'%(ObjectFileName)%(Filename).obj')" />\r
+        Condition="'@(YASM)' != '' and '%(YASM.ExcludedFromBuild)' != 'true' and HasTrailingSlash('%(YASM.ObjectFile)')"\r
+        Include="@(YASM->'%(ObjectFile)%(Filename).obj')" />\r
       <Link\r
         Include="%(YASMDirsToMake.Identity)"\r
         Condition="'%(Extension)'=='.obj' or '%(Extension)'=='.res' or '%(Extension)'=='.rsc' or '%(Extension)'=='.lib'" />\r

diff --git a/Mkfiles/vc10/vsyasm.xml b/Mkfiles/vc10/vsyasm.xml
index a2170083064c1b79f93a0c2274dda1451d76f158..9ee431939fe7d22185990470af89919b33013e48 100644 (file)
--- a/Mkfiles/vc10/vsyasm.xml
+++ b/Mkfiles/vc10/vsyasm.xml
@@ -5,18 +5,36 @@
     PageTemplate="tool"\r
     DisplayName="Yasm Assembler"\r
     Order="200">\r
+      \r
     <Rule.DataSource>\r
       <DataSource\r
         Persistence="ProjectFile"\r
         ItemType="YASM" />\r
     </Rule.DataSource>\r
+      \r
     <Rule.Categories>\r
+        \r
       <Category\r
         Name="General">\r
         <Category.DisplayName>\r
           <sys:String>General</sys:String>\r
         </Category.DisplayName>\r
       </Category>\r
+\r
+      <Category\r
+        Name="Symbols">\r
+          <Category.DisplayName>\r
+              <sys:String>Symbols</sys:String>\r
+          </Category.DisplayName>\r
+      </Category>\r
+\r
+      <Category\r
+        Name="Files">\r
+          <Category.DisplayName>\r
+              <sys:String>Files</sys:String>\r
+          </Category.DisplayName>\r
+      </Category>\r
+        \r
       <Category\r
         Name="Command Line"\r
         Subtype="CommandLine">\r
@@ -24,7 +42,9 @@
           <sys:String>Command Line</sys:String>\r
         </Category.DisplayName>\r
       </Category>\r
+        \r
     </Rule.Categories>\r
+\r
     <StringListProperty\r
       Name="Inputs"\r
       Category="Command Line"\r
@@ -37,21 +57,15 @@
           SourceType="Item" />\r
       </StringListProperty.DataSource>\r
     </StringListProperty>\r
+    \r
     <BoolProperty\r
       Name="Debug"\r
-      Subcategory="Output"\r
+      Subcategory="Configuration"\r
       HelpContext="0"\r
       DisplayName="Debug Information"\r
       Description="Generate debugging information"\r
       Switch="-g cv8" />\r
-    <StringListProperty\r
-      Name="Defines"\r
-      Subcategory="Pre-Defined Symbols"\r
-      HelpContext="0"\r
-      DisplayName="Definitions"\r
-      Description="Specify pre-defined symbols ('symbol' or 'symbol = value') "\r
-      Separator=";"\r
-      Switch="-D [value]" />\r
+\r
     <StringListProperty\r
       Name="IncludePaths"\r
       Subcategory="Configuration"\r
@@ -60,35 +74,89 @@
       Description="Set the paths for any additional include files"\r
       Separator=";"\r
       Switch="-i &quot;[value]&quot;" />\r
+\r
+    <StringListProperty\r
+      Name="Defines"\r
+      Category="Symbols"\r
+      Subcategory="Pre-Defined Symbols"\r
+      HelpContext="0"\r
+      DisplayName="Defined Symbols"\r
+      Description="Specify pre-defined symbols ('symbol' or 'symbol = value') "\r
+      Separator=";"\r
+      Switch="-d &quot;[value]&quot;" />\r
+    \r
     <StringListProperty\r
       Name="UnDefines"\r
+      Category="Symbols"\r
       Subcategory="Pre-Defined Symbols"\r
       HelpContext="0"\r
-      DisplayName="Remove Definitions"\r
+      DisplayName="Remove Symbols"\r
       Description="Remove pre-defined symbols "\r
       Separator=";"\r
-      Switch="-u [value]" />\r
+      Switch="-u &quot;[value]&quot;" />\r
+    \r
     <StringProperty\r
-      Name="ObjectFileName"\r
+      Name="ObjectFile"\r
       Subcategory="Output"\r
       HelpContext="0"\r
       DisplayName="Object File Name"\r
       Description="Select the output file name"\r
       Switch="-o &quot;[value]&quot;" />\r
+    \r
     <StringProperty\r
-      Name="ListFileName"\r
+      Name="ListFile"\r
+      Category="Files"\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 &quot;[value]&quot;" />\r
+    \r
     <StringProperty\r
       Name="PreIncludeFile"\r
+      Category="Files"\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 &quot;[value]&quot;" />\r
+      \r
+    <StringProperty\r
+      Name="MapFile"\r
+      Category="Files"\r
+      Subcategory="Output"\r
+      HelpContext="0"\r
+      DisplayName="Map File Name"\r
+      Description="Select a map output by setting its file name"\r
+      Switch="--mapdir= &quot;[value]&quot;" />\r
+\r
+    <StringProperty\r
+      Name="ErrorFile"\r
+      Category="Files"\r
+      Subcategory="Output"\r
+      HelpContext="0"\r
+      DisplayName="Error File Name"\r
+      Description="Send error/warning messages to a file by setting its name"\r
+      Switch="-E &quot;[value]&quot;" />\r
+\r
+    <StringProperty\r
+      Name="SymbolPrefix"\r
+      Category="Symbols"\r
+      Subcategory="Symbols"\r
+      HelpContext="0"\r
+      DisplayName="External Symbol Prefix"\r
+      Description="Prepend symbol to all external symbols"\r
+      Switch="--prefix &quot;[value]&quot;" />\r
+\r
+    <StringProperty\r
+      Name="SymbolSuffix"\r
+      Category="Symbols"\r
+      Subcategory="Symbols"\r
+      HelpContext="0"\r
+      DisplayName="External Symbol Suffix"\r
+      Description="Append symbol to all external symbols"\r
+      Switch="--suffix &quot;[value]&quot;" />\r
+\r
     <EnumProperty\r
       Name="PreProc"\r
       Subcategory="Configuration"\r
@@ -104,6 +172,7 @@
         DisplayName="Raw"\r
         Switch="-rraw" />\r
     </EnumProperty>\r
+    \r
     <EnumProperty\r
       Name="Parser"\r
       Subcategory="Configuration"\r
@@ -119,11 +188,13 @@
         DisplayName="Gas"\r
         Switch="-pgas" />\r
     </EnumProperty>\r
+    \r
     <StringProperty\r
       Name="CommandLineTemplate"\r
       DisplayName="Command Line"\r
       Visible="False"\r
       IncludeInCommandLine="False" />\r
+    \r
     <DynamicEnumProperty\r
       Name="YASMBeforeTargets"\r
       Category="General"\r
@@ -146,6 +217,7 @@
           HasConfigurationCondition="true" />\r
       </DynamicEnumProperty.DataSource>\r
     </DynamicEnumProperty>\r
+    \r
     <DynamicEnumProperty\r
       Name="YASMAfterTargets"\r
       Category="General"\r
@@ -169,21 +241,25 @@
           HasConfigurationCondition="true" />\r
       </DynamicEnumProperty.DataSource>\r
     </DynamicEnumProperty>\r
+    \r
     <StringListProperty\r
       Name="Outputs"\r
       DisplayName="Outputs"\r
       Visible="False"\r
       IncludeInCommandLine="False" />\r
+    \r
     <StringProperty\r
       Name="ExecutionDescription"\r
       DisplayName="Execution Description"\r
       Visible="False"\r
       IncludeInCommandLine="False" />\r
+    \r
     <StringListProperty\r
       Name="AdditionalDependencies"\r
       DisplayName="Additional Dependencies"\r
       IncludeInCommandLine="False"\r
       Visible="true" />\r
+    \r
     <StringProperty\r
       Subtype="AdditionalOptions"\r
       Name="AdditionalOptions"\r
@@ -196,6 +272,7 @@
       </StringProperty.Description>\r
     </StringProperty>\r
   </Rule>\r
+  \r
   <ItemType\r
     Name="YASM"\r
     DisplayName="Yasm Assembler" />\r