Permalink
Browse files

Remove extra/ copied CPAN modules.

  • Loading branch information...
jonjensen committed May 6, 2008
1 parent 3fef479 commit 71b3497c58d500bc2a3db62848c8a5fbd022352a
Showing with 24 additions and 65 deletions.
  1. +0 −9 MANIFEST
  2. +1 −50 Makefile.PL
  3. +0 −2 README
  4. +18 −0 WHATSNEW-5.5
  5. +5 −4 test.pl
View
@@ -1058,15 +1058,6 @@ extensions/quickbooks/usertag/export_quicken_items.tag
extensions/quickbooks/usertag/get_quicken_orders.tag
extensions/quickbooks/usertag/import_quicken_items.tag
extensions/quickbooks/vars/TRANS_QUICKBOOKS
-extra/Business/UPS.pm
-extra/File/Spec.pm
-extra/File/Spec/OS2.pm
-extra/File/Spec/Unix.pm
-extra/File/Spec/VMS.pm
-extra/File/Spec/Win32.pm
-extra/IniConf.pm
-extra/Tie/ShadowHash.pm
-extra/URI/URL.pm
hints.pl
install_lsb.pl
lib/Vend/Accounting.pm
View
@@ -179,43 +179,7 @@ sub my_prompt {
sub extra_libs {
-
my ($realdir) = @_;
- # Do the extra library checks
-
- my @extra_lib_dirs;
- my @extra_lib_files;
-
- eval {
- require IniConf;
- };
- if ($@) {
- push @extra_lib_files, 'IniConf.pm';
- }
-
- eval {
- require HTML::Entities;
- };
- if ($@) {
- push @extra_lib_dirs, 'HTML';
- push @extra_lib_files, 'HTML/Entities.pm';
- }
-
- eval {
- require Business::UPS;
- };
- if ($@) {
- push @extra_lib_dirs, 'Business';
- push @extra_lib_files, 'Business/UPS.pm';
- }
-
- eval {
- require Tie::ShadowHash;
- };
- if ($@) {
- push @extra_lib_dirs, 'Tie';
- push @extra_lib_files, 'Tie/ShadowHash.pm';
- }
eval {
require Storable;
@@ -263,20 +227,7 @@ EOF
close TSTORABLE;
}
}
-
- COPYEXTRA: {
- my $cpdir = '.';
- mkdir $cpdir, 0777 unless -d $cpdir;
- mkdir "$cpdir/lib", 0777 unless -d "$cpdir/lib";
- for(@extra_lib_dirs) {
- next if -d "$cpdir/lib/$_";
- mkdir "$cpdir/lib/$_", 0777 or die "mkdir $cpdir/lib/$_: $!\n";
- }
- for(@extra_lib_files) {
- File::Copy::copy ("extra/$_", "lib/$_")
- or die "Couldn't copy $_: $!\n";
- }
- }
+ return;
}
sub mk_initp {
View
2 README
@@ -78,8 +78,6 @@ dist/ The distribution files, exclusive of executable
lib/ Back-end administrative interface
code/ Usertags and other customizable code
-extra/ Some not-always-needed Perl libraries.
-
hints.pl OS-specific configuration settings. None currently used.
eg/ Various helper scripts and addons.
View
@@ -7,6 +7,24 @@
See UPGRADE document for a list of incompatible changes.
+
+Interchange 5.5.3 not yet released.
+
+Packaging
+---------
+
+* Removed copied CPAN modules in extra/ and associated code. Commonly needed
+ CPAN modules are in Bundle::Interchange or Bundle::InterchangeKitchenSink.
+
+Extra tools
+-----------
+
+* Improved eg/check_perl_itl error detection.
+
+
+------------------------------------------------------------------------------
+
+
Interchange 5.5.2 released on 2008-04-29.
Core
View
@@ -1,4 +1,4 @@
-# $id$
+# $Id: test.pl,v 2.6 2008-05-06 17:12:18 jon Exp $
#
# Copyright (C) 2002-2007 Interchange Development Group
#
@@ -70,11 +70,12 @@
mkdir ("$ENV{MINIVEND_ROOT}/pages", 0777);
mkdir ("$ENV{MINIVEND_ROOT}/products", 0777);
mkdir ("$ENV{MINIVEND_ROOT}/session", 0777);
-if( $ENV{PERL5LIB} ) {
- $ENV{PERL5LIB} .= ":$cur_dir/extra:$cur_dir/blib/lib";
+my $lib = "$cur_dir/blib/lib";
+if ($ENV{PERL5LIB}) {
+ $ENV{PERL5LIB} .= ":$lib";
}
else {
- $ENV{PERL5LIB} = "$cur_dir/extra:$cur_dir/blib/lib";
+ $ENV{PERL5LIB} = $lib;
}
my $testnum = 1;

0 comments on commit 71b3497

Please sign in to comment.