summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcalkinsc <calkinsc@a3e5c962-4219-0410-a828-e124f845ac39>2010-11-04 11:39:43 +0000
committercalkinsc <calkinsc@a3e5c962-4219-0410-a828-e124f845ac39>2010-11-04 11:39:43 +0000
commit1ea7c5a2c937b8cfb72016948c4509620b95be97 (patch)
treeb324f91032553d7ad6a0fb397337c14496bdc0c8
parent8ce5fd9996e52b4ba846bf66fcb58a9db72c4670 (diff)
downloadMPC-1ea7c5a2c937b8cfb72016948c4509620b95be97.tar.gz
Thu Nov 4 11:38:47 UTC 2010 Charles Calkins <calkinsc@ociweb.com>
* modules/WixWorkspaceCreator.pm: Fixed fuzz error.
-rw-r--r--ChangeLog8
-rw-r--r--modules/WixWorkspaceCreator.pm2
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index c37ef477..5cc698e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Nov 4 11:38:47 UTC 2010 Charles Calkins <calkinsc@ociweb.com>
+
+ * modules/WixWorkspaceCreator.pm:
+
+ Fixed fuzz error.
+
Wed Nov 3 16:42:10 UTC 2010 Charles Calkins <calkinsc@ociweb.com>
* modules/CDT6WorkspaceCreator.pm:
@@ -5,7 +11,7 @@ Wed Nov 3 16:42:10 UTC 2010 Charles Calkins <calkinsc@ociweb.com>
* modules/TemplateParser.pm:
* modules/VC7WorkspaceCreator.pm:
* modules/WixWorkspaceCreator.pm:
-
+
Re-enabled the wix "make_group" flag.
Wed Nov 3 15:41:16 UTC 2010 Charles Calkins <calkinsc@ociweb.com>
diff --git a/modules/WixWorkspaceCreator.pm b/modules/WixWorkspaceCreator.pm
index cd989b9f..b0a95f8b 100644
--- a/modules/WixWorkspaceCreator.pm
+++ b/modules/WixWorkspaceCreator.pm
@@ -102,7 +102,7 @@ sub post_workspace {
foreach my $project (keys %project_dependencies) {
# foreach my $cfg (@cfgs_main) -> <configuration|platform> could be <Debug|AnyCPU Release|AnyCPU> or <Debug|Win32 Release|Win32 Debug|x64 Release|x64>
my($pname_main, $rawdeps_main, $guid_main, $language_main, $custom_only_main, $nocross_main, $managed_main, $make_group_main, @cfgs_main) = @{$$info{$project}};
-
+
# only generate a group if "make_group = 1"
if ($make_group_main) {
my %all_deps = (); # all dependencies used by any project referenced by $project