From b179b8df8426376f1592c7fdc3e693ed564c2fc3 Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Fri, 12 Oct 2007 11:10:21 +0000 Subject: [PATCH] =?utf8?q?Umstrukturierung=20des=20Verzeichnisses=20"modul?= =?utf8?q?es":=20Das=20Unterverzeichnis=20"override"=20enth=C3=A4lt=20Modl?= =?utf8?q?e,=20die=20Lx-Office=20vor=20den=20im=20System=20installierten?= =?utf8?q?=20Modulen=20l=C3=A4dt=20(z.B.=20YAML).=20Module=20in=20"fallbac?= =?utf8?q?k"=20werden=20hingegen=20nur=20geladen,=20wenn=20im=20System=20k?= =?utf8?q?ein=20passendes=20Modul=20gefunden=20wurde.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- am.pl | 4 ++-- login.pl | 4 ++-- modules/{ => fallback}/CGI/.htaccess | 0 modules/{ => fallback}/CGI/Ajax.pm | 0 modules/{ => fallback}/CGI/LICENSE | 0 modules/{ => fallback}/CGI/README | 0 modules/{YAML => override}/README | 0 modules/{YAML => override}/YAML.pm | 0 modules/{YAML => override}/YAML/Base.pm | 0 modules/{YAML => override}/YAML/Dumper.pm | 0 modules/{YAML => override}/YAML/Dumper/Base.pm | 0 modules/{YAML => override}/YAML/Error.pm | 0 modules/{YAML => override}/YAML/Loader.pm | 0 modules/{YAML => override}/YAML/Loader/Base.pm | 0 modules/{YAML => override}/YAML/Marshall.pm | 0 modules/{YAML => override}/YAML/Node.pm | 0 modules/{YAML => override}/YAML/Tag.pm | 0 modules/{YAML => override}/YAML/Types.pm | 0 scripts/dbupgrade2_tool.pl | 4 ++-- scripts/installation_check.pl | 4 ++-- scripts/spawn_oo.pl | 4 ++-- 21 files changed, 10 insertions(+), 10 deletions(-) rename modules/{ => fallback}/CGI/.htaccess (100%) rename modules/{ => fallback}/CGI/Ajax.pm (100%) rename modules/{ => fallback}/CGI/LICENSE (100%) rename modules/{ => fallback}/CGI/README (100%) rename modules/{YAML => override}/README (100%) rename modules/{YAML => override}/YAML.pm (100%) rename modules/{YAML => override}/YAML/Base.pm (100%) rename modules/{YAML => override}/YAML/Dumper.pm (100%) rename modules/{YAML => override}/YAML/Dumper/Base.pm (100%) rename modules/{YAML => override}/YAML/Error.pm (100%) rename modules/{YAML => override}/YAML/Loader.pm (100%) rename modules/{YAML => override}/YAML/Loader/Base.pm (100%) rename modules/{YAML => override}/YAML/Marshall.pm (100%) rename modules/{YAML => override}/YAML/Node.pm (100%) rename modules/{YAML => override}/YAML/Tag.pm (100%) rename modules/{YAML => override}/YAML/Types.pm (100%) diff --git a/am.pl b/am.pl index 2d1605253..ac0a98a58 100755 --- a/am.pl +++ b/am.pl @@ -31,8 +31,8 @@ ####################################################################### BEGIN { - unshift @INC, "modules/YAML"; # Use our own version of YAML. - push @INC, "modules"; # Only use our own versions of modules if there's no system version. + unshift @INC, "modules/override"; # Use our own versions of various modules (e.g. YAML). + push @INC, "modules/fallback"; # Only use our own versions of modules if there's no system version. } # setup defaults, DO NOT CHANGE diff --git a/login.pl b/login.pl index a01fc10f8..354949b57 100755 --- a/login.pl +++ b/login.pl @@ -31,8 +31,8 @@ ####################################################################### BEGIN { - unshift @INC, "modules/YAML"; # Use our own version of YAML. - push @INC, "modules"; # Only use our own versions of modules if there's no system version. + unshift @INC, "modules/override"; # Use our own versions of various modules (e.g. YAML). + push @INC, "modules/fallback"; # Only use our own versions of modules if there's no system version. } # setup defaults, DO NOT CHANGE diff --git a/modules/CGI/.htaccess b/modules/fallback/CGI/.htaccess similarity index 100% rename from modules/CGI/.htaccess rename to modules/fallback/CGI/.htaccess diff --git a/modules/CGI/Ajax.pm b/modules/fallback/CGI/Ajax.pm similarity index 100% rename from modules/CGI/Ajax.pm rename to modules/fallback/CGI/Ajax.pm diff --git a/modules/CGI/LICENSE b/modules/fallback/CGI/LICENSE similarity index 100% rename from modules/CGI/LICENSE rename to modules/fallback/CGI/LICENSE diff --git a/modules/CGI/README b/modules/fallback/CGI/README similarity index 100% rename from modules/CGI/README rename to modules/fallback/CGI/README diff --git a/modules/YAML/README b/modules/override/README similarity index 100% rename from modules/YAML/README rename to modules/override/README diff --git a/modules/YAML/YAML.pm b/modules/override/YAML.pm similarity index 100% rename from modules/YAML/YAML.pm rename to modules/override/YAML.pm diff --git a/modules/YAML/YAML/Base.pm b/modules/override/YAML/Base.pm similarity index 100% rename from modules/YAML/YAML/Base.pm rename to modules/override/YAML/Base.pm diff --git a/modules/YAML/YAML/Dumper.pm b/modules/override/YAML/Dumper.pm similarity index 100% rename from modules/YAML/YAML/Dumper.pm rename to modules/override/YAML/Dumper.pm diff --git a/modules/YAML/YAML/Dumper/Base.pm b/modules/override/YAML/Dumper/Base.pm similarity index 100% rename from modules/YAML/YAML/Dumper/Base.pm rename to modules/override/YAML/Dumper/Base.pm diff --git a/modules/YAML/YAML/Error.pm b/modules/override/YAML/Error.pm similarity index 100% rename from modules/YAML/YAML/Error.pm rename to modules/override/YAML/Error.pm diff --git a/modules/YAML/YAML/Loader.pm b/modules/override/YAML/Loader.pm similarity index 100% rename from modules/YAML/YAML/Loader.pm rename to modules/override/YAML/Loader.pm diff --git a/modules/YAML/YAML/Loader/Base.pm b/modules/override/YAML/Loader/Base.pm similarity index 100% rename from modules/YAML/YAML/Loader/Base.pm rename to modules/override/YAML/Loader/Base.pm diff --git a/modules/YAML/YAML/Marshall.pm b/modules/override/YAML/Marshall.pm similarity index 100% rename from modules/YAML/YAML/Marshall.pm rename to modules/override/YAML/Marshall.pm diff --git a/modules/YAML/YAML/Node.pm b/modules/override/YAML/Node.pm similarity index 100% rename from modules/YAML/YAML/Node.pm rename to modules/override/YAML/Node.pm diff --git a/modules/YAML/YAML/Tag.pm b/modules/override/YAML/Tag.pm similarity index 100% rename from modules/YAML/YAML/Tag.pm rename to modules/override/YAML/Tag.pm diff --git a/modules/YAML/YAML/Types.pm b/modules/override/YAML/Types.pm similarity index 100% rename from modules/YAML/YAML/Types.pm rename to modules/override/YAML/Types.pm diff --git a/scripts/dbupgrade2_tool.pl b/scripts/dbupgrade2_tool.pl index e62a9aaba..1d1403eba 100755 --- a/scripts/dbupgrade2_tool.pl +++ b/scripts/dbupgrade2_tool.pl @@ -6,8 +6,8 @@ BEGIN { exit(1); } - unshift @INC, "modules/YAML"; # Use our own version of YAML. - push @INC, "modules"; # Only use our own versions of modules if there's no system version. + unshift @INC, "modules/override"; # Use our own versions of various modules (e.g. YAML). + push @INC, "modules/fallback"; # Only use our own versions of modules if there's no system version. } use English '-no_match_vars'; diff --git a/scripts/installation_check.pl b/scripts/installation_check.pl index 2022c1665..306156b21 100755 --- a/scripts/installation_check.pl +++ b/scripts/installation_check.pl @@ -1,8 +1,8 @@ #!/usr/bin/perl -w BEGIN { - unshift @INC, "modules/YAML"; # Use our own version of YAML. - push @INC, "modules"; # Only use our own versions of modules if there's no system version. + unshift @INC, "modules/override"; # Use our own versions of various modules (e.g. YAML). + push @INC, "modules/fallback"; # Only use our own versions of modules if there's no system version. } use SL::InstallationCheck; diff --git a/scripts/spawn_oo.pl b/scripts/spawn_oo.pl index b192a9318..058de3474 100755 --- a/scripts/spawn_oo.pl +++ b/scripts/spawn_oo.pl @@ -1,8 +1,8 @@ #!/usr/bin/perl BEGIN { - unshift @INC, "modules/YAML"; # Use our own version of YAML. - push @INC, "modules"; # Only use our own versions of modules if there's no system version. + unshift @INC, "modules/override"; # Use our own versions of various modules (e.g. YAML). + push @INC, "modules/fallback"; # Only use our own versions of modules if there's no system version. } use DBI; -- 2.20.1