summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortradke <tradke@17b73243-c579-4c4c-a9d2-2d5706c11dac>2003-09-05 13:59:07 +0000
committertradke <tradke@17b73243-c579-4c4c-a9d2-2d5706c11dac>2003-09-05 13:59:07 +0000
commita71927516bb2ceaa8545d16799a9a20aab798abc (patch)
tree5520a9add8c86a9ca4d239f0f3bc92adc16a3205
parent75891ed51b6622978e02407e66be635be2e96adb (diff)
Sort the thorn link list also by the 'Requires Thorns:' list as taken from
configuration.ccl files. git-svn-id: http://svn.cactuscode.org/flesh/trunk@3396 17b73243-c579-4c4c-a9d2-2d5706c11dac
-rw-r--r--lib/sbin/CST10
1 files changed, 7 insertions, 3 deletions
diff --git a/lib/sbin/CST b/lib/sbin/CST
index 5fe4f6db..e9bebe74 100644
--- a/lib/sbin/CST
+++ b/lib/sbin/CST
@@ -6,7 +6,7 @@
# @desc
# Parses the the configuration files for thorns.
# @enddesc
-# @version $Header: /mnt/data2/cvs2svn/cvs-repositories/Cactus/lib/sbin/CST,v 1.53 2003-09-04 16:16:29 tradke Exp $
+# @version $Header: /mnt/data2/cvs2svn/cvs-repositories/Cactus/lib/sbin/CST,v 1.54 2003-09-05 13:59:07 tradke Exp $
#@@*/
# Global parameter to track the number of errors from the CST
@@ -385,10 +385,14 @@ sub CreateThornLinkList
next if ($configuration_database->{"\U$thorn OPTIONS\E"} =~ m/NO_SOURCE/i ||
$thorn eq "Cactus");
+ # add any thorns which this thorn requires to be compiled
+ @requires = split (' ', $configuration_database->{"\U$thorn\E REQUIRES THORNS"});
+ unshift (@libs, @requires) if (@requires);
+
$implementation = $interface_database->{"\U$thorn\E IMPLEMENTS"};
- if ($interface_database->{"IMPLEMENTATION \U$implementation\E ANCESTORS"})
+ @anchestors = split (' ', $interface_database->{"IMPLEMENTATION \U$implementation\E ANCESTORS"});
+ if (@anchestors)
{
- @anchestors = split (' ', $interface_database->{"IMPLEMENTATION \U$implementation\E ANCESTORS"});
for ($i = $j = 0; $i <= $#libs; $i++)
{
if ($libs[$i] =~ /^$implementation$/i)