Merge branch 'master' into jwi-bmake

Author: jwillemsen

.github/workflows/windows.yml

@@ -81,10 +81,9 @@ jobs:
         '{"name": "tao","version-string": "githubaction","dependencies": [ ${{ matrix.vcpkgpackages }} ]}' > vcpkg.json
       shell: pwsh
     - name: Install vcpkg
-      uses: lukka/run-vcpkg@v10
+      uses: lukka/run-vcpkg@v11
       with:
-        vcpkgGitCommitId: 94ce0dab56f4d8ba6bd631ba59ed682b02d45c46
-        appendedCacheKey: ${{ matrix.name }}
+        vcpkgGitCommitId: 5b1214315250939257ef5d62ecdcbca18cf4fb1c
         runVcpkgInstall: true
     - name: create $ACE_ROOT/ace/config.h
       run: |

create_base.pl

@@ -32,7 +32,7 @@
 # Data Section
 # ******************************************************************
 
-my $version = '0.1';
+my $version = '0.2';
 
 # ******************************************************************
 # Subroutine Section
@@ -45,6 +45,8 @@ sub gather_info {
   if (open($fh, $name)) {
     my @lines = ();
     my $pname = undef;
+    my $pline = undef;
+
     while(<$fh>) {
       ## Get the line a remove leading and trailing white space
       my $line = $_;
@@ -81,6 +83,7 @@ sub gather_info {
         ## us.
         $pname = Creator::fill_type_name(undef, $pname, $def);
         push(@lines, "project$parents {");
+        $pline = $def;
       }
       elsif ($line =~ /^(shared|static)name\s*=\s*(.+)$/) {
         ## Add in the libs and after settings.
@@ -95,10 +98,15 @@ sub gather_info {
     }
     close($fh);
 
-    ## Only return the lines if there is more than one line.  It is
-    ## possible (and likely) that we've read in the project declaration,
-    ## but the project did not contain a sharedname or staticname
-    ## setting.
+    ## If we have the unmodified project name, but the user did not provide
+    ## a sharedname or staticname, we will use that as the library name.
+    if (defined $pline && $#lines == 0) {
+      push(@lines, "  libs  += $pline",
+                   "  after += $pname",
+                   "}");
+    }
+
+    ## Only return the lines if there is more than one line.
     return @lines if ($#lines > 0);
   }
 
@@ -148,9 +156,7 @@ sub usageAndExit {
   print STDERR "Create Base Project v$version\n",
                "Usage: ", basename($0), " <mpc files> <output file or ",
                "directory>\n\nThis script will create a base project ",
-               "based on the contents of the\nsupplied MPC file.  ",
-               "This is only useful if the project ",
-               "explicitly sets\nsharedname or staticname.\n";
+               "based on the contents of the\nsupplied MPC file.\n";
   exit(0);
 }
 

modules/CommandHelper.pm

@@ -51,6 +51,7 @@ sub get {
   ## create a singleton of that type and return it.
   foreach my $inc (@INC) {
     if (-r "$inc/$type.pm") {
+      OutputMessage::debug(undef, "Found $type.pm in $inc");
       require "$type.pm";
       $required{$type} = $type->new();
       return $required{$type};

modules/MakeWorkspaceBase.pm

@@ -61,6 +61,7 @@ sub workspace_preamble {
 
   ## Optionally print the workspace comment
   $self->print_workspace_comment($fh,
+            '# -*-Makefile-*-', $crlf,
             '#----------------------------------------------------------------------------', $crlf,
             '#       ', $name, $crlf,
             '#', $crlf,

modules/MakeWorkspaceCreator.pm

@@ -38,7 +38,7 @@ sub write_project_targets {
     my $chdir = ($dname ne '.');
     print $fh "\t\@",
               ($chdir ? "cd $dname && " : ''),
-              "\$(MAKE) -f ",
+              '"$(MAKE)" -f ',
               ($chdir ? $self->mpc_basename($project) : $project),
               " $target$crlf";
   }

modules/ProjectCreator.pm

@@ -194,7 +194,7 @@ my $cppresource = 'resource_files';
 my %cppvc = ('source_files'        => [ "\\.cpp", "\\.cxx", "\\.cc", "\\.c", "\\.C", ],
              'template_files'      => [ "_T\\.cpp", "_T\\.cxx", "_T\\.cc", "_T\\.c", "_T\\.C", "_t\\.cpp", "_t\\.cxx", "_t\\.cc", "_t\\.c", "_t\\.C", "\\.tpp" ],
              'header_files'        => [ "\\.h", "\\.hpp", "\\.hxx", "\\.hh", ],
-             'inline_files'        => [ "\\.i", "\\.ipp", "\\.inl", ],
+             'inline_files'        => [ "\\.i", "\\.ipp", "\\.ixx", "\\.inl", ],
              'documentation_files' => [ "README", "readme", "\\.doc", "\\.txt", "\\.html" ],
              $cppresource          => [ "\\.rc", ],
             );

modules/WorkspaceCreator.pm

@@ -1802,7 +1802,8 @@ sub generate_project_files_fork {
     }
 
     $self->{'cacheok'} = $cacheok;
-    if ($self->cd($dir)) {
+    my $full = $self->path_is_relative($dir) ? "$cwd/$dir" : $dir;
+    if ($self->cd($full)) {
       if ($self->{'cacheok'} && defined $allprojects{$prkey}) {
 
         $files_written = $allprojects{$prkey};
@@ -1840,8 +1841,7 @@ sub generate_project_files_fork {
       ## 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, $msg;
-
+      return 0, $creator, "Unable to change directory to $full";
     }
 
     ## Return things to the way they were

templates/make.mpd

@@ -1,3 +1,4 @@
+# -*-Makefile-*-
 #----------------------------------------------------------------------------
 #       Macros
 #----------------------------------------------------------------------------
@@ -119,8 +120,9 @@ AREXT         = <%lib_ext%>
 LIB           = $(LTARGETDIR)$(LIBPREFIX)<%staticname%>$(LIBSUFFIX)$(AREXT)
 <%endif%>
 <%endif%>
-<%if(dll_ext && sharedname)%>
+<%if(dll_ext)%>
 SOEXT         = <%dll_ext%>
+<%if(sharedname)%>
 SHTARGETDIR   = <%if(dllout)%><%dllout%><%if(!compares(dllout, .))%><%output_dir_ext%><%endif%><%else%><%libout%><%if(!compares(libout, .))%><%output_dir_ext%><%endif%><%endif%><%slash%><%targetoutdir%>
 <%if(version && versupport)%>
 SHLIB_BASE    = $(LIBPREFIX)<%sharedname%>$(LIBSUFFIX)$(SOEXT)
@@ -130,6 +132,7 @@ SHLIB         = $(SHTARGETDIR)$(LIBPREFIX)<%sharedname%>$(LIBSUFFIX)$(SOEXT)
 SHFLAGS       = <%shflags%>
 <%endif%>
 <%endif%>
+<%endif%>
 SRC           =<%if(pch_source && pchsupport)%> <%pch_source%><%endif%> <%source_files%>
 LINK.cc       = <%if(dld)%><%dld%> $(LDFLAGS)<%else%>$(LD) $(LDFLAGS)<%endif%>
 <%if(!contains(language, java))%>