ChangeLogTag: Tue Nov 30 12:58:03 UTC 2010 Chad Elliott <elliott_c@ociweb.com>

11 files changed, 148 insertions, 113 deletions

diff --git a/ChangeLog b/ChangeLog
index 8a130bbe..7b65ee10 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+Tue Nov 30 12:58:03 UTC 2010  Chad Elliott  <elliott_c@ociweb.com>
+
+        * modules/Creator.pm:
+        * modules/MakeProjectCreator.pm:
+        * modules/ProjectCreator.pm:
+        * modules/VC10ProjectCreator.pm:
+        * modules/VC6WorkspaceCreator.pm:
+        * modules/VC7ProjectCreator.pm:
+        * modules/VC7WorkspaceCreator.pm:
+        * modules/VC8ProjectCreator.pm:
+        * modules/VC8WorkspaceCreator.pm:
+        * modules/WixProjectCreator.pm:
+
+          Made modifications to the use of constants within the
+          initialization of file level hash maps.  They need to be called
+          like functions in order to support Perl 5.6.
+
 Fri Nov 12 12:39:55 UTC 2010  Chad Elliott  <elliott_c@ociweb.com>
 
         * config/mfc.mpb:
diff --git a/modules/Creator.pm b/modules/Creator.pm
index 55285092..0f61aa7a 100644
--- a/modules/Creator.pm
+++ b/modules/Creator.pm
@@ -36,10 +36,11 @@ my $deflang = 'cplusplus';
 ## A map of all of the allowed languages.  The 'website' value
 ## is not here because it isn't really a language.  It is used
 ## as a language internally by some project types though.
