ChangeLogTag: Thu Aug 5 03:49:19 UTC 2010 Chad Elliott <elliott_c@ociweb.com>

20 files changed, 182 insertions, 66 deletions

diff --git a/ChangeLog b/ChangeLog
index 96aca2f6..d095aa37 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,50 @@
+Thu Aug  5 03:49:19 UTC 2010  Chad Elliott  <elliott_c@ociweb.com>
+
+        * config/glib.mpb:
+        * config/splice_ts_defaults.mpb:
+        * config/splicelib.mpb:
+        * config/xerces.mpb:
+        * docs/html/CDT6.html:
+        * history/ChangeLog-3_7:
+        * modules/Creator.pm:
+        * modules/MakeProjectBase.pm:
+        * modules/MakeProjectCreator.pm:
+        * modules/ProjectCreator.pm:
+        * modules/VC8WorkspaceCreator.pm:
+        * templates/cdt6cproject.mpd:
+        * templates/cdt6platforms.mpt:
+        * templates/wix.mpd:
+
+          Removed trailing whitespace.
+
+        * docs/html/MakeProjectCreator.html:
+
+          Better explained the TemplateParser 'eval' function and documented
+          the new TemplateParser 'set' and 'translate_vars' functions.
+
+        * docs/templates/vc10.txt:
+
+          Started the vc10 template variable documentation.
+
+        * modules/CDT6WorkspaceCreator.pm:
+
+          Use the WorkspaceCreator::create_command_line_string() function
+          instead of printing the "$0 @ARGV" string.
+
+        * modules/TemplateParser.pm:
+
+          Replaced the use of die with setting the 'error_in_handle' data
+          member to bring errors to the users attention and added the 'set'
+          template function.
+
+        * templates/vc10.mpd:
+
+          The OpenMP template variable is interchangable with the
+          OpenMPSupport template variable.  Older versions of Visual Studio
+          used OpenMP.
+
 Wed Aug  4 20:32:14 UTC 2010  Chris Cleeland  <cleeland@ociweb.com>
-        
+
         Merged out changes from the Eclipse CDT branch to support
         side-by-side builds from different platforms and configurations
         and to more fully support cross-platform builds.
@@ -9,7 +54,7 @@ Wed Aug  4 20:32:14 UTC 2010  Chris Cleeland  <cleeland@ociweb.com>
           Changed postbuild "installation" scripts so that they put
           libraries into platform-config specific subdirectories in order to
           support multiple builds concurrently.
-        
+
           Added platform-specific lib directory to library paths.
 
           Omit generation of build information for platforms when a
@@ -19,9 +64,9 @@ Wed Aug  4 20:32:14 UTC 2010  Chris Cleeland  <cleeland@ociweb.com>
           variable into CDT6 projects via fill_value.
 
         * modules/CDT6WorkspaceCreator.pm: Minor changes.
-        
+
         * modules/TemplateParser.pm:
-        
+
           Added new keyword/function "vars_equal", to compare the values
           of two template variables for equality.
 
diff --git a/config/glib.mpb b/config/glib.mpb
index 509bc7e8..794e00cd 100644
--- a/config/glib.mpb
+++ b/config/glib.mpb
@@ -12,6 +12,6 @@ project {
   includes      += $(GLIB_ROOT)/include/glib-$(GLIB_VERSION) \
                    $(GLIB_ROOT)/lib/glib-$(GLIB_VERSION)/include
   libpaths      += $(GLIB_ROOT)/lib
-  
+
   lit_libs      += glib-$(GLIB_VERSION)
 }
diff --git a/config/splice_ts_defaults.mpb b/config/splice_ts_defaults.mpb
index 4e2affb6..a5c270ea 100644
--- a/config/splice_ts_defaults.mpb
+++ b/config/splice_ts_defaults.mpb
@@ -18,6 +18,6 @@ project : taoidldefaults {
   splice_ts_flags += \
     -I <%quote%>$(OSPL_HOME)/include/dcps/C++/CCPP/$(SPLICE_ORB)<%quote%> \
     -C -l cpp -b CCPP/$(SPLICE_ORB)
-    
+
   idlflags += -I <%quote%>$(OSPL_HOME)/custom_lib/ccpp<%quote%>
 }
