i 1.26: - added filehandle capability to -file.

- added -String parameter to new(), which allows one to supply the whole config as a string. - added -MergeDuplicateBlocks option, which causes duplicate blocks to be merged. git-svn-id: http://dev.catalyst.perl.org/repos/Config-General/trunk@14 be1acefe-a474-0410-9a34-9b3221f2030f
2025-12-17 20:51:00 +01:00 · 2009-10-10 16:12:40 +00:00
parent dd1ed568a1
commit 60c541d1c0
7 changed files with 263 additions and 175 deletions
--- a/Makefile.old
+++ b/Makefile.old
@@ -1,7 +1,7 @@
 # This Makefile is for the Config::General extension to perl.
 #
 # It was generated automatically by MakeMaker version
-# 5.45 (Revision: 1.222) from the contents of
+# 5.4302 (Revision: 1.222) from the contents of
 # Makefile.PL. Don't edit this file, edit Makefile.PL instead.
 #
 #	ANY CHANGES MADE HERE WILL BE LOST!
@@ -18,27 +18,26 @@

 # --- MakeMaker const_config section:

-# These definitions are from config.sh (via /usr/lib/perl5/5.6.0/i386-linux/Config.pm)
+# These definitions are from config.sh (via /usr/libdata/perl/5.00503/mach/Config.pm)

 # They may have been overridden via Makefile.PL or on the command line
 AR = ar
-CC = gcc
-CCCDLFLAGS = -fPIC
-CCDLFLAGS = -rdynamic
+CC = cc
+CCCDLFLAGS = -DPIC -fpic
+CCDLFLAGS =  -Wl,-R/usr/lib
 DLEXT = so
 DLSRC = dl_dlopen.xs
-LD = gcc
-LDDLFLAGS = -shared -L/usr/local/lib
-LDFLAGS =  -L/usr/local/lib
-LIBC = /lib/libc-2.1.92.so
+LD = cc
+LDDLFLAGS = -Wl,-E -shared -lperl -lm 
+LDFLAGS = -Wl,-E -lperl -lm 
+LIBC = 
 LIB_EXT = .a
 OBJ_EXT = .o
-OSNAME = linux
-OSVERS = 2.2.5-22smp
+OSNAME = freebsd
+OSVERS = 4.0-current
 RANLIB = :
 SO = so
 EXE_EXT = 
-FULL_AR = /usr/bin/ar


 # --- MakeMaker constants section:
@@ -46,9 +45,9 @@ AR_STATIC_ARGS = cr
 NAME = Config::General
 DISTNAME = Config-General
 NAME_SYM = Config_General
-VERSION = 1.20
-VERSION_SYM = 1_20
-XS_VERSION = 1.20
+VERSION = 1.25
+VERSION_SYM = 1_25
+XS_VERSION = 1.25
 INST_BIN = blib/bin
 INST_EXE = blib/script
 INST_LIB = blib/lib
@@ -56,33 +55,31 @@ INST_ARCHLIB = blib/arch
 INST_SCRIPT = blib/script
 PREFIX = /usr
 INSTALLDIRS = site
-INSTALLPRIVLIB = $(PREFIX)/lib/perl5/5.6.0
-INSTALLARCHLIB = $(PREFIX)/lib/perl5/5.6.0/i386-linux
-INSTALLSITELIB = $(PREFIX)/lib/perl5/site_perl/5.6.0
-INSTALLSITEARCH = $(PREFIX)/lib/perl5/site_perl/5.6.0/i386-linux
+INSTALLPRIVLIB = /usr/libdata/perl/5.00503
+INSTALLARCHLIB = /usr/libdata/perl/5.00503/mach
+INSTALLSITELIB = /usr/local/lib/perl5/site_perl/5.005
+INSTALLSITEARCH = /usr/local/lib/perl5/site_perl/5.005/i386-freebsd
 INSTALLBIN = $(PREFIX)/bin
 INSTALLSCRIPT = $(PREFIX)/bin
-PERL_LIB = /usr/lib/perl5/5.6.0
-PERL_ARCHLIB = /usr/lib/perl5/5.6.0/i386-linux
-SITELIBEXP = /usr/lib/perl5/site_perl/5.6.0
-SITEARCHEXP = /usr/lib/perl5/site_perl/5.6.0/i386-linux
+PERL_LIB = /usr/libdata/perl/5.00503
+PERL_ARCHLIB = /usr/libdata/perl/5.00503/mach
+SITELIBEXP = /usr/local/lib/perl5/site_perl/5.005
+SITEARCHEXP = /usr/local/lib/perl5/site_perl/5.005/i386-freebsd
 LIBPERL_A = libperl.a
 FIRST_MAKEFILE = Makefile
 MAKE_APERL_FILE = Makefile.aperl
 PERLMAINCC = $(CC)
