ChangeLogTag: Sat Apr 10 19:37:34 UTC 2010 Chad Elliott <elliott_c@ociweb.com>

10 files changed, 62 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 180ae159..29014586 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,34 @@
+Sat Apr 10 19:37:34 UTC 2010  Chad Elliott  <elliott_c@ociweb.com>
+
+        * config/opalorb.mpb:
+
+          Added a base project for opalORB idl.
+
+        * modules/NMakeProjectCreator.pm:
+
+          Fixed a bug that only arose when the user used mpc.pl and the
+          'nmake' project type.  The VCPropertyBase "use" was missing.
+
+        * templates/vc7.mpd:
+
+          Only generate debug information for "debug" configurations.  Also,
+          allow the OptimizeReferences setting to be set by the 'optref'
+          template variable.
+
+        * templates/vc8.mpd:
+        * templates/vc8dll.mpt:
+        * templates/vc8exe.mpt:
+        * templates/vc8lib.mpt:
+        * templates/vc8libexe.mpt:
+
+          Only generate debug information for "debug" configurations.  Also,
+          allow the OptimizeReferences setting to be set by the
+          'OptimizeReferences' template variable.
+
+        * vs_postclean.pl:
+
+          Added a description of what this script does to the usage message.
+
 Tue Mar 23 13:44:29 UTC 2010  Chad Elliott  <elliott_c@ociweb.com>
 
         * docs/README:
diff --git a/config/opalorb.mpb b/config/opalorb.mpb
new file mode 100644
index 00000000..74eda7ed
--- /dev/null
+++ b/config/opalorb.mpb
@@ -0,0 +1,9 @@
+// -*- MPC -*-
+// $Id$
+
+project {
+  Define_Custom(Perl_IDL) {
+    command  = perl <%quote%>$(OPALORB_ROOT)/idl/idl.pl<%quote%>
+    inputext = .idl
+  }
+}
diff --git a/modules/NMakeProjectCreator.pm b/modules/NMakeProjectCreator.pm
index 5ad3aec4..f16193b8 100644
--- a/modules/NMakeProjectCreator.pm
+++ b/modules/NMakeProjectCreator.pm
@@ -15,6 +15,7 @@ use strict;
 use ProjectCreator;
 use WinProjectBase;
 use MakeProjectBase;
+use VCPropertyBase;
 
 use vars qw(@ISA);
 @ISA = qw(MakeProjectBase WinProjectBase ProjectCreator VCPropertyBase);
diff --git a/templates/vc7.mpd b/templates/vc7.mpd
index 4a5ba4e3..a25af69d 100644
--- a/templates/vc7.mpd
+++ b/templates/vc7.mpd
@@ -130,8 +130,8 @@
 <%if(ModuleDefinitionFile)%>
                                 ModuleDefinitionFile="<%ModuleDefinitionFile%>"
 <%endif%>
-				GenerateDebugInformation="TRUE"
 <%if(pdbl)%>
+				GenerateDebugInformation="TRUE"
 <%if(sharedname)%>
 				ProgramDatabaseFile="$(OutDir)\<%libname_prefix%><%sharedname%><%if(use_lib_modifier)%><%lib_modifier%><%endif%>.pdb"
 <%else%>
@@ -153,6 +153,10 @@
 <%if(optimize)%>
 				OptimizeReferences="<%optref("2")%>"
 				EnableCOMDATFolding="<%opticf("2")%>"
+<%else%>
+<%if(optref)%>
+				OptimizeReferences="<%optref%>"
+<%endif%>
 <%endif%>
 <%if(unicode && unicode_mfc_entry && exename && source_files)%>
 				EntryPointSymbol="<%unicode_mfc_entry%>"
diff --git a/templates/vc8.mpd b/templates/vc8.mpd
index 250b9f7b..06be6f0c 100644
--- a/templates/vc8.mpd
+++ b/templates/vc8.mpd
@@ -423,6 +423,10 @@
 <%if(optimize)%>
 				OptimizeReferences="<%OptimizeReferences("2")%>"
 				EnableCOMDATFolding="<%EnableCOMDATFolding("2")%>"