diff --git a/config/splicelib.mpb b/config/splicelib.mpb
index 62d1f22f..679c1831 100644
--- a/config/splicelib.mpb
+++ b/config/splicelib.mpb
@@ -14,7 +14,7 @@ project {
   specific(prop:microsoft) {
     DisableSpecificWarnings += 4101
   }
-  
+
   verbatim(gnuace, macros) {
     override no_hidden_visibility = 1
   }
diff --git a/config/xerces.mpb b/config/xerces.mpb
index 338bdb54..ad77c812 100644
--- a/config/xerces.mpb
+++ b/config/xerces.mpb
@@ -10,7 +10,7 @@ feature(xerces2) {
 
   specific(prop:microsoft) {
     xerceslib = xerces-c_2
-  
+
     // Linking the optimized version of xerces-c_2 into a debug application
     // has been known to cause run-time issues (as of 4/25/2005), so we
     // will link in the debug version for the "Debug" configuration.
@@ -35,7 +35,7 @@ feature(xerces3) {
 
   specific(prop:microsoft) {
     xerceslib = xerces-c_3
-  
+
     // Linking the optimized version of xerces-c_2 into a debug application
     // has been known to cause run-time issues (as of 4/25/2005), so we
     // will link in the debug version for the "Debug" configuration.
diff --git a/docs/html/CDT6.html b/docs/html/CDT6.html
index 32a011ec..4573112a 100644
--- a/docs/html/CDT6.html
+++ b/docs/html/CDT6.html
@@ -24,7 +24,7 @@
     The project type generates eclipse projects from generic mpc
     files.  These Eclipse/CDT projects can then be imported into a user's
     workspace and built using CDT's internal builder.</li>
-    
+
     <li class="body">MPC's CDT6 Project Type currently supports Linux
     and Windows as both host and target platforms.</li>
  </div>
@@ -62,7 +62,7 @@
     ACE/TAO/CIAO. A minimum of 768Mb or more is suggested. This can be
     done on the command line launch of eclipse, or in the
     <code>eclipse.ini</code> file.</li>
-    
+
     </ul>
  </div>
 
@@ -75,7 +75,7 @@
     Eclipse's usual requirement that source files reside inside the Eclipse project
     directory.  However, the linked resource feature also comes with
     restrictions; see <a href="#fullpath">the note</a> for details.
-    
+
     <h4>Generic workflow</h4>
     Presuming .mpc files already exist:
     <ol>
@@ -86,11 +86,11 @@
    <h4>Workflow for building ACE/TAO</h4>
    <ol>
      <li>Check out a copy of ACE/TAO.</li>
-     
+
      <li>Configure ACE/TAO for your target(s) by setting up
    <samp>config.h</samp>.
      </li>
-   
+
      <li>Set up environment variables (<var>ACE_ROOT</var>,
      <var>TAO_ROOT</var>, etc.), <var>PATH</var>,
      <var>LD_LIBRARY_PATH</var> (or similar), etc.
@@ -100,7 +100,7 @@
      are necessary, make appropriate changes in
      <samp>default.features</samp>.
      </li>
-   
+
      <li>Generate projects using <samp>-type cdt6</samp> insuring the
      use of <samp>mwc.pl</samp> from within ACE, e.g.,
      <blockquote><pre>
@@ -159,7 +159,7 @@ $ mwc.pl -type cdt6 TAO_ACE.mwc
      Automatically</strong>, then builds will start.  Regardless, the
      C++ indexer will run in the background across the source of all projects.</li>
    </ol>
-   
+
    <h4>Building A Project</h4>
    To build a project or set of projects, select the project (or
    projects) in the <em>Project</em> pane, then select
@@ -216,7 +216,7 @@ $ mwc.pl -type cdt6 -value_template platforms="linux cellppu" TAO_ACE.mwc
   In the example given above, <samp>cellppu</samp> is the name of the
   platform for cross-compilation.
   </p>
-  
+
   <h4>Adding a New Platform<a name="addplatform"></a></h4>
   To add a new platform, particularly one for cross-compilation, it's
   probably easiest to start from an existing scope, e.g.,
@@ -278,7 +278,7 @@ $ mwc.pl -type cdt6 -value_template platforms="linux cellppu" TAO_ACE.mwc
     IDL compiler works but does not generate perfect hash lookups.</li>
     </ol>
   </div>
- 
+
 </div>
 
 
diff --git a/docs/html/MakeProjectCreator.html b/docs/html/MakeProjectCreator.html
index 0f285010..eecc8900 100644
--- a/docs/html/MakeProjectCreator.html
+++ b/docs/html/MakeProjectCreator.html
@@ -5527,8 +5527,8 @@
 
                   <td rowspan="1" colspan="1">
                     <p class="Tbl-Body">This is similar to eval in perl. The
-                    template code passed to this function will be evaluated
-                    within the context of the current template.</p>
+                    template variable passed to this function will be
+                    evaluated within the context of the current template.</p>
                   </td>
                 </tr>
 
@@ -5808,6 +5808,19 @@
 
                 <tr>
                   <td rowspan="1" colspan="1">
+                    <p class="Tbl-Body"><em class="TableCode">set</em></p>
+                  </td>
+
+                  <td rowspan="1" colspan="1">
+                    <p class="Tbl-Body">This function is used to set or
+                    create a template variable.  This function takes two
+                    parameters; the first is the template variable name
+                    and the second is the variable value.</p>
+                  </td>
+                </tr>
+
+                <tr>
+                  <td rowspan="1" colspan="1">
                     <p class="Tbl-Body"><em class="TableCode">sort</em></p>
                   </td>
 
@@ -5846,6 +5859,22 @@
 
                 <tr>
                   <td rowspan="1" colspan="1">
+                    <p class="Tbl-Body"><em class="TableCode">translate_vars</em></p>
+                  </td>
+
+                  <td rowspan="1" colspan="1">
+                    <p class="Tbl-Body">The first parameter to this function
+                    is the name of a variable.  The second, optional,
+                    parameter is the operating system for which the
+                    project is being generated (e.g., linux, solaris,
+                    win32, etc.)  It replaces $(...) found within the
+                    value of the variable with the equivalent environment
+                    variable reference based on the operating system.</p>
+                  </td>
+                </tr>
+
+                <tr>
+                  <td rowspan="1" colspan="1">
                     <p class="Tbl-Body"><em class="TableCode">uc</em></p>
                   </td>
 
diff --git a/docs/templates/vc10.txt b/docs/templates/vc10.txt
new file mode 100644
index 00000000..2005c2c4
--- /dev/null
+++ b/docs/templates/vc10.txt
@@ -0,0 +1,8 @@
+// Currently incomplete.
+// This defines the role of all the template variables specific to the
+// 'vc10' project type.
+//
+// Please try to keep this alphabetically sorted.
+//
+openmp = A backwards compatibility variable that is equivalent to openmpsupport.
+openmpsupport = If set to true, enables OpenMP 2.0 language extensions.
diff --git a/history/ChangeLog-3_7 b/history/ChangeLog-3_7
index 3d3c80f8..91feb553 100644
--- a/history/ChangeLog-3_7
+++ b/history/ChangeLog-3_7
@@ -1,7 +1,7 @@
 Wed May 26 19:43:17 UTC 2010  James H. Hill  <hillj at cs dot iupui dot edu>
 
         * config/gdiplus.mpb:
-        
+
            The configuration was missing a bracket.
 
 Tue May 25 22:55:48 UTC 2010  James H. Hill  <hillj at cs dot iupui dot edu>
diff --git a/modules/CDT6WorkspaceCreator.pm b/modules/CDT6WorkspaceCreator.pm
index 4a2f1a31..4c4e3bf7 100644
--- a/modules/CDT6WorkspaceCreator.pm
+++ b/modules/CDT6WorkspaceCreator.pm
@@ -56,7 +56,7 @@ sub pre_workspace {
     '# The projects are listed in dependency order.', $crlf,
     '#', $crlf,
     '# MPC Command:', $crlf,
-    "# $0 @ARGV", $crlf,
+    '# ', $self->create_command_line_string($0, @ARGV), $crlf,
     '#----------------------------------------------------------------------------', $crlf);
 }
 
diff --git a/modules/Creator.pm b/modules/Creator.pm
index 0f2fc795..8ffc178f 100644
--- a/modules/Creator.pm
+++ b/modules/Creator.pm
@@ -757,17 +757,17 @@ sub clone {
       $$new{$key} = $self->clone($$obj{$key});
     }
     return $new;
-  }  
+  }
   elsif (UNIVERSAL::isa($obj, 'ARRAY')) {
     my $new = [];
     foreach my $o (@$obj) {
       push(@$new, $self->clone($o));
     }
     return $new;
-  }  
+  }
 
   return $obj;
-}                              
+}
 
 
 sub save_state {
diff --git a/modules/MakeProjectBase.pm b/modules/MakeProjectBase.pm
index 22d6830d..13bfebb9 100644
--- a/modules/MakeProjectBase.pm
+++ b/modules/MakeProjectBase.pm
@@ -22,7 +22,7 @@ use vars qw(@ISA);
 
 sub get_builtin_output {
   #my($self, $input) = @_;
-  return ['$@'];   
+  return ['$@'];
 }
 
 sub dollar_special {
diff --git a/modules/MakeProjectCreator.pm b/modules/MakeProjectCreator.pm
index 3c589fed..a9327eab 100644
--- a/modules/MakeProjectCreator.pm
+++ b/modules/MakeProjectCreator.pm
@@ -102,4 +102,5 @@ sub fill_value {
 
   return undef;
 }
+
 1;
diff --git a/modules/ProjectCreator.pm b/modules/ProjectCreator.pm
index 229462e7..8b377608 100644
--- a/modules/ProjectCreator.pm
+++ b/modules/ProjectCreator.pm
@@ -456,7 +456,7 @@ sub process_assignment {
     }
 
     ## If the assignment name is valid and requires parameter (<%...%>)
-    ## replacement, then do so.  But, only do so on actual keywords. 
+    ## replacement, then do so.  But, only do so on actual keywords.
     ## User defined keywords must not have the parameters replaced in
     ## order for them to get the correct replacement values later on.
     if (defined $validNames{$name} &&
@@ -4639,7 +4639,7 @@ sub get_install_info {
         if (defined $$array[0]) {
           &$callback("$vc:\n");
           foreach my $file (@$array) {
-            if (defined $self->{'flag_overrides'}->{$vc} && 
+            if (defined $self->{'flag_overrides'}->{$vc} &&
                 defined $self->{'flag_overrides'}->{$vc}->{$file} &&
                 defined $self->{'flag_overrides'}->{$vc}->{$file}->{'gendir'}) {
               &$callback(join(' ', map {/ / ? "\"$_\"" : $_} ($file,
diff --git a/modules/TemplateParser.pm b/modules/TemplateParser.pm
index 4de2b53b..b22190ff 100644
--- a/modules/TemplateParser.pm
+++ b/modules/TemplateParser.pm
@@ -81,6 +81,7 @@ my %keywords = ('if'              => 0,
                 'translate_vars'  => 2 | 1,
                 'convert_slashes' => 2,
                 'new_guid'        => 0,
+                'set'             => 0,
                );
 
 my %target_type_vars = ('type_is_static'   => 1,
@@ -245,7 +246,7 @@ sub split_parameters {
   my($self, $str) = @_;
   my @params;
 
-  while ($str =~ /^(\w+\([^\)]+\))(.*)/ || $str =~ /^([^,]+)(.*)/) {
+  while($str =~ /^(\w+\([^\)]+\))(.*)/ || $str =~ /^([^,]+)(.*)/) {
     push(@params, $1);
     $str = $2;
     $str =~ s/^\s*,\s*//;
@@ -253,7 +254,7 @@ sub split_parameters {
 
   ## Return the parameters (which includes whatever is left in the
   ## string).  Just return it instead of pushing it onto @params.
-  return ($str eq '') ? @params : (@params, $str);
+  return $str eq '' ? @params : (@params, $str);
 }
 
 
@@ -484,7 +485,7 @@ sub process_foreach {
   }
   else {
     ## Pull out modifying commands first
-    while ($val =~ /(\w+)\((.+)\)/) {
+    while($val =~ /(\w+)\((.+)\)/) {
       my $cmd = $1;
       $val = $2;
       if (($keywords{$cmd} & 0x02) != 0) {
@@ -1156,7 +1157,7 @@ sub process_compound_if {
     ## Get the value based on the string
     my @cmds;
     my $val;
-    while ($str =~ /(\w+)\((.+)\)(.*)/) {
+    while($str =~ /(\w+)\((.+)\)(.*)/) {
       if ($3 eq '') {
         push(@cmds, $1);
         $str = $2;
@@ -1527,7 +1528,7 @@ sub evaluate_nested_functions {
     my @cmds;
     my $val = $param;
 
-    while ($val =~ /(\w+)\((.+)\)/) {
+    while($val =~ /(\w+)\((.+)\)/) {
       push(@cmds, $1);
       $val = $2;
     }
@@ -1762,11 +1763,11 @@ sub post_create_aux_file {
 
 
 sub perform_create_aux_file {
-  my $self = shift;
-  my $argsref = shift;
+  my($self, $argsref) = @_;
 
   if (defined $self->{'aux_file'}) {
-    die "Can't nest create_aux_file commands.";
+    $self->{'error_in_handle'} = "Can't nest create_aux_file commands.";
+    return undef;
   }
 
   my $fname = '';
@@ -1790,25 +1791,27 @@ sub perform_create_aux_file {
 sub handle_end_aux_file {
   my $self = shift;
   if (!defined $self->{'aux_file'}) {
-    return 'end_aux_file seen before create_aux_file';
+    $self->{'error_in_handle'} = 'end_aux_file seen before create_aux_file';
   }
   else {
     my $af = $self->{'aux_file'};
     mkpath($af->{'dir'}, 0, 0777) if ($af->{'dir'} ne '.');
     my $fh = new FileHandle('> ' . $af->{'dir'} . '/' . $af->{'filename'});
-    if (!defined $fh) {
-      die "Couldn't open: " . $af->{'dir'} . '/' . $af->{'filename'};
+    if (defined $fh) {
+      print $fh $af->{'text'};
+      close($fh);
+    }
+    else {
+      $self->{'error_in_handle'} = "Couldn't open: " . $af->{'dir'} . '/' .
+                                   $af->{'filename'};
     }
-    print $fh $af->{'text'};
-    close $fh;
     $self->{'aux_file'} = undef;
   }
 }
 
 
 sub handle_translate_vars {
-  my $self = shift;
-  my $arg = shift;
+  my($self, $arg) = @_;
   my @params = $self->split_parameters($arg);
   $self->append_current($self->perform_translate_vars([@params]));
 }
@@ -1820,13 +1823,23 @@ sub get_translate_vars {
 }
 
 sub perform_translate_vars {
-  my $self = shift;
-  my $arg = shift;
+  my($self, $arg) = @_;
+
+  ## If the first parameter is a template variable with a value, use it.
+  ## Otherwise, use the parameter as the value.
   my $val = $self->get_value($arg->[0]);
   $val = $arg->[0] unless defined $val;
-  my $os = (defined $arg->[1] && $arg->[1] ne '')
-      ? $arg->[1] : $self->{'prjc'}->{'command_subs'}->{'os'};
+
+  ## If the second optional parameter is provided, use it.  Otherwise,
+  ## use the operating system found in the command substitution map.
+  my $os = (defined $arg->[1] && $arg->[1] ne '') ?
+           $arg->[1] : $self->{'prjc'}->{'command_subs'}->{'os'};
+
+  ## Get the variable reference characters based on the operating system
+  ## for which we are generating this project.
   my ($pre, $post) = ($os eq 'win32') ? ('%', '%') : ('${', '}');
+
+  ## Replace $() with the environment variable reference characters.
   $val =~ s[\$\(([^)]+)\)(\S*)][my ($var, $rest) = ($1, $2);
                                 $rest =~ s!/!\\!g if $os eq 'win32';
                                 "$pre$var$post$rest"]ge;
@@ -1835,21 +1848,29 @@ sub perform_translate_vars {
 
 
 sub handle_convert_slashes {
-  my $self = shift;
-  my $arg = shift;
+  my($self, $arg) = @_;
   my @params = $self->split_parameters($arg);
   $self->append_current($self->perform_convert_slashes([@params]));
 }
 
 
 sub perform_convert_slashes {
-  my $self = shift;
-  my $arg = shift;
+  my($self, $arg) = @_;
+
+  ## If the first parameter is a template variable with a value, use it.
+  ## Otherwise, use the parameter as the value.
   my $val = $self->get_value($arg->[0]);
   $val = $arg->[0] unless defined $val;
-  my $os = (defined $arg->[1] && $arg->[1] ne '')
-      ? $arg->[1] : $self->{'prjc'}->{'command_subs'}->{'os'};
+
+  ## If the second optional parameter is provided, use it.  Otherwise,
+  ## use the operating system found in the command substitution map.
+  my $os = (defined $arg->[1] && $arg->[1] ne '') ?
+           $arg->[1] : $self->{'prjc'}->{'command_subs'}->{'os'};
+
+  ## Replace forward slashes with backslashes if we're generating this
+  ## project specific to Windows.
   $val =~ s!/!\\!g if $os eq 'win32';
+
   return $val;
 }
 
@@ -1858,11 +1879,23 @@ sub handle_new_guid {
   my($self, $name) = @_;
   my $val = $self->get_value_with_default($name);
   my $prjc = $self->{'prjc'};
-  my $guid = GUID::generate($val ? $val : $name, $prjc->{'current_input'}, $prjc->getcwd());
+  my $guid = GUID::generate($val ? $val : $name,
+                            $prjc->{'current_input'}, $prjc->getcwd());
   $self->append_current($guid);
 }
 
 
+sub handle_set {
+  my($self, $val) = @_;
+  my @params = $self->split_parameters($val);
+  if ($#params == 1) {
+    $self->{'values'}->{lc($params[0])} = $params[1];
+  }
+  else {
+    $self->{'error_in_handle'} = 'set() requires a name and a value';
+  }
+}
+
 sub prepare_parameters {
   my($self, $prefix) = @_;
   my $input = $self->get_value($prefix . '->input_file');
diff --git a/modules/VC8WorkspaceCreator.pm b/modules/VC8WorkspaceCreator.pm
index 1291e831..29a02ae1 100644
--- a/modules/VC8WorkspaceCreator.pm
+++ b/modules/VC8WorkspaceCreator.pm
@@ -95,7 +95,7 @@ sub post_workspace {
             if (defined $relative) {
               if ($lang eq Creator::cplusplus) {
                 ## If the current project is not managed, then we will
-                ## add references (although I doubt that will be useful). 
+                ## add references (although I doubt that will be useful).
                 ## If the current project is managed, then the reference
                 ## project must be managed or a non-c++ project.
                 if (!$managed || ($managed && $gmap{$dep}->[1])) {
diff --git a/templates/cdt6cproject.mpd b/templates/cdt6cproject.mpd
index 94da61ac..5e79f44d 100644
--- a/templates/cdt6cproject.mpd
+++ b/templates/cdt6cproject.mpd
@@ -3,7 +3,7 @@
 <cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
   <storageModule moduleId="org.eclipse.cdt.core.settings">
 <%foreach(platforms)%>
-<%foreach(host_platform)%><%comment(there won't be more than one host_platform, but a foreach is used in order to access scoped assignments from the mpt)%> 
+<%foreach(host_platform)%><%comment(there won't be more than one host_platform, but a foreach is used in order to access scoped assignments from the mpt)%>
 <%foreach(configurations)%>
 <!-- platform = <%platform%>, nocross = <%nocross%>, host_platform = <%host_platform%>, vars_equal = <%vars_equal(platform, host_platform)%> -->
 <%if(!nocross || vars_equal(platform, host_platform))%>
diff --git a/templates/cdt6platforms.mpt b/templates/cdt6platforms.mpt
index 670af60a..46cbb381 100644
--- a/templates/cdt6platforms.mpt
+++ b/templates/cdt6platforms.mpt
@@ -26,7 +26,7 @@ targetplatform_superclass = cdt.managedbuild.target.gnu.platform
 outputtype_superclass = cdt.managedbuild.tool.gnu.cpp.linker.so.debug.output
 
 // These are just defaults
-exe_ext_nodot = 
+exe_ext_nodot =
 dll_ext_nodot = so
 lib_ext_nodot = a
 tool_name_prefix = GNU
@@ -81,7 +81,7 @@ linux_m32 {
 
 macosx {
   dll_ext = .dylib
-  exe_ext_nodot = 
+  exe_ext_nodot =
   dll_ext_nodot = dylib
   lib_ext_nodot = a
 
diff --git a/templates/vc10.mpd b/templates/vc10.mpd
index b1b96f5c..55cdd3cf 100644
--- a/templates/vc10.mpd
+++ b/templates/vc10.mpd
@@ -196,7 +196,7 @@
       <ForceConformanceInForLoopScope><%ForceConformanceInForLoopScope%></ForceConformanceInForLoopScope>
 <%endif%>
       <RuntimeTypeInfo><%RuntimeTypeInfo("true")%></RuntimeTypeInfo>
-<%if(OpenMPSupport)%>
+<%if(OpenMP || OpenMPSupport)%>
       <OpenMPSupport>true</OpenMPSupport>
 <%endif%>
 <%if(pch_header)%>
@@ -352,8 +352,8 @@
 <%endif%>
 <%if(TargetMachine)%>
 <!--
-  Though we can set TargetMachine explicitly, VC++ 
-  can figure it out by project type. We don't need 
+  Though we can set TargetMachine explicitly, VC++
+  can figure it out by project type. We don't need
   to set it by ourselves.
 -->
 <!--      <TargetMachine><%TargetMachine%></TargetMachine>-->
@@ -598,8 +598,8 @@
 <%endif%>
 <%if(TargetMachine)%>
 <!--
-  Though we can set TargetMachine explicitly, VC++ 
-  can figure it out by project type. We don't need 
+  Though we can set TargetMachine explicitly, VC++
+  can figure it out by project type. We don't need
   to set it by ourselves.
 -->
 <!--      <TargetMachine><%TargetMachine%></TargetMachine>-->
diff --git a/templates/wix.mpd b/templates/wix.mpd
index b76178f6..04c21695 100644
--- a/templates/wix.mpd
+++ b/templates/wix.mpd
@@ -21,7 +21,7 @@
       <ComponentRef Id="<%component%>" />
 <%endfor%>
     </ComponentGroup>
-    
+
     <DirectoryRef Id="INSTALLDIR">
 <%marker(component_top)%>
 <%if(!no_binary)%>
@@ -44,7 +44,7 @@
       <Directory Id="<%project_name%>.<%normalize(resource_file)%>.<%forcount%>.<%name%>" Name="<%name%>">
 <%endfor%>
         <Component Id="<%project_name%><%foreach(name, install_location)%>.<%name%><%endfor%>.<%normalize(resource_file)%>" Guid="*">
-          <File Id="<%project_name%>_<%normalize(resource_file)%>" 
+          <File Id="<%project_name%>_<%normalize(resource_file)%>"
                 Name="<%basename(resource_file)%>"
                 Source="<%full_path(resource_file)%>"
                 DiskId="<%diskid(1)%>" />
@@ -104,7 +104,7 @@
               DiskId="<%diskid(1)%>" />
 
         <RegistryKey Root="<%gme_register(HKLM)%>" Key="SOFTWARE\GME\Paradigms\<%paradigm_name%>" Action="createAndRemoveOnUninstall">
-          <RegistryValue Name="CurrentVersion" Type="string" Value="{<%paradigm_guid%>}" Action="write" />            
+          <RegistryValue Name="CurrentVersion" Type="string" Value="{<%paradigm_guid%>}" Action="write" />
         </RegistryKey>
 
         <RegistryKey Root="<%gme_register(HKLM)%>" Key="SOFTWARE\GME\Paradigms\<%paradigm_name%>\{<%paradigm_guid%>}" Action="createAndRemoveOnUninstall">