-PERL_INC = /usr/lib/perl5/5.6.0/i386-linux/CORE
+PERL_INC = /usr/libdata/perl/5.00503/mach/CORE
 PERL = /usr/bin/perl
 FULLPERL = /usr/bin/perl
-FULL_AR = /usr/bin/ar

 VERSION_MACRO = VERSION
 DEFINE_VERSION = -D$(VERSION_MACRO)=\"$(VERSION)\"
 XS_VERSION_MACRO = XS_VERSION
 XS_DEFINE_VERSION = -D$(XS_VERSION_MACRO)=\"$(XS_VERSION)\"
-PERL_MALLOC_DEF = -DPERL_EXTMALLOC_DEF -Dmalloc=Perl_malloc -Dfree=Perl_mfree -Drealloc=Perl_realloc -Dcalloc=Perl_calloc

-MAKEMAKER = /usr/lib/perl5/5.6.0/ExtUtils/MakeMaker.pm
-MM_VERSION = 5.45
+MAKEMAKER = /usr/libdata/perl/5.00503/ExtUtils/MakeMaker.pm
+MM_VERSION = 5.4302

 # FULLEXT = Pathname for extension directory (eg Foo/Bar/Oracle).
 # BASEEXT = Basename part of FULLEXT. May be just equal FULLEXT. (eg Oracle)
@@ -103,17 +100,15 @@ XS_FILES=
 C_FILES = 
 O_FILES = 
 H_FILES = 
-HTMLLIBPODS    = 
-HTMLSCRIPTPODS = 
 MAN1PODS = 
-MAN3PODS = General.pm
-HTMLEXT = html
+MAN3PODS = General.pm \
+	General/Extended.pm
 INST_MAN1DIR = blib/man1
-INSTALLMAN1DIR = $(PREFIX)/share/man/man1
+INSTALLMAN1DIR = /usr/local/man/man1
 MAN1EXT = 1
 INST_MAN3DIR = blib/man3
-INSTALLMAN3DIR = $(PREFIX)/share/man/man3
-MAN3EXT = 3pm
+INSTALLMAN3DIR = /usr/local/lib/perl5/5.00503/man/man3
+MAN3EXT = 3
 PERM_RW = 644
 PERM_RWX = 755

@@ -148,9 +143,12 @@ EXPORT_LIST =

 PERL_ARCHIVE = 

-TO_INST_PM = General.pm
+TO_INST_PM = General.pm \
+	General/Extended.pm

-PM_TO_BLIB = General.pm \
+PM_TO_BLIB = General/Extended.pm \
+	$(INST_LIBDIR)/General/Extended.pm \
+	General.pm \
 	$(INST_LIBDIR)/General.pm


@@ -168,7 +166,7 @@ AUTOSPLITFILE = $(PERL) "-I$(PERL_ARCHLIB)" "-I$(PERL_LIB)" -e 'use AutoSplit;au
 SHELL = /bin/sh
 CHMOD = chmod
 CP = cp
-LD = gcc
+LD = cc
 MV = mv
 NOOP = $(SHELL) -c true
 RM_F = rm -f
@@ -272,7 +270,7 @@ PASTHRU = LIB="$(LIB)"\

 #all ::	config $(INST_PM) subdirs linkext manifypods

-all :: pure_all htmlifypods manifypods
+all :: pure_all manifypods
 	@$(NOOP)

 pure_all :: config pm_to_blib subdirs linkext
@@ -290,21 +288,25 @@ config :: $(INST_ARCHAUTODIR)/.exists
 config :: $(INST_AUTODIR)/.exists
 	@$(NOOP)

-$(INST_AUTODIR)/.exists :: /usr/lib/perl5/5.6.0/i386-linux/CORE/perl.h
+config :: Version_check
+	@$(NOOP)
+
+
+$(INST_AUTODIR)/.exists :: /usr/libdata/perl/5.00503/mach/CORE/perl.h
 	@$(MKPATH) $(INST_AUTODIR)
-	@$(EQUALIZE_TIMESTAMP) /usr/lib/perl5/5.6.0/i386-linux/CORE/perl.h $(INST_AUTODIR)/.exists
+	@$(EQUALIZE_TIMESTAMP) /usr/libdata/perl/5.00503/mach/CORE/perl.h $(INST_AUTODIR)/.exists

 	-@$(CHMOD) $(PERM_RWX) $(INST_AUTODIR)

