Merge branch 'master' into master

Author: simonmcqueen

.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/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", ],
             );
@@ -1386,7 +1386,6 @@ sub process_component_line {
       $key =~ s/\\/\//g if ($self->{'convert_slashes'});
       my $cmdflags = $$flags{'commandflags'};
       my($add_out, $deps) = $cmdHelper->get_output($key, $cmdflags);
-
       push(@{$self->{'custom_special_output'}->{$tag}->{$key}}, @$add_out);
       foreach my $depTag (keys %$deps) {
         foreach my $depFile (keys %{$deps->{$depTag}}) {
@@ -3183,10 +3182,9 @@ sub correct_generated_files {
 sub generate_default_components {
   my($self, $files, $passed) = @_;
   my $genext   = $self->{'generated_exts'};
-  my @gc       = reverse sort { $self->sort_generated_types($a, $b)
-                              } keys %$genext;
   my @tags     = (defined $passed ? $passed :
-                    (@gc, keys %{$language{$self->get_language()}->[0]}));
+                    ($self->get_generated_components(),
+                     keys %{$language{$self->get_language()}->[0]}));
   my $pchh     = $self->get_assignment('pch_header');
   my $pchc     = $self->get_assignment('pch_source');
   my $recurse  = $self->get_assignment('recurse');
@@ -3195,11 +3193,9 @@ sub generate_default_components {
   my $cmdflags = 'commandflags';
 
   ## The order of @tags does make a difference in the way that generated
-  ## files get added.  Hence the sort call on the generate_exts keys to
-  ## ensure that user defined types come first.  They are reverse sorted
-  ## using the custom sort function to ensure that user defined types
-  ## that rely on other user defined types for input files are processed
-  ## first.
+  ## files get added.  The function that returns the generated components
+  ## sorts the tags such that user defined types that rely on other user
+  ## defined types for input files are processed first.
   foreach my $tag (@tags) {
     if (!defined $genext->{$tag} ||
         $genext->{$tag}->{'automatic_in'}) {
@@ -3688,27 +3684,80 @@ sub remove_excluded {
 }
 
 
-sub sort_generated_types {
-  ## We need to sort the custom component types such that a custom type
-  ## that generates input for another custom type comes first in the
-  ## list.
-  my($self, $left, $right, $norecurse) = @_;
-  foreach my $key (keys %{$self->{'generated_exts'}->{$left}}) {
+sub get_outputexts {
+  my($self, $type) = @_;
+  my @outputexts;
+
+  ## Get all generated output extensions for this generated type.
+  foreach my $key (keys %{$self->{'generated_exts'}->{$type}}) {
     if ($key =~ /_files$/) {
-      foreach my $regex (@{$self->{'generated_exts'}->{$left}->{$key}}) {
-        my $ext = $regex;
-        $ext =~ s/\\//g;
-        foreach my $vreg (@{$self->{'valid_components'}->{$right}}) {
-          return -1 if ($ext =~ /$vreg$/);
+      push(@outputexts, @{$self->{'generated_exts'}->{$type}->{$key}});
+    }
+  }
+
+  ## If the generated type has a helper, get it and add the output exstensions
+  ## to the list.
+  my $cmdHelper = $self->find_command_helper($type);
+  push(@outputexts, @{$cmdHelper->get_outputexts()}) if (defined $cmdHelper);
+
+  return \@outputexts;
+}
+
+sub get_generated_components {
+  my $self = shift;
+  my @list = keys %{$self->{'generated_exts'}};
+  my $len  = scalar(@list);
+  my %geninfo;
+  my %movedfor;
+  for(my $i = 1; $i < $len; $i++) {
+    my $right = $list[$i];
+
+    ## Cache the outputexts into a hash map so that we do not have to call a
+    ## function more than once per type.  Since items in the list will be
+    ## swapped and $i modified, we are very likely to hit this cache multiple
+    ## times.
+    my $outputexts;
+    if (exists $geninfo{$right}) {
+      $outputexts = $geninfo{$right};
+    }
+    else {
+      $geninfo{$right} = $outputexts = $self->get_outputexts($right);
+    }
+
+    ## Go backwards in the list to see if $right will generate inputs for
+    ## anything to the left.
+    for(my $j = $i - 1; $j >= 0; $j--) {
+      my $left = $list[$j];
+      ## See if $right generates input for $left
+      my $generates;
+      foreach my $inputext (@{$self->{'valid_components'}->{$left}}) {
+        if (grep { $_ eq $inputext } @$outputexts) {
+          $generates = 1;
+          last;
         }
       }
+
+      if ($generates) {
+        ## If it does and we haven't already moved $right because of $left,
+        ## then we will move $right in front of $left, push everything to the
+        ## right up to $i, and reset $i to $j (after the increment of the outer
+        ## for loop).
+        if (exists $movedfor{$right} && $movedfor{$right} eq $left) {
+          $self->warning("Circular generation dependency for $right and $left");
+        }
+        else {
+          $movedfor{$right} = $left;
+          for(my $k = $i; $k > $j; $k--) {
+            $list[$k] = $list[$k - 1];
+          }
+          $list[$j] = $right;
+          $i = $j - 1;
+        }
+        last;
+      }
     }
   }
-  if (!$norecurse && $self->sort_generated_types($right, $left, 1) == -1) {
-    return 1;
-  }
-
-  return 0;
+  return @list;
 }
 
 sub generate_defaults {
@@ -3747,8 +3796,7 @@ sub generate_defaults {
   my @vc = sort { return -1 if $a eq 'source_files';
                   return  1 if $b eq 'source_files';
                   return $b cmp $a; } keys %{$self->{'valid_components'}};
-  my @gvc = sort { $self->sort_generated_types($a, $b)
-                 } keys %{$self->{'generated_exts'}};
+  my @gvc = $self->get_generated_components();
   foreach my $gentype (@gvc) {
     $self->list_default_generated($gentype, \@vc);
   }

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