+<%else%>
+<%if(OptimizeReferences)%>
+				OptimizeReferences="<%OptimizeReferences%>"
+<%endif%>
 <%endif%>
 <%if(OptimizeForWindows98)%>
 				OptimizeForWindows98="<%OptimizeForWindows98%>"
diff --git a/templates/vc8dll.mpt b/templates/vc8dll.mpt
index 44ea2976..0e11191b 100644
--- a/templates/vc8dll.mpt
+++ b/templates/vc8dll.mpt
@@ -18,6 +18,7 @@ Release {
   defines          = NDEBUG
   output_dir       = Release
   intermediate_dir = Release
+  GenerateDebugInformation = false
 }
 
 Debug {
@@ -57,6 +58,7 @@ MFC Release {
   intermediate_dir = MFC_Release
   lib_modifier     = mfc
   UseOfMFC         = 2
+  GenerateDebugInformation = false
 }
 
 MFC Debug {
diff --git a/templates/vc8exe.mpt b/templates/vc8exe.mpt
index 6c601e64..4f33f6f9 100644
--- a/templates/vc8exe.mpt
+++ b/templates/vc8exe.mpt
@@ -19,6 +19,7 @@ Release {
   defines          = NDEBUG
   output_dir       = Release
   intermediate_dir = Release
+  GenerateDebugInformation = false
 }
 
 Debug {
@@ -59,6 +60,7 @@ MFC Release {
   lib_modifier      = mfc
   UseOfMFC          = 2
   unicode_mfc_entry = wWinMainCRTStartup
+  GenerateDebugInformation = false
 }
 
 MFC Debug {
diff --git a/templates/vc8lib.mpt b/templates/vc8lib.mpt
index 3d6faa13..b0cca337 100644
--- a/templates/vc8lib.mpt
+++ b/templates/vc8lib.mpt
@@ -18,6 +18,7 @@ Release {
   output_dir       = Static_Release
   intermediate_dir = Static_Release
   lib_modifier     = s
+  GenerateDebugInformation = false
 }
 
 Debug {
@@ -55,6 +56,7 @@ MFC Release {
   intermediate_dir = Static_MFC_Release
   lib_modifier     = mfcs
   UseOfMFC         = 2
+  GenerateDebugInformation = false
 }
 
 MFC Debug {
diff --git a/templates/vc8libexe.mpt b/templates/vc8libexe.mpt
index 5bc469e9..908169c0 100644
--- a/templates/vc8libexe.mpt
+++ b/templates/vc8libexe.mpt
@@ -20,6 +20,7 @@ Release {
   output_dir       = Static_Release
   intermediate_dir = Static_Release
   lib_modifier     = s
+  GenerateDebugInformation = false
 }
 
 Debug {
@@ -61,6 +62,7 @@ MFC Release {
   lib_modifier      = mfcs
   UseOfMFC          = 2
   unicode_mfc_entry = wWinMainCRTStartup
+  GenerateDebugInformation = false
 }
 
 MFC Debug {
diff --git a/vs_postclean.pl b/vs_postclean.pl
index 3283b850..bc9ceff2 100755
--- a/vs_postclean.pl
+++ b/vs_postclean.pl
@@ -113,7 +113,10 @@ sub clean_sln {
 
 if ($#ARGV == -1) {
   print "PostClean v$version\n",
-        "Usage: ", basename($0), " [CFG=<configuration>] <project or solution files>\n";
+        "Usage: ", basename($0), " [CFG=<configuration>] <project or solution files>\n\n",
+        "Executes the MPC generated VCPostCleanEventTool commands in a project.\n",
+        "These events are ignored by VisualStudio and must be handled by an outside\n",
+        "tool (i.e., this script).\n";
   exit(0);
 }