-$(INST_LIBDIR)/.exists :: /usr/lib/perl5/5.6.0/i386-linux/CORE/perl.h
+$(INST_LIBDIR)/.exists :: /usr/libdata/perl/5.00503/mach/CORE/perl.h
 	@$(MKPATH) $(INST_LIBDIR)
-	@$(EQUALIZE_TIMESTAMP) /usr/lib/perl5/5.6.0/i386-linux/CORE/perl.h $(INST_LIBDIR)/.exists
+	@$(EQUALIZE_TIMESTAMP) /usr/libdata/perl/5.00503/mach/CORE/perl.h $(INST_LIBDIR)/.exists

 	-@$(CHMOD) $(PERM_RWX) $(INST_LIBDIR)

-$(INST_ARCHAUTODIR)/.exists :: /usr/lib/perl5/5.6.0/i386-linux/CORE/perl.h
+$(INST_ARCHAUTODIR)/.exists :: /usr/libdata/perl/5.00503/mach/CORE/perl.h
 	@$(MKPATH) $(INST_ARCHAUTODIR)
-	@$(EQUALIZE_TIMESTAMP) /usr/lib/perl5/5.6.0/i386-linux/CORE/perl.h $(INST_ARCHAUTODIR)/.exists
+	@$(EQUALIZE_TIMESTAMP) /usr/libdata/perl/5.00503/mach/CORE/perl.h $(INST_ARCHAUTODIR)/.exists

 	-@$(CHMOD) $(PERM_RWX) $(INST_ARCHAUTODIR)

@@ -312,9 +314,9 @@ config :: $(INST_MAN3DIR)/.exists
 	@$(NOOP)


-$(INST_MAN3DIR)/.exists :: /usr/lib/perl5/5.6.0/i386-linux/CORE/perl.h
+$(INST_MAN3DIR)/.exists :: /usr/libdata/perl/5.00503/mach/CORE/perl.h
 	@$(MKPATH) $(INST_MAN3DIR)
-	@$(EQUALIZE_TIMESTAMP) /usr/lib/perl5/5.6.0/i386-linux/CORE/perl.h $(INST_MAN3DIR)/.exists
+	@$(EQUALIZE_TIMESTAMP) /usr/libdata/perl/5.00503/mach/CORE/perl.h $(INST_MAN3DIR)/.exists

 	-@$(CHMOD) $(PERM_RWX) $(INST_MAN3DIR)

@@ -365,12 +367,6 @@ static :: Makefile $(INST_STATIC)
 # --- MakeMaker static_lib section:


-# --- MakeMaker htmlifypods section:
-
-htmlifypods : pure_all
-	@$(NOOP)
-
-
 # --- MakeMaker manifypods section:
 POD2MAN_EXE = /usr/bin/pod2man
 POD2MAN = $(PERL) -we '%m=@ARGV;for (keys %m){' \
@@ -379,10 +375,13 @@ POD2MAN = $(PERL) -we '%m=@ARGV;for (keys %m){' \
 -e 'system(qq[$$^X ].q["-I$(PERL_ARCHLIB)" "-I$(PERL_LIB)" $(POD2MAN_EXE) ].qq[$$_>$$m{$$_}])==0 or warn "Couldn\047t install $$m{$$_}\n";' \
 -e 'chmod(oct($(PERM_RW))), $$m{$$_} or warn "chmod $(PERM_RW) $$m{$$_}: $$!\n";}'

-manifypods : pure_all General.pm
+manifypods : pure_all General.pm \
+	General/Extended.pm
 	@$(POD2MAN) \
 	General.pm \
-	$(INST_MAN3DIR)/Config::General.$(MAN3EXT)
+	$(INST_MAN3DIR)/Config::General.$(MAN3EXT) \
+	General/Extended.pm \
+	$(INST_MAN3DIR)/Config::General::Extended.$(MAN3EXT)

 # --- MakeMaker processPL section:

@@ -400,7 +399,7 @@ manifypods : pure_all General.pm
 # the Makefile here so a later make realclean still has a makefile to use.

 clean ::
