Permalink
Browse files

Move `Fcm::` namespace to `FCM1::`

This should avoid problems in case insensitive file system.
  • Loading branch information...
matthewrmshin committed Sep 19, 2013
1 parent 3fd67b7 commit 7b8a6b1e92d01330d22e820b41caaa7fc17d138d
Showing with 587 additions and 587 deletions.
  1. +7 −7 bin/fcm_gui
  2. +1 −1 bin/fcm_internal
  3. +2 −2 doc/user_guide/annex_fcm_cfg.html
  4. +4 −4 doc/user_guide/api.html
  5. +6 −6 doc/user_guide/code_management.html
  6. +24 −24 lib/FCM/System/CM.pm
  7. +13 −13 lib/FCM/System/Old.pm
  8. +3 −3 lib/FCM/Util/Event.pm
  9. +7 −7 lib/{Fcm → FCM1}/Base.pm
  10. +34 −34 lib/{Fcm → FCM1}/Build.pm
  11. +4 −4 lib/{Fcm → FCM1}/Build/Fortran.pm
  12. +24 −24 lib/{Fcm → FCM1}/BuildSrc.pm
  13. +11 −11 lib/{Fcm → FCM1}/BuildTask.pm
  14. +21 −21 lib/{Fcm → FCM1}/CfgFile.pm
  15. +17 −17 lib/{Fcm → FCM1}/CfgLine.pm
  16. +93 −93 lib/{Fcm → FCM1}/Cm.pm
  17. +31 −31 lib/{Fcm → FCM1}/CmBranch.pm
  18. +9 −9 lib/{Fcm → FCM1}/CmUrl.pm
  19. +7 −7 lib/{Fcm → FCM1}/Config.pm
  20. +31 −31 lib/{Fcm → FCM1}/ConfigSystem.pm
  21. +16 −16 lib/{Fcm → FCM1}/Dest.pm
  22. +5 −5 lib/{Fcm → FCM1}/Exception.pm
  23. +74 −74 lib/{Fcm → FCM1}/Extract.pm
  24. +20 −20 lib/{Fcm → FCM1}/ExtractConfigComparator.pm
  25. +10 −10 lib/{Fcm → FCM1}/ExtractFile.pm
  26. +7 −7 lib/{Fcm → FCM1}/ExtractSrc.pm
  27. +12 −12 lib/{Fcm → FCM1}/Interactive.pm
  28. +10 −10 lib/{Fcm → FCM1}/Interactive/InputGetter.pm
  29. +10 −10 lib/{Fcm → FCM1}/Interactive/InputGetter/CLI.pm
  30. +11 −11 lib/{Fcm → FCM1}/Interactive/InputGetter/GUI.pm
  31. +14 −14 lib/{Fcm → FCM1}/Keyword.pm
  32. +23 −23 lib/{Fcm → FCM1}/ReposBranch.pm
  33. +7 −7 lib/{Fcm → FCM1}/SrcDirLayer.pm
  34. +3 −3 lib/{Fcm → FCM1}/Timer.pm
  35. +7 −7 lib/{Fcm → FCM1}/Util.pm
  36. +8 −8 lib/{Fcm → FCM1}/Util/ClassLoader.pm
  37. +1 −1 t/fcm-commit/02-bad.t
