ChangeLogTag: Mon Jul 18 10:26:15 2005 Chad Elliott <elliott_c@ociweb.com>

4 files changed, 44 insertions, 20 deletions

diff --git a/ChangeLog b/ChangeLog
index 8487b418..0c7bb8ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+Mon Jul 18 10:26:15 2005  Chad Elliott  <elliott_c@ociweb.com>
+
+        * modules/ProjectCreator.pm:
+
+          Ignore whitespace when excluding files.  Also, fixed an issue with
+          setting sharedname to empty and not setting staticname.  It should
+          have defaulted the staticname and leave sharedname emtpy.
+
+        * modules/WorkspaceCreator.pm:
+
+          Ignore whitespace when negating project types.
+
+        * templates/nmake.mpd:
+
+          Fixed a bug in this template where the OUTDIR was not correctly
+          set to 'libout' in static projects.
+
 Mon Jul 11 13:26:52 2005  Chad Elliott  <elliott_c@ociweb.com>
 
         * templates/nmakedll.mpt:
diff --git a/modules/ProjectCreator.pm b/modules/ProjectCreator.pm
index 0014571e..ddcb7606 100644
--- a/modules/ProjectCreator.pm
+++ b/modules/ProjectCreator.pm
@@ -895,8 +895,8 @@ sub process_component_line {
   else {
     ## If we successfully remove a '!' from the front, then
     ## the file(s) listed are to be excluded
-    my($rem) = ($line =~ s/^\^//);
-    my($exc) = $rem || ($line =~ s/^!//);
+    my($rem) = ($line =~ s/^\^\s*//);
+    my($exc) = $rem || ($line =~ s/^!\s*//);
 
     ## Convert any $(...) in this line before we process any
     ## wild card characters.  If we do not, scoped assignments will
@@ -2157,20 +2157,23 @@ sub generate_default_target_names {
 
   if (!$self->exe_target()) {
     my($sharedname) = $self->get_assignment('sharedname');
-    if (defined $sharedname &&
-        !defined $self->get_assignment('staticname')) {
-      $self->process_assignment('staticname', $sharedname);
-    }
     my($staticname) = $self->get_assignment('staticname');
-    if (defined $staticname) {
-      if (!defined $sharedname) {
-        $sharedname = $staticname;
-        $self->process_assignment('sharedname', $sharedname);
-      }
-      elsif ($sharedname eq '') {
+    my($shared_empty) = undef;
+
+    if (defined $sharedname) {
+      if ($sharedname eq '') {
+        $shared_empty = 1;
         $sharedname = undef;
         $self->process_assignment('sharedname', $sharedname);
       }
+      elsif (!defined $staticname) {
+        $staticname = $sharedname;
+        $self->process_assignment('staticname', $staticname);
+      }
+    }
+    if (defined $staticname && !$shared_empty && !defined $sharedname) {
+      $sharedname = $staticname;
+      $self->process_assignment('sharedname', $sharedname);
     }
 
     ## If it's neither an exe or library target, we will search
@@ -2192,14 +2195,16 @@ sub generate_default_target_names {
       }
 
       ## If we still don't have a project type, then we will
-      ## default to a library if there are source files
-      if (!$self->exe_target()) {
+      ## default to a library if there are source or resource files
+      if (!defined $exename) {
         if ($#sources < 0) {
           @sources = $self->get_component_list('resource_files', 1);
         }
         if ($#sources >= 0) {
-          $self->process_assignment('sharedname',
-                                    $self->{'unmodified_project_name'});
+          if (!$shared_empty) {
+            $self->process_assignment('sharedname',
+                                      $self->{'unmodified_project_name'});
+          }
           $self->process_assignment('staticname',
                                     $self->{'unmodified_project_name'});
         }
diff --git a/modules/WorkspaceCreator.pm b/modules/WorkspaceCreator.pm
index 3b2b9373..193d8020 100644
--- a/modules/WorkspaceCreator.pm
+++ b/modules/WorkspaceCreator.pm
@@ -382,7 +382,7 @@ sub parse_exclude {
 
     ## Process negated exclusions
     foreach my $key (keys %types) {
-      if ($key =~ /^!(\w+)/) {
+      if ($key =~ /^!\s*(\w+)/) {
         ## Remove the negated key
         delete $types{$key};
 
diff --git a/templates/nmake.mpd b/templates/nmake.mpd
index ea9601d8..f818040d 100644
--- a/templates/nmake.mpd
+++ b/templates/nmake.mpd
@@ -55,13 +55,15 @@ GENERATED_DIRTY =<%foreach(custom_types)%><%foreach(custom_type->input_files)%><
 <%if(exename)%>
 OUTDIR=<%output_dir(".")%>
 INSTALLDIR=<%if(install)%><%install%><%else%><%output_dir%><%endif%>
-<%endif%>
+<%else%>
 <%if(type_is_static)%>
-OUTDIR=<%output_dir(".")%>
-<%endif%>
+OUTDIR=<%libout%>
+<%else%>
 <%if(type_is_dynamic)%>
 OUTDIR=<%if(dllout)%><%dllout%><%else%><%libout%><%endif%>
 <%endif%>
+<%endif%>
+<%endif%>
 INTDIR=<%intermediate_dir%>\<%project_name%>\<%machine%>
 
 ALL : DEPENDCHECK $(GENERATED_DIRTY)<%if(exename)%><%if(install)%> "$(INSTALLDIR)"<%endif%><%endif%><%if(type_is_dynamic)%><%if(sharedname || staticname)%> "<%if(dllout)%><%dllout%><%else%><%libout%><%endif%>\<%if(sharedname)%><%sharedname%><%else%><%staticname%><%endif%><%if(use_lib_modifier)%><%lib_modifier%><%endif%><%dll_ext%>"<%endif%><%endif%><%if(staticname && type_is_static)%> "$(OUTDIR)\<%staticname%><%if(use_lib_modifier)%><%lib_modifier%><%endif%><%lib_ext%>"<%endif%><%if(exename)%> "$(INSTALLDIR)\<%exename%><%if(use_exe_modifier)%><%lib_modifier%><%endif%><%exe_ext%>"<%endif%><%if(postbuild)%> __postbuild__<%endif%>