ChangeLogTag: Tue Sep 20 08:47:21 2005 Chad Elliott <elliott_c@ociweb.com>

5 files changed, 35 insertions, 12 deletions

diff --git a/ChangeLog b/ChangeLog
index 5f4a8d8b..d5656aeb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,18 +1,38 @@
+Tue Sep 20 08:47:21 2005  Chad Elliott  <elliott_c@ociweb.com>
+
+        * config/swig_perl.mpb:
+
+          Added an include for $(PERL5_INCLUDE).
+
+        * modules/TemplateInputReader.pm:
+
+          Allow "()." in scope names within .mpt files.
+
+        * modules/WorkspaceCreator.pm:
+
+          Provide the user with more information as to why workspace
+          creation failed.
+
+        * templates/makedll.mpt:
+
+          Shared libraries are created on Solaris using the -G option (not
+          -shared).
+
 Mon Sep 12 10:47:28 2005  Justin Michel  <michel_j@ociweb.com>
 
         * clone_build_tree.pl:
 
-	  Prevent cloning of .pch files, which are precompiled headers when
-	using VC++.
+          Prevent cloning of .pch files, which are precompiled headers when
+          using VC++.
 
 Thu Sep  8 08:06:18 2005  J.T. Conklin  <jtc@acorntoolworks.com>
 
-	* templates/automake.mpd:
+        * templates/automake.mpd:
 
-	  Changed to output compile_flags on separate lines.
+          Changed to output compile_flags on separate lines.
 
-	  Changed to sort lists of source, header, and inline files
-	  to make output more deterministic.
+          Changed to sort lists of source, header, and inline files
+          to make output more deterministic.
 
 Tue Sep  6 10:34:24 2005  Chad Elliott  <elliott_c@ociweb.com>
 
diff --git a/config/swig_perl.mpb b/config/swig_perl.mpb
index 7120bf7d..4209d17c 100644
--- a/config/swig_perl.mpb
+++ b/config/swig_perl.mpb
@@ -8,4 +8,5 @@ project {
     source_outputext  = _wrap.cxx
     generic_outputext = .pm
   }
+  includes += $(PERL5_INCLUDE)/.
 }
diff --git a/modules/TemplateInputReader.pm b/modules/TemplateInputReader.pm
index ad6e7279..1ad7e037 100644
--- a/modules/TemplateInputReader.pm
+++ b/modules/TemplateInputReader.pm
@@ -51,7 +51,7 @@ sub parse_line {
 
   if ($line eq '') {
   }
-  elsif ($line =~ /^([\w\s]+)\s*{$/) {
+  elsif ($line =~ /^([\w\s\(\)\.]+)\s*{$/) {
     ## Entering a new scope
     my($rname) = $1;
     $rname =~ s/\s+$//;
diff --git a/modules/WorkspaceCreator.pm b/modules/WorkspaceCreator.pm
index 394a79fa..19a551ca 100644
--- a/modules/WorkspaceCreator.pm
+++ b/modules/WorkspaceCreator.pm
@@ -158,13 +158,13 @@ sub parse_line {
 
           ## End of workspace; Have subclass write out the file
           ## Generate the project files
-          my($gstat, $creator) = $self->generate_project_files();
+          my($gstat, $creator, $err) = $self->generate_project_files();
           if ($gstat) {
             ($status, $error) = $self->write_workspace($creator, 1);
             $self->{'assign'} = {};
           }
           else {
-            $error = 'Unable to generate all of the project files';
+            $error = $err;
             $status = 0;
           }
 
@@ -1109,8 +1109,9 @@ sub generate_project_files {
           ## processing altogether.
           if (!$status) {
             ## We don't restore the state before we leave,
-            ## but that's ok since we will be exiting soon.
-            return $status, $creator;
+            ## but that's ok since we will be exiting right now.
+            return $status, $creator,
+                   "Unable to process " . ($file eq '' ? " in $dir" : $file);
           }
 
           ## Get the individual project information and
@@ -1134,7 +1135,7 @@ sub generate_project_files {
         ## Unable to change to the directory.
         ## We don't restore the state before we leave,
         ## but that's ok since we will be exiting soon.
-        return 0, $creator;
+        return 0, $creator, "Unable to change directory to $dir";
       }
 
       ## Return things to the way they were
diff --git a/templates/makedll.mpt b/templates/makedll.mpt
index 58e9921c..d7380461 100644
--- a/templates/makedll.mpt
+++ b/templates/makedll.mpt
@@ -168,6 +168,7 @@ linux {
 }
 
 solaris {
+  shflags       = -G
   ldlibs        = -lsocket -ldl -lnsl -lgen -lposix4 -lthread
   extracppflags = -D_REENTRANT
 }