View
@@ -26,10 +26,10 @@ use lib "$FindBin::Bin/../lib";
use Cwd qw{cwd};
use FCM::Context::Event;
use FCM::Util;
-use Fcm::Config;
-use Fcm::Keyword;
-use Fcm::Timer qw{timestamp_command};
-use Fcm::Util qw{get_url_of_wc get_wct is_wc};
+use FCM1::Config;
+use FCM1::Keyword;
+use FCM1::Timer qw{timestamp_command};
+use FCM1::Util qw{get_url_of_wc get_wct is_wc};
use File::Basename qw{basename};
use File::Spec::Functions qw{catfile rel2abs};
use Tk;
@@ -43,10 +43,10 @@ if (@ARGV) {
chdir $dir if -d $dir;
}
-Fcm::Keyword::set_util(FCM::Util->new());
+FCM1::Keyword::set_util(FCM::Util->new());
# Get configuration settings
-my $config = Fcm::Config->new ();
+my $config = FCM1::Config->new ();
$config->get_config ();
# ------------------------------------------------------------------------------
@@ -1294,7 +1294,7 @@ sub invoke_cmd {
# If the command is "checkout", change directory to working copy
if (lc ($selsubcmd) eq 'checkout' && $subcmdvar{CHECKOUT}{URL}) {
- my $url = Fcm::Keyword::expand($subcmdvar{CHECKOUT}{URL});
+ my $url = FCM1::Keyword::expand($subcmdvar{CHECKOUT}{URL});
my $dir = $subcmdvar{CHECKOUT}{PATH}
? $subcmdvar{CHECKOUT}{PATH}
: basename($url);
View
@@ -21,7 +21,7 @@
use strict;
use warnings;
-use Fcm::Timer qw{timestamp_command};
+use FCM1::Timer qw{timestamp_command};
# Function declarations
sub catfile;
@@ -53,8 +53,8 @@ <h1>Annex: Declarations in FCM 1 central/user configuration file</h1>
<ul>
<li>The detail of the above settings will remain undocumented. For further
- information, please refer to the Perl module <code>Fcm::Config</code>,
- which should be located at <samp>lib/Fcm/Config.pm</samp> in your FCM
+ information, please refer to the Perl module <code>FCM1::Config</code>,
+ which should be located at <samp>lib/FCM1/Config.pm</samp> in your FCM
distribution.</li>
<li>Setting labels in both files are case insensitive.</li>
View
@@ -39,7 +39,7 @@ <h1>A Brief Introduction to the FCM Perl API</h1>
<p>The majority of FCM functionalities are provided by a set of Perl modules.
Old modules developed prior to <a href="../release_notes/2-0.html">release
- 2-0</a> reside in the <code>Fcm::*</code> name-space. Modules developed
+ 2-0</a> reside in the <code>FCM1::*</code> name-space. Modules developed
thereafter reside in the <code>FCM::*</code> name-space. These are
sub-divided into the following name-spaces:</p>
@@ -121,7 +121,7 @@ <h1>A Brief Introduction to the FCM Perl API</h1>
<dt><code>FCM::System::CM</code></dt>
<dd>The code management system. Currently a thin adapter to
- <code>Fcm::Cm</code>.</dd>
+ <code>FCM1::Cm</code>.</dd>
<dt><code>FCM::System::Misc</code></dt>
@@ -197,8 +197,8 @@ <h1>A Brief Introduction to the FCM Perl API</h1>
</dd>
</dl>
- <p>Note: The majority of modules in the old <code>Fcm::*</code> name space
- are considered deprecated, with the exception of <code>Fcm::Cm</code> and
+ <p>Note: The majority of modules in the old <code>FCM1::*</code> name space
+ are considered deprecated, with the exception of <code>FCM1::Cm</code> and
those providing support functionalities for it. The functionalities of these
modules will eventually be absorbed into the <code>FCM::System::CM</code>
framework.</p>
@@ -859,11 +859,11 @@ <h4 id="svn_branching_switch">Switching your working copy to point to another
U doc/user_guide/getting_started.html
U doc/user_guide/code_management.html
U doc/user_guide/command_ref.html
-U src/lib/Fcm/SrcFile.pm
-U src/lib/Fcm/Util.pm
-U src/lib/Fcm/Build.pm
-U src/lib/Fcm/Cm.pm
-U src/lib/Fcm/SrcPackage.pm
+U src/lib/FCM1/SrcFile.pm
+U src/lib/FCM1/Util.pm
+U src/lib/FCM1/Build.pm
+U src/lib/FCM1/Cm.pm
+U src/lib/FCM1/SrcPackage.pm
U src/bin/fcm_internal
U src/bin/fcm_gui
Updated to revision 1009.
@@ -959,7 +959,7 @@ <h4 id="svn_branching_merge">Merging</h4>
c.f.: /FCM/trunk@1371
-------------------------------------------------------------------------dry-run
A doc/fortran_standards/index.html
-U src/lib/Fcm/ReposBranch.pm
+U src/lib/FCM1/ReposBranch.pm
-------------------------------------------------------------------------dry-run
Would you like to go ahead with the merge?
Enter "y" or "n" (or just press &lt;return&gt; for "n"): y
View
@@ -24,8 +24,8 @@ package FCM::System::CM;
use base qw{FCM::Class::CODE};
use Cwd qw{cwd};
-use Fcm::Cm;
-use Fcm::Interactive;
+use FCM1::Cm;
+use FCM1::Interactive;
use FCM::Context::Event;
use FCM::Context::Locator;
use FCM::System::CM::CommitMessage;
@@ -40,31 +40,31 @@ use Storable qw{dclone};
# The (keys) named actions of this class and (values) their implementations.
our %ACTION_OF = (
cm_branch_create => \&_cm_branch_create,
- cm_branch_delete => _fcm1_func(\&Fcm::Cm::cm_branch_delete),
- cm_branch_diff => _fcm1_func(\&Fcm::Cm::cm_branch_diff),
- cm_branch_info => _fcm1_func(\&Fcm::Cm::cm_branch_info),
+ cm_branch_delete => _fcm1_func(\&FCM1::Cm::cm_branch_delete),
+ cm_branch_diff => _fcm1_func(\&FCM1::Cm::cm_branch_diff),
+ cm_branch_info => _fcm1_func(\&FCM1::Cm::cm_branch_info),
cm_branch_list => \&_cm_branch_list,
- cm_commit => _fcm1_func(\&Fcm::Cm::cm_commit),
+ cm_commit => _fcm1_func(\&FCM1::Cm::cm_commit),
cm_checkout => \&_cm_checkout,
cm_check_missing => _fcm1_func(
- \&Fcm::Cm::cm_check_missing,
+ \&FCM1::Cm::cm_check_missing,
_opt_mod_st_check_handler_func('WC_STATUS_PATH'),
),
cm_check_unknown => _fcm1_func(
- \&Fcm::Cm::cm_check_unknown,
+ \&FCM1::Cm::cm_check_unknown,
_opt_mod_st_check_handler_func('WC_STATUS_PATH'),
),
cm_diff => \&_cm_diff,
cm_loc_layout => \&_cm_loc_layout,
- cm_merge => _fcm1_func(\&Fcm::Cm::cm_merge),
- cm_mkpatch => _fcm1_func(\&Fcm::Cm::cm_mkpatch),
+ cm_merge => _fcm1_func(\&FCM1::Cm::cm_merge),
+ cm_mkpatch => _fcm1_func(\&FCM1::Cm::cm_mkpatch),
cm_project_create => \&_cm_project_create,
cm_resolve_conflicts => \&_cm_resolve_conflicts,
cm_switch => _fcm1_func(
- \&Fcm::Cm::cm_switch, _opt_mod_st_check_handler_func('WC_STATUS'),
+ \&FCM1::Cm::cm_switch, _opt_mod_st_check_handler_func('WC_STATUS'),
),
cm_update => _fcm1_func(
- \&Fcm::Cm::cm_update, _opt_mod_st_check_handler_func('WC_STATUS'),
+ \&FCM1::Cm::cm_update, _opt_mod_st_check_handler_func('WC_STATUS'),
),
svn => \&_svn,
);
@@ -85,12 +85,12 @@ __PACKAGE__->class(
sub _init {
my ($attrib_ref) = @_;
- if (!defined(Fcm::Keyword::get_util())) {
- Fcm::Keyword::set_util($attrib_ref->{util});
+ if (!defined(FCM1::Keyword::get_util())) {
+ FCM1::Keyword::set_util($attrib_ref->{util});
}
if ($attrib_ref->{'gui'}) {
- Fcm::Interactive::set_impl(
- 'Fcm::Interactive::InputGetter::GUI',
+ FCM1::Interactive::set_impl(
+ 'FCM1::Interactive::InputGetter::GUI',
{geometry => $attrib_ref->{gui}},
);
}
@@ -102,9 +102,9 @@ sub _init {
util => $attrib_ref->{util},
});
$attrib_ref->{svn} = FCM::System::CM::SVN->new({util => $attrib_ref->{util}});
- Fcm::Cm::set_util($attrib_ref->{util});
- Fcm::Cm::set_commit_message_util($attrib_ref->{commit_message_util});
- Fcm::Cm::set_svn_util($attrib_ref->{svn});
+ FCM1::Cm::set_util($attrib_ref->{util});
+ FCM1::Cm::set_commit_message_util($attrib_ref->{commit_message_util});
+ FCM1::Cm::set_svn_util($attrib_ref->{svn});
}
# Create a branch in a project.
@@ -506,7 +506,7 @@ sub _cm_project_create {
$target;
}
-# Returns a simple wrapper to FCM 1 Fcm::Cm functions.
+# Returns a simple wrapper to FCM 1 FCM1::Cm functions.
sub _fcm1_func {
my ($action_ref, $opt_mod_ref) = @_;
$opt_mod_ref ||= sub {};
@@ -517,7 +517,7 @@ sub _fcm1_func {
$opt_mod_ref->($option_ref);
eval {$action_ref->($option_ref, @args)};
if ($@) {
- if (!Fcm::Cm::Abort->caught($@)) {
+ if (!FCM1::Cm::Abort->caught($@)) {
die($@);
}
if (!($@->get_code() eq $@->NULL || $@->get_code() eq $@->USER)) {
@@ -538,7 +538,7 @@ sub _opt_mod_st_check_handler_func {
sub {
my $option_ref = shift();
if (!$option_ref->{'non-interactive'}) {
- $option_ref->{st_check_handler} = $Fcm::Cm::CLI_HANDLER_OF{$key};
+ $option_ref->{st_check_handler} = $FCM1::Cm::CLI_HANDLER_OF{$key};
}
};
}
@@ -645,7 +645,7 @@ FCM::System::CM
=head1 DESCRIPTION
The FCM code management sub-system. This is currently a thin adaptor of
-L<Fcm::Cm|Fcm::Cm>.
+L<FCM1::Cm|FCM1::Cm>.
=head1 METHODS
@@ -693,7 +693,7 @@ Implement the C<fcm project-create> command.
=item $system->cm_update(\%option,@args)
Thin adaptors for the corresponding code management functions in
-L<Fcm::Cm|Fcm::Cm>.
+L<FCM1::Cm|FCM1::Cm>.
=item $system->svn($app,\%option,@args)
View
@@ -23,13 +23,13 @@ package FCM::System::Old;
use base qw{FCM::Class::CODE};
use Cwd qw{cwd};
-use Fcm::Build;
-use Fcm::Config;
-use Fcm::Extract;
-#use Fcm::ExtractConfigComparator;
-use Fcm::Keyword;
+use FCM1::Build;
+use FCM1::Config;
+use FCM1::Extract;
+#use FCM1::ExtractConfigComparator;
+use FCM1::Keyword;
-my %CLASS_OF = (build => 'Fcm::Build', extract => 'Fcm::Extract');
+my %CLASS_OF = (build => 'FCM1::Build', extract => 'FCM1::Extract');
my %KEY_OF = (
'archive' => 'ARCHIVE',
@@ -54,23 +54,23 @@ __PACKAGE__->class(
sub _init {
my ($attrib_ref) = @_;
- if (!defined(Fcm::Keyword::get_util())) {
- Fcm::Keyword::set_util($attrib_ref->{util});
+ if (!defined(FCM1::Keyword::get_util())) {
+ FCM1::Keyword::set_util($attrib_ref->{util});
}
}
sub _config_compare {
my ($attrib_ref, $option_hash_ref, @args) = @_;
- $attrib_ref->{util}->class_load('Fcm::CmUrl');
- $attrib_ref->{util}->class_load('Fcm::ExtractConfigComparator');
+ $attrib_ref->{util}->class_load('FCM1::CmUrl');
+ $attrib_ref->{util}->class_load('FCM1::ExtractConfigComparator');
if (exists($option_hash_ref->{verbosity})) {
- Fcm::Config->instance()->verbose($option_hash_ref->{verbosity});
+ FCM1::Config->instance()->verbose($option_hash_ref->{verbosity});
}
my %option = %{$option_hash_ref};
if (exists($option{'wiki-format'})) {
$option{'wiki'} = delete($option{'wiki-format'});
}
- my $system = Fcm::ExtractConfigComparator->new({files => \@args, %option});
+ my $system = FCM1::ExtractConfigComparator->new({files => \@args, %option});
$system->invoke();
}
@@ -81,7 +81,7 @@ sub _run {
= split(qr{:}msx, join(':', @{$option_hash_ref->{targets}}));
}
if (exists($option_hash_ref->{verbosity})) {
- Fcm::Config->instance()->verbose($option_hash_ref->{verbosity});
+ FCM1::Config->instance()->verbose($option_hash_ref->{verbosity});
}
my $system = $CLASS_OF{$key}->new();
my $path_to_cfg = @args ? $args[0] : cwd();
View
@@ -78,14 +78,14 @@ my %ACTION_OF = (
);
# Helper for "_event_e", list of exception classes and their formatters.
our @E_FORMATTERS = (
- ['Fcm::Cm::Exception' , \&_format_e_cm ],
- ['Fcm::CLI::Exception' , sub {$_[0]->get_message()}],
+ ['FCM1::Cm::Exception' , \&_format_e_cm ],
+ ['FCM1::CLI::Exception' , sub {$_[0]->get_message()}],
['FCM::Class::Exception' , \&_format_e_class ],
['FCM::CLI::Exception' , \&_format_e_cli ],
['FCM::System::Exception', \&_format_e_sys ],
['FCM::Util::Exception' , \&_format_e_util ],
);
-# Error format strings for Fcm::Cm::Exception.
+# Error format strings for FCM1::Cm::Exception.
our %E_CM_FORMAT_FOR = (
DIFF_PROJECTS => "%s (target) and %s (source) are not related.\n",
INVALID_BRANCH => "%s: not a valid URL of a standard FCM branch.\n",
@@ -17,31 +17,31 @@
# along with FCM. If not, see <http://www.gnu.org/licenses/>.
# ------------------------------------------------------------------------------
# NAME
-# Fcm::Base
+# FCM1::Base
#
# DESCRIPTION
# This is base class for all FCM OO packages.
#
# ------------------------------------------------------------------------------
-package Fcm::Base;
+package FCM1::Base;
# Standard pragma
use strict;
use warnings;
-use Fcm::Config;
+use FCM1::Config;
my @scalar_properties = (
- 'config', # instance of Fcm::Config, configuration setting
+ 'config', # instance of FCM1::Config, configuration setting
);
# ------------------------------------------------------------------------------
# SYNOPSIS
-# $obj = Fcm::Base->new;
+# $obj = FCM1::Base->new;
#
# DESCRIPTION
-# This method constructs a new instance of the Fcm::Base class.
+# This method constructs a new instance of the FCM1::Base class.
# ------------------------------------------------------------------------------
sub new {
@@ -82,7 +82,7 @@ for my $name (@scalar_properties) {
if (not defined $self->{$name}) {
if ($name eq 'config') {
# Configuration setting of the main program
- $self->{$name} = Fcm::Config->instance();
+ $self->{$name} = FCM1::Config->instance();
}
}
Oops, something went wrong.

0 comments on commit 7b8a6b1

Please sign in to comment.