summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfukachan <fukachan>2001-03-04 04:42:31 +0000
committerfukachan <fukachan>2001-03-04 04:42:31 +0000
commit0131796bddeb3fd72f5d03d0b07ad87706b223bb (patch)
treefeaf30cc4a5c038c0924b9dde3b830a3bfef5f15
parent2d4615b11721cde9110a079672ff4129cd74d347 (diff)
downloadfml8-0131796bddeb3fd72f5d03d0b07ad87706b223bb.tar.gz
fml8-0131796bddeb3fd72f5d03d0b07ad87706b223bb.tar.bz2
fml8-0131796bddeb3fd72f5d03d0b07ad87706b223bb.zip
clean up comments
-rw-r--r--cpan/index.ja.html2
-rwxr-xr-xfml/bin/show_hierarchy.pl12
-rwxr-xr-xfml/bin/show_modules.sh5
-rw-r--r--fml/etc/main.cf51
-rwxr-xr-xregress/simulation/.fmldoc.pl (renamed from fml/bin/fmldoc)0
-rw-r--r--regress/simulation/todo/doc26
6 files changed, 57 insertions, 39 deletions
diff --git a/cpan/index.ja.html b/cpan/index.ja.html
index 7cbcb76e..57f3b404 100644
--- a/cpan/index.ja.html
+++ b/cpan/index.ja.html
@@ -22,3 +22,5 @@ CPAN から輸入したモジュール群
<!-- =================================================================== -->
</BODY>
</HTML>
+
+
diff --git a/fml/bin/show_hierarchy.pl b/fml/bin/show_hierarchy.pl
index ce6cd775..7f819cb0 100755
--- a/fml/bin/show_hierarchy.pl
+++ b/fml/bin/show_hierarchy.pl
@@ -99,15 +99,15 @@ sub load
if (/(use|require)\s+([A-Z]\S+[a-zA-Z0-9])/) {
unless ( $function_hach{ $current_function } ) {
if ($verbose) {
- &P();
- &P( "${name}::". $current_function );
+ &Print();
+ &Print( "${name}::". $current_function );
}
$function_hach{ $current_function } = 1;
}
- &P() if $Count == 1;
- &P() if $Count == 2;
- $verbose ? &P( $_ , $. ) : &P( $_ );
+ &Print() if $Count == 1;
+ &Print() if $Count == 2;
+ $verbose ? &Print( $_ , $. ) : &Print( $_ );
$file = $2;
$file =~ s/\"//g;
$file =~ s/\'//g;
@@ -128,7 +128,7 @@ sub load
}
-sub P
+sub Print
{
my ($s, $lc) = @_;
diff --git a/fml/bin/show_modules.sh b/fml/bin/show_modules.sh
index c95c6532..b9d036e7 100755
--- a/fml/bin/show_modules.sh
+++ b/fml/bin/show_modules.sh
@@ -1,6 +1,11 @@
#!/bin/sh
+#
+# $Id$
+#
for x in libexec/[a-z]* FML/*pm
do
sed '/=head1/,/=cut/d' $x |less
done
+
+exit 0
diff --git a/fml/etc/main.cf b/fml/etc/main.cf
index 486b033a..f3272e4a 100644
--- a/fml/etc/main.cf
+++ b/fml/etc/main.cf
@@ -1,34 +1,67 @@
+# fml version
+# This is important
+# Example: fml 5.0
+# fml-current YYYYMMDD
+# fml-devel YYYYMMDD
fml_version = __fml_version__
+
+###
+### DIRECTORIES
+###
+
+
+# $config_dir holds the global main configuration and
+# several version-dependent default configurations
+# Example: /etc/fml
config_dir = __config_dir__
+
+#
+# Example: /usr/local
default_prefix = __default_prefix__
+
+# Example: /usr/local/libexec/fml
libexec_prefix = $default_prefix
+# Example: /usr/local/lib/fml
lib_prefix = $default_prefix
+# Example: /usr/local/libexec/fml/$fml_version
libexec_dir = $libexec_prefix/libexec/fml/$fml_version
+# Example: /usr/local/lib/fml/$fml_version
lib_dir = $lib_prefix/lib/fml/$fml_version
-# site local
+# site local library location
+# which is prepared but not used by fml itself
local_lib_dir = $default_prefix/lib/fml/site_local
-# default_config.cf
-default_config = $config_dir/defaults/$fml_version/default_config.cf
+# ml's home directories
+# $ml_home_dir (e.g. /var/spool/ml/elena ) is taken from loader's @ARGV.
+# This is compatible with fml 4.0.
+# Example: /var/spool/ml
+ml_home_prefix = /var/spool/ml
+
+
+
+###
+### CONFIGURATION FILES AND DEFAULT PARAMETERS
+###
# default domain
default_domain = fml.org
-# domain specific configurations
-domain_default_config = $config_dir/domains/__domain__/config.cf
+# version dependent default_config.cf location
+# whic holds
+# Example: /etc/fml/defaults/5.0/default_config.cf
+default_config = $config_dir/defaults/$fml_version/default_config.cf
-# ml's home directories
-# $ml_home_dir (e.g. /var/spool/ml/elena ) is taken from loader's @ARGV.
-
-ml_home_prefix = /var/spool/ml
+# domain specific configurations
+# Example: /etc/fml/domains/fml.org/default_config.cf
+domain_default_config = $config_dir/domains/$default_domain/config.cf
diff --git a/fml/bin/fmldoc b/regress/simulation/.fmldoc.pl
index 48552a86..48552a86 100755
--- a/fml/bin/fmldoc
+++ b/regress/simulation/.fmldoc.pl
diff --git a/regress/simulation/todo/doc b/regress/simulation/todo/doc
index 74650aac..e67504a5 100644
--- a/regress/simulation/todo/doc
+++ b/regress/simulation/todo/doc
@@ -28,12 +28,6 @@ MailingList/Utils.pm
./index.html
./index.ja.html
-./cpan/index.ja.html
-
-./fml/bin/fmldoc
-./fml/bin/show_hierarchy.pl
-./fml/bin/show_modules.sh
-
./fml/doc/architecture.gif
./fml/doc/architecture.html
@@ -70,17 +64,14 @@ MailingList/Utils.pm
./fml/etc/config.cf
./fml/etc/default_config.cf.ja
./fml/etc/main.cf
-./fml/lib/index.ja.html
-./fml/lib/Makefile
-./fml/lib/__template.pm
-./fml/lib/Dialect/Japanese/index.ja.html
+
+
./fml/lib/Dialect/Japanese/Makefile
./fml/lib/Dialect/Japanese/String.pm
./fml/lib/Dialect/Japanese/Subject.pm
./fml/lib/Dialect/Japanese/Utils.pm
./fml/lib/Dialect/ISO2022JP.pm
./fml/lib/Dialect/Makefile
-./fml/lib/Dialect/index.ja.html
./fml/lib/FML/Article.pm
@@ -97,10 +88,8 @@ MailingList/Utils.pm
./fml/lib/FML/Messages.pm
./fml/lib/FML/PCB.pm
./fml/lib/FML/Parse.pm
-./fml/lib/FML/index.ja.html
./fml/lib/FML/CGI/TicketSystem.pm
./fml/lib/FML/CGI/Makefile
-./fml/lib/FML/CGI/index.ja.html
./fml/lib/FML/Command/mget.pm
./fml/lib/FML/Command/bye.pm
./fml/lib/FML/Command/get.pm
@@ -108,10 +97,8 @@ MailingList/Utils.pm
./fml/lib/FML/Command/resign.pm
./fml/lib/FML/Command/subscribe.pm
./fml/lib/FML/Command/unsubscribe.pm
-./fml/lib/FML/Header/index.ja.html
./fml/lib/FML/Header/Makefile
./fml/lib/FML/Header/Subject.pm
-./fml/lib/FML/Process/index.ja.html
./fml/lib/FML/Process/Command.pm
./fml/lib/FML/Process/Configure.pm
./fml/lib/FML/Process/Distribute.pm
@@ -123,14 +110,11 @@ MailingList/Utils.pm
./fml/lib/FML/Process/TicketSystem.pm
./fml/lib/FML/Process/CGI.pm
./fml/lib/FML/Ticket/Model/Makefile
-./fml/lib/FML/Ticket/Model/index.ja.html
./fml/lib/FML/Ticket/Model/toymodel.ja.txt
./fml/lib/FML/Ticket/Model/toymodel.pm
./fml/lib/FML/Ticket/00_DESIGN.txt
./fml/lib/FML/Ticket/Makefile
./fml/lib/FML/Ticket/System.pm
-./fml/lib/FML/Ticket/index.ja.html
-./fml/lib/File/index.ja.html
./fml/lib/File/Errors.pm
./fml/lib/File/Makefile
./fml/lib/File/RingBuffer.pm
@@ -138,7 +122,6 @@ MailingList/Utils.pm
./fml/lib/File/Sequence.pm
./fml/lib/File/SimpleLock.pm
./fml/lib/File/Utils.pm
-./fml/lib/IO/Adapter/index.ja.html
./fml/lib/IO/Adapter/Array.pm
./fml/lib/IO/Adapter/File.pm
@@ -150,8 +133,6 @@ MailingList/Utils.pm
./fml/lib/IO/Makefile
./fml/lib/IO/MapAdapter.pm
-./fml/lib/IO/index.ja.html
-./fml/lib/IO/File/index.ja.html
./fml/lib/IO/File/Atomic.pm
./fml/lib/IO/File/Makefile
@@ -159,7 +140,6 @@ MailingList/Utils.pm
./fml/lib/IO/t/file_map.pl
./fml/lib/IO/t/file_map_getpos.pl
./fml/lib/IO/t/unixgroup_map.pl
-./fml/lib/MailingList/Net/index.ja.html
./fml/lib/MailingList/Net/INET4.pm
./fml/lib/MailingList/Net/INET6.pm
./fml/lib/MailingList/Net/Makefile
@@ -171,10 +151,8 @@ MailingList/Utils.pm
./fml/lib/MailingList/Messages.pm
./fml/lib/MailingList/SMTP.pm
./fml/lib/MailingList/Utils.pm
-./fml/lib/MailingList/index.ja.html
./fml/lib/ErrorMessages/00_PARSE.ja.txt
./fml/lib/ErrorMessages/00_README.ja.txt
-./fml/lib/Tie/index.ja.html
./fml/lib/Tie/JournaledFile.pm
./fml/lib/Tie/Makefile
./fml/libexec/Standalone.pm