ChangeLogTag: Thu Jun 19 07:13:16 2003 Chad Elliott <elliott_c@ociweb.com>

4 files changed, 22 insertions, 9 deletions

diff --git a/bin/MakeProjectCreator/README b/bin/MakeProjectCreator/README
index 5978b846d47..fd8d0a30d51 100644
--- a/bin/MakeProjectCreator/README
+++ b/bin/MakeProjectCreator/README
@@ -137,6 +137,15 @@ verbatim        This allows arbitrary information to be place in a generated
                 the generated project.  If you need to preserve white space,
                 the line or lines should be placed inside double quotes.
 
+specific        This scope allows assignments that are specific to a
+                particular project type.  The syntax is as follows:
+
+                specific(<project type> [, <project type> ...]) {
+                  idlflags += -Ge 1
+                  lit_libs += c
+                  ...
+                }
+
 requires        Specifies which features should be enabled in order to
                 generate the project file.  Under the GNUACE type, it also
                 specifies which tao macros should be set to build the
diff --git a/bin/MakeProjectCreator/modules/ProjectCreator.pm b/bin/MakeProjectCreator/modules/ProjectCreator.pm
index 26cf9b91ba9..90205382fc5 100644
--- a/bin/MakeProjectCreator/modules/ProjectCreator.pm
+++ b/bin/MakeProjectCreator/modules/ProjectCreator.pm
@@ -421,8 +421,9 @@ sub parse_line {
           }
         }
         elsif ($comp eq 'specific') {
+          my(@types) = split(/\s*,\s*/, $name);
           ($status, $errorString) = $self->parse_scope(
-                       $ih, $values[1], $values[2], \%validNames,
+                       $ih, $values[1], \@types, \%validNames,
                        $self->{'type_specific_assign'}->{$self->{'pctype'}});
         }
         elsif ($comp eq 'define_custom') {
@@ -799,16 +800,18 @@ sub parse_define_custom {
 
 sub handle_scoped_end {
   my($self)  = shift;
-  my($type)  = shift;
+  my($types) = shift;
   my($flags) = shift;
 
-  if (defined $self->{'type_specific_assign'}->{$type}) {
-    foreach my $key (keys %$flags) {
-      $self->{'type_specific_assign'}->{$type}->{$key} = $$flags{$key};
+  foreach my $type (@$types) {
+    if (defined $self->{'type_specific_assign'}->{$type}) {
+      foreach my $key (keys %$flags) {
+        $self->{'type_specific_assign'}->{$type}->{$key} = $$flags{$key};
+      }
+    }
+    else {
+      $self->{'type_specific_assign'}->{$type} = $flags;
     }
-  }
-  else {
-    $self->{'type_specific_assign'}->{$type} = $flags;
   }
 }
 
diff --git a/bin/MakeProjectCreator/templates/gnu.mpd b/bin/MakeProjectCreator/templates/gnu.mpd
index 150d02dc04b..6875f558a5a 100644
--- a/bin/MakeProjectCreator/templates/gnu.mpd
+++ b/bin/MakeProjectCreator/templates/gnu.mpd
@@ -231,7 +231,7 @@ TAO_IDLFLAGS += <%idlflags%>
 <%if(exename)%>LDLIBS<%endif%><%if(sharedname)%>ACE_SHLIBS<%endif%>  =<%foreach(libs)%> -l<%lib%><%endfor%><%if(sharedname)%> $(ACELIB)<%endif%>
 <%endif%>
 <%if(lit_libs)%>
-<%if(exename)%>LDLIBS<%endif%><%if(sharedname)%>ACE_SHLIBS<%endif%> +=<%foreach(lit_libs)%> -l<%lit_lib%><%endfor%><%if(sharedname)%> $(ACELIB)<%endif%>
+<%if(exename)%>LDLIBS<%endif%><%if(sharedname)%>ACE_SHLIBS<%endif%> +=<%foreach(lit_libs)%> -l<%lit_lib%><%endfor%> 
 <%endif%>
 <%if(ssl)%>
 <%if(exename)%>LDLIBS<%endif%><%if(sharedname)%>ACE_SHLIBS<%endif%> +=<%foreach(ssl_libs)%> -l<%ssl_lib%><%endfor%>
diff --git a/bin/MakeProjectCreator/templates/makedll.mpt b/bin/MakeProjectCreator/templates/makedll.mpt
index 3b24a874094..15e8c50f132 100644
--- a/bin/MakeProjectCreator/templates/makedll.mpt
+++ b/bin/MakeProjectCreator/templates/makedll.mpt
@@ -1,5 +1,6 @@
 configurations = gcc
 soext          = so
+ssl_libs       = ssl crypto
 zzip_libs      = z zziplib
 
 gcc {