-my %languages = (cplusplus => 1,
-                 csharp    => 1,
-                 java      => 1,
-                 vb        => 1,
+## NOTE: We call the constant as a function to support Perl 5.6.
+my %languages = (cplusplus() => 1,
+                 csharp()    => 1,
+                 java()      => 1,
+                 vb()        => 1,
                 );
 
 my $assign_key  = 'assign';
diff --git a/modules/MakeProjectCreator.pm b/modules/MakeProjectCreator.pm
index a9327eab..e90addb0 100644
--- a/modules/MakeProjectCreator.pm
+++ b/modules/MakeProjectCreator.pm
@@ -22,21 +22,22 @@ use vars qw(@ISA);
 # Data Section
 # ************************************************************
 
-my %info = (Creator::cplusplus => {'dllexe'   => 'makeexe',
-                                   'dll'      => 'makedll',
-                                   'template' => 'make',
+## NOTE: We call the constant as a function to support Perl 5.6.
+my %info = (Creator::cplusplus() => {'dllexe'   => 'makeexe',
+                                     'dll'      => 'makedll',
+                                     'template' => 'make',
                                   },
-            Creator::csharp    => {'dllexe'   => 'make.net',
-                                   'dll'      => 'make.net',
-                                   'template' => 'make.net',
+            Creator::csharp()    => {'dllexe'   => 'make.net',
+                                     'dll'      => 'make.net',
+                                     'template' => 'make.net',
                                   },
-            Creator::java      => {'dllexe'   => 'makeexe',
-                                   'dll'      => 'makedll',
-                                   'template' => 'make',
+            Creator::java()      => {'dllexe'   => 'makeexe',
+                                     'dll'      => 'makedll',
+                                     'template' => 'make',
                                   },
-            Creator::vb        => {'dllexe'   => 'make.net',
-                                   'dll'      => 'make.net',
-                                   'template' => 'make.net',
+            Creator::vb()        => {'dllexe'   => 'make.net',
+                                     'dll'      => 'make.net',
+                                     'template' => 'make.net',
                                    },
            );
 
diff --git a/modules/ProjectCreator.pm b/modules/ProjectCreator.pm
index 2681fefa..88b47150 100644
--- a/modules/ProjectCreator.pm
+++ b/modules/ProjectCreator.pm
@@ -275,16 +275,18 @@ my %vbma = ('source_files' => [ 'subtype' ],
 # 5     Name of the tag for 'resource_files' for this language
 #        * This is special because it gets treated like source_files in that
 #          a project with only these files is a library/exe not "custom only".
-my %language = (Creator::cplusplus => [ \%cppvc, \%cppec, \%cppma, 'main',
-                                        1, $cppresource ],
 
-                Creator::csharp    => [ \%csvc, {}, \%csma, 'Main', 0,
-                                        $csresource ],
+## NOTE: We call the constant as a function to support Perl 5.6.
+my %language = (Creator::cplusplus() => [ \%cppvc, \%cppec, \%cppma, 'main',
+                                          1, $cppresource ],
 
-                Creator::java      => [ \%jvc, {}, {}, 'main', 0 ],
+                Creator::csharp()    => [ \%csvc, {}, \%csma, 'Main', 0,
+                                          $csresource ],
 
-                Creator::vb        => [ \%vbvc, {}, \%vbma, 'Main', 0,
-                                        $vbresource ],
+                Creator::java()      => [ \%jvc, {}, {}, 'main', 0 ],
+
+                Creator::vb()        => [ \%vbvc, {}, \%vbma, 'Main', 0,
+                                          $vbresource ],
                );
 my %mains;
 
diff --git a/modules/VC10ProjectCreator.pm b/modules/VC10ProjectCreator.pm
index 4d0ee512..86eca792 100644
--- a/modules/VC10ProjectCreator.pm
+++ b/modules/VC10ProjectCreator.pm
@@ -17,13 +17,18 @@ use VC9ProjectCreator;
 use vars qw(@ISA);
 @ISA = qw(VC9ProjectCreator);
 
-my %info = (Creator::cplusplus => {'ext'      => '.vcxproj',
-                                   'dllexe'   => 'vc10exe',
-                                   'libexe'   => 'vc10libexe',
-                                   'dll'      => 'vc10dll',
-                                   'lib'      => 'vc10lib',
-                                   'template' => [ 'vc10', 'vc10filters' ],
-                                  },
+# ************************************************************
+# Data Section
+# ************************************************************
+
+## NOTE: We call the constant as a function to support Perl 5.6.
+my %info = (Creator::cplusplus() => {'ext'      => '.vcxproj',
+                                     'dllexe'   => 'vc10exe',
+                                     'libexe'   => 'vc10libexe',
+                                     'dll'      => 'vc10dll',
+                                     'lib'      => 'vc10lib',
+                                     'template' => [ 'vc10', 'vc10filters' ],
+                                    },
            );
 
 my %config = ('vcversion' => '10.00',
@@ -33,6 +38,10 @@ my %config = ('vcversion' => '10.00',
               'xmlheader' => 1,
               );
 
+# ************************************************************
+# Subroutine Section
+# ************************************************************
+
 sub get_info_hash {
   my($self, $key) = @_;
 
diff --git a/modules/VC6WorkspaceCreator.pm b/modules/VC6WorkspaceCreator.pm
index 4e2f55d9..3aea9b45 100644
--- a/modules/VC6WorkspaceCreator.pm
+++ b/modules/VC6WorkspaceCreator.pm
@@ -72,8 +72,8 @@ sub write_comps {
               'Project: "', $$pjs{$project}->[ProjectCreator::PROJECT_NAME],
               '"=', $self->slash_to_backslash($project),
               " - Package Owner=<4>$crlf$crlf",
-              "Package=<5>${crlf}{{{$crlf}}}$crlf$crlf",
-              "Package=<4>${crlf}{{{$crlf";
+              "Package=<5>$crlf", '{{{', $crlf, "}}}$crlf$crlf",
+              "Package=<4>$crlf", '{{{', $crlf;
 
     my $deps = $self->get_validated_ordering($project);
     if (defined $$deps[0]) {
@@ -98,8 +98,8 @@ sub post_workspace {
   ## This text is always the same
   print $fh "###############################################################################$crlf$crlf",
             "Global:$crlf$crlf",
-            "Package=<5>${crlf}{{{$crlf}}}$crlf$crlf",
-            "Package=<3>${crlf}{{{$crlf}}}$crlf$crlf",
+            "Package=<5>$crlf", '{{{', "$crlf}}}$crlf$crlf",
+            "Package=<3>$crlf", '{{{', "$crlf}}}$crlf$crlf",
             "###############################################################################$crlf$crlf";
 }
 
diff --git a/modules/VC7ProjectCreator.pm b/modules/VC7ProjectCreator.pm
index 4f24ea6f..b8bf562b 100644
--- a/modules/VC7ProjectCreator.pm
+++ b/modules/VC7ProjectCreator.pm
@@ -24,34 +24,35 @@ use vars qw(@ISA);
 # Data Section
 # ************************************************************
 
-my %info = (Creator::cplusplus => {'ext'      => '.vcproj',
-                                   'dllexe'   => 'vc7exe',
-                                   'libexe'   => 'vc7libexe',
-                                   'dll'      => 'vc7dll',
-                                   'lib'      => 'vc7lib',
-                                   'template' => 'vc7',
-                                  },
-            Creator::csharp    => {'ext'      => '.csproj',
-                                   'dllexe'   => 'vc7csharp',
-                                   'libexe'   => 'vc7csharp',
-                                   'dll'      => 'vc7csharp',
-                                   'lib'      => 'vc7csharp',
-                                   'template' => 'vc7csharp',
-                                  },
-            Creator::java      => {'ext'      => '.vjsproj',
-                                   'dllexe'   => 'vc7java',
-                                   'libexe'   => 'vc7java',
-                                   'dll'      => 'vc7java',
-                                   'lib'      => 'vc7java',
-                                   'template' => 'vc7java',
-                                  },
-            Creator::vb        => {'ext'      => '.vbproj',
-                                   'dllexe'   => 'vc7vb',
-                                   'libexe'   => 'vc7vb',
-                                   'dll'      => 'vc7vb',
-                                   'lib'      => 'vc7vb',
-                                   'template' => 'vc7vb',
-                                  },
+## NOTE: We call the constant as a function to support Perl 5.6.
+my %info = (Creator::cplusplus() => {'ext'      => '.vcproj',
+                                     'dllexe'   => 'vc7exe',
+                                     'libexe'   => 'vc7libexe',
+                                     'dll'      => 'vc7dll',
+                                     'lib'      => 'vc7lib',
+                                     'template' => 'vc7',
+                                    },
+            Creator::csharp()    => {'ext'      => '.csproj',
+                                     'dllexe'   => 'vc7csharp',
+                                     'libexe'   => 'vc7csharp',
+                                     'dll'      => 'vc7csharp',
+                                     'lib'      => 'vc7csharp',
+                                     'template' => 'vc7csharp',
+                                    },
+            Creator::java()      => {'ext'      => '.vjsproj',
+                                     'dllexe'   => 'vc7java',
+                                     'libexe'   => 'vc7java',
+                                     'dll'      => 'vc7java',
+                                     'lib'      => 'vc7java',
+                                     'template' => 'vc7java',
+                                    },
+            Creator::vb()        => {'ext'      => '.vbproj',
+                                     'dllexe'   => 'vc7vb',
+                                     'libexe'   => 'vc7vb',
+                                     'dll'      => 'vc7vb',
+                                     'lib'      => 'vc7vb',
+                                     'template' => 'vc7vb',
+                                    },
            );
 
 my %config = ('vcversion'    => '7.00',
diff --git a/modules/VC7WorkspaceCreator.pm b/modules/VC7WorkspaceCreator.pm
index 789ea427..19920390 100644
--- a/modules/VC7WorkspaceCreator.pm
+++ b/modules/VC7WorkspaceCreator.pm
@@ -24,11 +24,12 @@ use vars qw(@ISA);
 # Data Section
 # ************************************************************
 
-my %guids = (Creator::cplusplus => '8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942',
-             Creator::csharp    => 'FAE04EC0-301F-11D3-BF4B-00C04F79EFBC',
-             Creator::java      => 'E6FDF86B-F3D1-11D4-8576-0002A516ECE8',
-             Creator::vb        => 'F184B08F-C81C-45F6-A57F-5ABD9991F28F',
-             Creator::website   => 'E24C65DC-7377-472B-9ABA-BC803B73C61A',
+## NOTE: We call the constant as a function to support Perl 5.6.
+my %guids = (Creator::cplusplus() => '8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942',
+             Creator::csharp()    => 'FAE04EC0-301F-11D3-BF4B-00C04F79EFBC',
+             Creator::java()      => 'E6FDF86B-F3D1-11D4-8576-0002A516ECE8',
+             Creator::vb()        => 'F184B08F-C81C-45F6-A57F-5ABD9991F28F',
+             Creator::website()   => 'E24C65DC-7377-472B-9ABA-BC803B73C61A',
             );
 
 # ************************************************************
diff --git a/modules/VC8ProjectCreator.pm b/modules/VC8ProjectCreator.pm
index e953e944..3f9d06d8 100644
--- a/modules/VC8ProjectCreator.pm
+++ b/modules/VC8ProjectCreator.pm
@@ -21,34 +21,35 @@ use vars qw(@ISA);
 # Data Section
 # ************************************************************
 
-my %info = (Creator::cplusplus => {'ext'      => '.vcproj',
-                                   'dllexe'   => 'vc8exe',
-                                   'libexe'   => 'vc8libexe',
-                                   'dll'      => 'vc8dll',
-                                   'lib'      => 'vc8lib',
-                                   'template' => 'vc8',
-                                  },
-            Creator::csharp => {'ext'      => '.csproj',
-                                'dllexe'   => 'vc8csharp',
-                                'libexe'   => 'vc8csharp',
-                                'dll'      => 'vc8csharp',
-                                'lib'      => 'vc8csharp',
-                                'template' => 'vc8csharp',
-                               },
-            Creator::java   => {'ext'      => '.vjsproj',
-                                'dllexe'   => 'vc8java',
-                                'libexe'   => 'vc8java',
-                                'dll'      => 'vc8java',
-                                'lib'      => 'vc8java',
-                                'template' => 'vc8java',
-                               },
-            Creator::vb     => {'ext'      => '.vbproj',
-                                'dllexe'   => 'vc8vb',
-                                'libexe'   => 'vc8vb',
-                                'dll'      => 'vc8vb',
-                                'lib'      => 'vc8vb',
-                                'template' => 'vc8vb',
-                               },
+## NOTE: We call the constant as a function to support Perl 5.6.
+my %info = (Creator::cplusplus() => {'ext'      => '.vcproj',
+                                     'dllexe'   => 'vc8exe',
+                                     'libexe'   => 'vc8libexe',
+                                     'dll'      => 'vc8dll',
+                                     'lib'      => 'vc8lib',
+                                     'template' => 'vc8',
+                                    },
+            Creator::csharp() => {'ext'      => '.csproj',
+                                  'dllexe'   => 'vc8csharp',
+                                  'libexe'   => 'vc8csharp',
+                                  'dll'      => 'vc8csharp',
+                                  'lib'      => 'vc8csharp',
+                                  'template' => 'vc8csharp',
+                                 },
+            Creator::java()   => {'ext'      => '.vjsproj',
+                                  'dllexe'   => 'vc8java',
+                                  'libexe'   => 'vc8java',
+                                  'dll'      => 'vc8java',
+                                  'lib'      => 'vc8java',
+                                  'template' => 'vc8java',
+                                 },
+            Creator::vb()     => {'ext'      => '.vbproj',
+                                  'dllexe'   => 'vc8vb',
+                                  'libexe'   => 'vc8vb',
+                                  'dll'      => 'vc8vb',
+                                  'lib'      => 'vc8vb',
+                                  'template' => 'vc8vb',
+                                 },
            );
 
 my %config = ('vcversion' => '8.00');
diff --git a/modules/VC8WorkspaceCreator.pm b/modules/VC8WorkspaceCreator.pm
index bd8dcdd4..3003f256 100644
--- a/modules/VC8WorkspaceCreator.pm
+++ b/modules/VC8WorkspaceCreator.pm
@@ -22,10 +22,11 @@ use vars qw(@ISA);
 # Data Section
 # ************************************************************
 
-my %lang_map = (Creator::cplusplus => 'Visual C#',
-                Creator::csharp    => 'Visual C#',
-                Creator::vb        => 'Visual Basic',
-                Creator::java      => 'Visual J#');
+## NOTE: We call the constant as a function to support Perl 5.6.
+my %lang_map = (Creator::cplusplus() => 'Visual C#',
+                Creator::csharp()    => 'Visual C#',
+                Creator::vb()        => 'Visual Basic',
+                Creator::java()      => 'Visual J#');
 
 # ************************************************************
 # Subroutine Section
diff --git a/modules/WixProjectCreator.pm b/modules/WixProjectCreator.pm
index 9383111f..10b9ce7c 100644
--- a/modules/WixProjectCreator.pm
+++ b/modules/WixProjectCreator.pm
@@ -22,20 +22,21 @@ use vars qw(@ISA);
 # Data Section
 # ************************************************************
 
-my %info = (Creator::cplusplus => {'ext'      => '.wxi',
-                                   'dllexe'   => 'wix',
-                                   'libexe'   => 'wix',
-                                   'dll'      => 'wix',
-                                   'lib'      => 'wix',
-                                   'template' => 'wix',
-                                  },
-            Creator::csharp => {'ext'      => '.wxi',
-                                'dllexe'   => 'wixcs',
-                                'libexe'   => 'wixcs',
-                                'dll'      => 'wixcs',
-                                'lib'      => 'wixcs',
-                                'template' => 'wixcs',
-                               },
+## NOTE: We call the constant as a function to support Perl 5.6.
+my %info = (Creator::cplusplus() => {'ext'      => '.wxi',
+                                     'dllexe'   => 'wix',
+                                     'libexe'   => 'wix',
+                                     'dll'      => 'wix',
+                                     'lib'      => 'wix',
+                                     'template' => 'wix',
+                                    },
+            Creator::csharp() => {'ext'      => '.wxi',
+                                  'dllexe'   => 'wixcs',
+                                  'libexe'   => 'wixcs',
+                                  'dll'      => 'wixcs',
+                                  'lib'      => 'wixcs',
+                                  'template' => 'wixcs',
+                                 },
            );
 
 # ************************************************************