summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/make/make.config.defn.in2
-rw-r--r--lib/make/make.configuration4
-rw-r--r--lib/make/make.thornlib2
-rwxr-xr-xlib/make/new_thorn.pl16
-rw-r--r--lib/sbin/CST14
-rw-r--r--lib/sbin/MakeUtils.pl8
-rw-r--r--lib/sbin/ParamLatex.pl2
-rw-r--r--lib/sbin/Runtest.pl4
-rw-r--r--lib/sbin/checkout.pl4
-rw-r--r--lib/sbin/configure_thorns.pl2
10 files changed, 29 insertions, 29 deletions
diff --git a/lib/make/make.config.defn.in b/lib/make/make.config.defn.in
index a9e44bf6..3c7b6272 100644
--- a/lib/make/make.config.defn.in
+++ b/lib/make/make.config.defn.in
@@ -11,7 +11,7 @@
# @version $Id$
# @@*/
-# Include stuff defined by optional extra packages
+# Include stuff defined by optional extra arrangements
include $(TOP)/config-data/make.extra.defn
diff --git a/lib/make/make.configuration b/lib/make/make.configuration
index f4e7e892..88458f5b 100644
--- a/lib/make/make.configuration
+++ b/lib/make/make.configuration
@@ -119,8 +119,8 @@ $(CONFIG)/make.thornlist: $(TOP)/ThornList $(foreach lib, $(CCTK_HOME)/src $(THO
$(TOP)/ThornList:
@echo $(DIVIDER)
- @echo Creating compiled ThornList containing all thorns in the packages directory
- $(PERL) -s $(BUILD_ACTIVETHORNS) $(CCTK_HOME)/packages > $@
+ @echo Creating compiled ThornList containing all thorns in the arrangements directory
+ $(PERL) -s $(BUILD_ACTIVETHORNS) $(CCTK_HOME)/arrangements > $@
action="yes"; if [ "x$$EDITOR" = "x" ] ; then EDITOR=vi ; fi; \
while [ "x$$action" = "xyes" -o "x$$action" = "xy" -o "x$$action" = "xYES" -o "x$$action" = "xY" ] ; \
do \
diff --git a/lib/make/make.thornlib b/lib/make/make.thornlib
index 76830b76..80dbf046 100644
--- a/lib/make/make.thornlib
+++ b/lib/make/make.thornlib
@@ -19,7 +19,7 @@ DIVIDER = $(DIVEL)$(DIVEL)$(DIVEL)$(DIVEL)
include $(CONFIG)/make.config.defn
# Add appropriate include lines
-INC_DIRS = $(SYS_INC_DIRS) $(SRCDIR) $(SRCDIR)/include $(CONFIG) $(TOP)/bindings/include $(CCTK_HOME)/src/include $(CCTK_HOME)/packages
+INC_DIRS = $(SYS_INC_DIRS) $(SRCDIR) $(SRCDIR)/include $(CONFIG) $(TOP)/bindings/include $(CCTK_HOME)/src/include $(CCTK_HOME)/arrangements
# Allow subdirectories to inherit these include directories
export INC_DIRS
diff --git a/lib/make/new_thorn.pl b/lib/make/new_thorn.pl
index ffb1d2b6..2a9c90e3 100755
--- a/lib/make/new_thorn.pl
+++ b/lib/make/new_thorn.pl
@@ -9,7 +9,7 @@
# @version $Id$
#@@*/
-$package_dir = "packages";
+$package_dir = "arrangements";
$thorn_name = shift(@ARGV);
@@ -20,10 +20,10 @@ if(!$thorn_name)
if(!$package)
{
- @packages = &GetToolkits($package_dir);
+ @arrangements = &GetToolkits($package_dir);
- print "The following packages are available:\n";
- foreach $package (@packages)
+ print "The following arrangements are available:\n";
+ foreach $package (@arrangements)
{
print "$package\n";
}
@@ -182,7 +182,7 @@ sub prompt {
# @date Wed Feb 3 16:45:22 1999
# @author Tom Goodale
# @desc
-# Gets a list of the current packages.
+# Gets a list of the current arrangements.
# @enddesc
# @calls
# @calledby
@@ -195,7 +195,7 @@ sub GetToolkits
{
local($package_dir) = @_;
local($start_dir);
- local(@packages);
+ local(@arrangements);
$start_dir = `pwd`;
@@ -215,7 +215,7 @@ sub GetToolkits
# Just pick directories
if( -d $_)
{
- push (@packages, $_);
+ push (@arrangements, $_);
}
}
@@ -223,5 +223,5 @@ sub GetToolkits
chdir $start_dir;
- return @packages;
+ return @arrangements;
}
diff --git a/lib/sbin/CST b/lib/sbin/CST
index da9a4c06..a9a9b896 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.24 1999-07-24 23:01:17 goodale Exp $
+# @version $Header: /mnt/data2/cvs2svn/cvs-repositories/Cactus/lib/sbin/CST,v 1.25 1999-07-30 15:56:42 allen Exp $
#@@*/
# Global parameter to track the number of errors from the CST
@@ -51,7 +51,7 @@ if(! $bindings_dir)
########################################################################
-# Require certain packages
+# Require certain arrangements
$sbin_dir = "$cctk_home/lib/sbin";
@@ -229,11 +229,11 @@ sub CreateThornList
# No longer strip thorn_ off the beginning of a thorn name.
# $thorn_name =~ s/thorn_//;
- if( -d "$cctk_home/packages/$thorn")
+ if( -d "$cctk_home/arrangements/$thorn")
{
- if( -r "$cctk_home/packages/$thorn/param.ccl" &&
- -r "$cctk_home/packages/$thorn/interface.ccl" &&
- -r "$cctk_home/packages/$thorn/schedule.ccl")
+ if( -r "$cctk_home/arrangements/$thorn/param.ccl" &&
+ -r "$cctk_home/arrangements/$thorn/interface.ccl" &&
+ -r "$cctk_home/arrangements/$thorn/schedule.ccl")
{
if( $thornlist{"$thorn_name"} )
{
@@ -242,7 +242,7 @@ sub CreateThornList
}
else
{
- $thornlist{"$thorn_name"} = "$cctk_home/packages/$thorn";
+ $thornlist{"$thorn_name"} = "$cctk_home/arrangements/$thorn";
}
}
else
diff --git a/lib/sbin/MakeUtils.pl b/lib/sbin/MakeUtils.pl
index 1b2934f2..8d1ad07b 100644
--- a/lib/sbin/MakeUtils.pl
+++ b/lib/sbin/MakeUtils.pl
@@ -22,7 +22,7 @@
sub buildthorns
{
local($package_dir,$choice) = @_;
- local(@packages);
+ local(@arrangements);
chdir $package_dir || die "Can't change directory to $package_dir\n";
@@ -42,7 +42,7 @@ sub buildthorns
# Just pick directories
if( -d $_)
{
- push (@packages, $_);
+ push (@arrangements, $_);
}
}
@@ -51,7 +51,7 @@ sub buildthorns
if ($choice =~ "thorns")
{
- foreach $package (@packages)
+ foreach $package (@arrangements)
{
chdir $package;
@@ -83,7 +83,7 @@ sub buildthorns
}
else
{
- @total_list = @packages;
+ @total_list = @arrangements;
}
foreach $thorn (@total_list)
diff --git a/lib/sbin/ParamLatex.pl b/lib/sbin/ParamLatex.pl
index c6afa6f9..e5db6241 100644
--- a/lib/sbin/ParamLatex.pl
+++ b/lib/sbin/ParamLatex.pl
@@ -4,7 +4,7 @@ $sbin_dir = "lib/sbin";
require "$sbin_dir/parameter_parser.pl";
-$thorn{"WaveToy"} = "packages/CactusApplications/WaveToy";
+$thorn{"WaveToy"} = "arrangements/CactusApplications/WaveToy";
%parameter_database = &create_parameter_database(%thorn);
diff --git a/lib/sbin/Runtest.pl b/lib/sbin/Runtest.pl
index 746e29e3..10554579 100644
--- a/lib/sbin/Runtest.pl
+++ b/lib/sbin/Runtest.pl
@@ -77,8 +77,8 @@ if (!open (AT, "< $scratchdir${sep}ThornList")) {
while (<AT>) {
@t = split(' ');
foreach $T (@t) {
- if (-d "packages${sep}$T${sep}test") {
- @testfiles = (@testfiles, <packages${sep}$T${sep}test${sep}*.par>);
+ if (-d "arrangements${sep}$T${sep}test") {
+ @testfiles = (@testfiles, <arrangements${sep}$T${sep}test${sep}*.par>);
}
}
}
diff --git a/lib/sbin/checkout.pl b/lib/sbin/checkout.pl
index f5e4003a..e2487faf 100644
--- a/lib/sbin/checkout.pl
+++ b/lib/sbin/checkout.pl
@@ -20,7 +20,7 @@ elsif ($which =~ /^t/i)
{
&get_thorns();
}
-elsif ($which =~ /^a/i)
+elsif ($which =~ /^ap/i)
{
&get_applications();
}
@@ -48,7 +48,7 @@ while ()
{
&get_thorns();
}
- elsif ($dowhat =~ /^a/i)
+ elsif ($dowhat =~ /^ap/i)
{
&get_applications();
}
diff --git a/lib/sbin/configure_thorns.pl b/lib/sbin/configure_thorns.pl
index 2fbb9a31..af12e62f 100644
--- a/lib/sbin/configure_thorns.pl
+++ b/lib/sbin/configure_thorns.pl
@@ -17,7 +17,7 @@ chdir $top;
chdir $config;
-chdir "packages";
+chdir "arrangements";
foreach $thorn (keys %activethorns)
{
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-25 11:55:19 +0000