Merge branch 'sg/line-log-tree-diff-optim'

diff --git a/contrib/buildsystems/Generators/Vcproj.pm b/contrib/buildsystems/Generators/Vcproj.pm
index d862cae50343477d61c049a6900c24261bc2b3b5..737647e76afd423817143e197c86c97dfa46ad8d 100644 (file)
--- a/contrib/buildsystems/Generators/Vcproj.pm
+++ b/contrib/buildsystems/Generators/Vcproj.pm
@@ -59,6 +59,8 @@ sub createLibProject {
     my $includes= join(";", sort(map(""$rel_dir\\$_"", @{$$build_structure{"LIBS_${libname}_INCLUDES"}})));
     my $cflags  = join(" ", sort(@{$$build_structure{"LIBS_${libname}_CFLAGS"}}));
     $cflags =~ s/\"/"/g;
+    $cflags =~ s/</&lt;/g;
+    $cflags =~ s/>/&gt;/g;
 
     my $cflags_debug = $cflags;
     $cflags_debug =~ s/-MT/-MTd/;
@@ -80,6 +82,8 @@ sub createLibProject {
 
     $defines =~ s/-D//g;
     $defines =~ s/\"/\\&quot;/g;
+    $defines =~ s/</&lt;/g;
+    $defines =~ s/>/&gt;/g;
     $defines =~ s/\'//g;
     $includes =~ s/-I//g;
     mkdir "$target" || die "Could not create the directory $target for lib project!\n";
@@ -115,9 +119,6 @@ sub createLibProject {
                        <Tool
                                Name="VCXMLDataGeneratorTool"
                        />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
                        <Tool
                                Name="VCMIDLTool"
                        />
@@ -181,9 +182,6 @@ sub createLibProject {
                        <Tool
                                Name="VCXMLDataGeneratorTool"
                        />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
                        <Tool
                                Name="VCMIDLTool"
                        />
@@ -277,6 +275,8 @@ sub createAppProject {
     my $includes= join(";", sort(map("&quot;$rel_dir\\$_&quot;", @{$$build_structure{"APPS_${appname}_INCLUDES"}})));
     my $cflags  = join(" ", sort(@{$$build_structure{"APPS_${appname}_CFLAGS"}}));
     $cflags =~ s/\"/&quot;/g;
+    $cflags =~ s/</&lt;/g;
+    $cflags =~ s/>/&gt;/g;
 
     my $cflags_debug = $cflags;
     $cflags_debug =~ s/-MT/-MTd/;
@@ -303,6 +303,8 @@ sub createAppProject {
 
     $defines =~ s/-D//g;
     $defines =~ s/\"/\\&quot;/g;
+    $defines =~ s/</&lt;/g;
+    $defines =~ s/>/&gt;/g;
     $defines =~ s/\'//g;
     $defines =~ s/\\\\/\\/g;
     $includes =~ s/-I//g;
@@ -339,9 +341,6 @@ sub createAppProject {
                        <Tool
                                Name="VCXMLDataGeneratorTool"
                        />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
                        <Tool
                                Name="VCMIDLTool"
                        />
@@ -410,9 +409,6 @@ sub createAppProject {
                        <Tool
                                Name="VCXMLDataGeneratorTool"
                        />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
                        <Tool
                                Name="VCMIDLTool"
                        />