-	-rm -rf ./blib $(MAKE_APERL_FILE) $(INST_ARCHAUTODIR)/extralibs.all perlmain.c mon.out core core.*perl.*.? *perl.core so_locations pm_to_blib *~ */*~ */*/*~ *$(OBJ_EXT) *$(LIB_EXT) perl.exe $(BOOTSTRAP) $(BASEEXT).bso $(BASEEXT).def $(BASEEXT).exp
+	-rm -rf ./blib $(MAKE_APERL_FILE) $(INST_ARCHAUTODIR)/extralibs.all perlmain.c mon.out core so_locations pm_to_blib *~ */*~ */*/*~ *$(OBJ_EXT) *$(LIB_EXT) perl.exe $(BOOTSTRAP) $(BASEEXT).bso $(BASEEXT).def $(BASEEXT).exp
 	-mv Makefile Makefile.old $(DEV_NULL)


@@ -409,7 +408,7 @@ clean ::
 # Delete temporary files (via clean) and also delete installed files
 realclean purge ::  clean
 	rm -rf $(INST_AUTODIR) $(INST_ARCHAUTODIR)
-	rm -f $(INST_LIBDIR)/General.pm
+	rm -f $(INST_LIBDIR)/General/Extended.pm $(INST_LIBDIR)/General.pm
 	rm -rf Makefile Makefile.old


@@ -521,8 +520,6 @@ pure_perl_install ::
 		$(INST_ARCHLIB) $(INSTALLARCHLIB) \
 		$(INST_BIN) $(INSTALLBIN) \
 		$(INST_SCRIPT) $(INSTALLSCRIPT) \
-		$(INST_HTMLLIBDIR) $(INSTALLHTMLPRIVLIBDIR) \
-		$(INST_HTMLSCRIPTDIR) $(INSTALLHTMLSCRIPTDIR) \
 		$(INST_MAN1DIR) $(INSTALLMAN1DIR) \
 		$(INST_MAN3DIR) $(INSTALLMAN3DIR)
 	@$(WARN_IF_OLD_PACKLIST) \
@@ -537,15 +534,12 @@ pure_site_install ::
 		$(INST_ARCHLIB) $(INSTALLSITEARCH) \
 		$(INST_BIN) $(INSTALLBIN) \
 		$(INST_SCRIPT) $(INSTALLSCRIPT) \
-		$(INST_HTMLLIBDIR) $(INSTALLHTMLSITELIBDIR) \
-		$(INST_HTMLSCRIPTDIR) $(INSTALLHTMLSCRIPTDIR) \
 		$(INST_MAN1DIR) $(INSTALLMAN1DIR) \
 		$(INST_MAN3DIR) $(INSTALLMAN3DIR)
 	@$(WARN_IF_OLD_PACKLIST) \
 		$(PERL_ARCHLIB)/auto/$(FULLEXT)

 doc_perl_install ::
-	-@$(MKPATH) $(INSTALLARCHLIB)
 	-@$(DOC_INSTALL) \
 		"Module" "$(NAME)" \
 		"installed into" "$(INSTALLPRIVLIB)" \
@@ -555,7 +549,6 @@ doc_perl_install ::
 		>> $(INSTALLARCHLIB)/perllocal.pod

 doc_site_install ::
-	-@$(MKPATH) $(INSTALLARCHLIB)
 	-@$(DOC_INSTALL) \
 		"Module" "$(NAME)" \
 		"installed into" "$(INSTALLSITELIB)" \
@@ -648,7 +641,7 @@ testdb_static :: testdb_dynamic
 # --- MakeMaker ppd section:
 # Creates a PPD (Perl Package Description) for a binary distribution.
 ppd:
-	@$(PERL) -e "print qq{<SOFTPKG NAME=\"Config-General\" VERSION=\"1,20,0,0\">\n}. qq{\t<TITLE>Config-General</TITLE>\n}. qq{\t<ABSTRACT></ABSTRACT>\n}. qq{\t<AUTHOR></AUTHOR>\n}. qq{\t<IMPLEMENTATION>\n}. qq{\t\t<OS NAME=\"$(OSNAME)\" />\n}. qq{\t\t<ARCHITECTURE NAME=\"i386-linux\" />\n}. qq{\t\t<CODEBASE HREF=\"\" />\n}. qq{\t</IMPLEMENTATION>\n}. qq{</SOFTPKG>\n}" > Config-General.ppd
+	@$(PERL) -e "print qq{<SOFTPKG NAME=\"Config-General\" VERSION=\"1,25,0,0\">\n}. qq{\t<TITLE>Config-General</TITLE>\n}. qq{\t<ABSTRACT></ABSTRACT>\n}. qq{\t<AUTHOR></AUTHOR>\n}. qq{\t<IMPLEMENTATION>\n}. qq{\t\t<OS NAME=\"$(OSNAME)\" />\n}. qq{\t\t<ARCHITECTURE NAME=\"i386-freebsd\" />\n}. qq{\t\t<CODEBASE HREF=\"\" />\n}. qq{\t</IMPLEMENTATION>\n}. qq{</SOFTPKG>\n}" > Config-General.ppd

 # --- MakeMaker pm_to_blib section: