scip/Config-General
1
0
Fork 0
mirror of https://codeberg.org/scip/Config-General.git synced 2025-12-17 12:41:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

1.21: - lines with just one "#" became an option array named

Browse Source 
"#" with empty entries, very weird, fixed


git-svn-id: http://dev.catalyst.perl.org/repos/Config-General/trunk@9 be1acefe-a474-0410-9a34-9b3221f2030f
This commit is contained in:
Thomas von Dein
2009-10-10 16:09:33 +00:00
parent 7c03404fe9
commit 93316ddc2e
2 changed files with 28 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
General.pm
View File

@@ -109,6 +109,7 @@ sub _open {
# patch by "Manuel Valente" <manuel@ripe.net>: # patch by "Manuel Valente" <manuel@ripe.net>:
if (!$hierend) { if (!$hierend) {
s/(?<!\\)#.+$//; # Remove comments s/(?<!\\)#.+$//; # Remove comments
next if /^#/; # Remove lines beginning with "#"
next if /^\s*$/; # Skip empty lines next if /^\s*$/; # Skip empty lines
s/\\#/#/g; # remove the \ char in front of masked "#" s/\\#/#/g; # remove the \ char in front of masked "#"
} }

54
Makefile.old
View File

@@ -18,23 +18,23 @@
# --- MakeMaker const_config section: # --- MakeMaker const_config section:
# These definitions are from config.sh (via /usr/lib/perl5/5.6.0/i686-linux/Config.pm) # These definitions are from config.sh (via /usr/lib/perl5/5.6.0/i386-linux/Config.pm)
# They may have been overridden via Makefile.PL or on the command line # They may have been overridden via Makefile.PL or on the command line
AR = ar AR = ar
CC = cc CC = gcc
CCCDLFLAGS = -fpic CCCDLFLAGS = -fPIC
CCDLFLAGS = -rdynamic CCDLFLAGS = -rdynamic
DLEXT = so DLEXT = so
DLSRC = dl_dlopen.xs DLSRC = dl_dlopen.xs
LD = cc LD = gcc
LDDLFLAGS = -shared -L/usr/local/lib LDDLFLAGS = -shared -L/usr/local/lib
LDFLAGS = -L/usr/local/lib LDFLAGS = -L/usr/local/lib
LIBC = /lib/libc-2.1.3.so LIBC = /lib/libc-2.1.92.so
LIB_EXT = .a LIB_EXT = .a
OBJ_EXT = .o OBJ_EXT = .o
OSNAME = linux OSNAME = linux
OSVERS = 2.2.14-5.0 OSVERS = 2.2.5-22smp
RANLIB = : RANLIB = :
SO = so SO = so
EXE_EXT = EXE_EXT =
@@ -46,9 +46,9 @@ AR_STATIC_ARGS = cr
NAME = Config::General NAME = Config::General
DISTNAME = Config-General DISTNAME = Config-General
NAME_SYM = Config_General NAME_SYM = Config_General
VERSION = 1.17 VERSION = 1.20
VERSION_SYM = 1_17 VERSION_SYM = 1_20
XS_VERSION = 1.17 XS_VERSION = 1.20
INST_BIN = blib/bin INST_BIN = blib/bin
INST_EXE = blib/script INST_EXE = blib/script
INST_LIB = blib/lib INST_LIB = blib/lib
@@ -57,20 +57,20 @@ INST_SCRIPT = blib/script
PREFIX = /usr PREFIX = /usr
INSTALLDIRS = site INSTALLDIRS = site
INSTALLPRIVLIB = $(PREFIX)/lib/perl5/5.6.0 INSTALLPRIVLIB = $(PREFIX)/lib/perl5/5.6.0
INSTALLARCHLIB = $(PREFIX)/lib/perl5/5.6.0/i686-linux INSTALLARCHLIB = $(PREFIX)/lib/perl5/5.6.0/i386-linux
INSTALLSITELIB = $(PREFIX)/lib/perl5/site_perl/5.6.0 INSTALLSITELIB = $(PREFIX)/lib/perl5/site_perl/5.6.0
INSTALLSITEARCH = $(PREFIX)/lib/perl5/site_perl/5.6.0/i686-linux INSTALLSITEARCH = $(PREFIX)/lib/perl5/site_perl/5.6.0/i386-linux
INSTALLBIN = $(PREFIX)/bin INSTALLBIN = $(PREFIX)/bin
INSTALLSCRIPT = $(PREFIX)/bin INSTALLSCRIPT = $(PREFIX)/bin
PERL_LIB = /usr/lib/perl5/5.6.0 PERL_LIB = /usr/lib/perl5/5.6.0
PERL_ARCHLIB = /usr/lib/perl5/5.6.0/i686-linux PERL_ARCHLIB = /usr/lib/perl5/5.6.0/i386-linux
SITELIBEXP = /usr/lib/perl5/site_perl/5.6.0 SITELIBEXP = /usr/lib/perl5/site_perl/5.6.0
SITEARCHEXP = /usr/lib/perl5/site_perl/5.6.0/i686-linux SITEARCHEXP = /usr/lib/perl5/site_perl/5.6.0/i386-linux
LIBPERL_A = libperl.a LIBPERL_A = libperl.a
FIRST_MAKEFILE = Makefile FIRST_MAKEFILE = Makefile
MAKE_APERL_FILE = Makefile.aperl MAKE_APERL_FILE = Makefile.aperl
PERLMAINCC = $(CC) PERLMAINCC = $(CC)
PERL_INC = /usr/lib/perl5/5.6.0/i686-linux/CORE PERL_INC = /usr/lib/perl5/5.6.0/i386-linux/CORE
PERL = /usr/bin/perl PERL = /usr/bin/perl
FULLPERL = /usr/bin/perl FULLPERL = /usr/bin/perl
FULL_AR = /usr/bin/ar FULL_AR = /usr/bin/ar
@@ -109,11 +109,11 @@ MAN1PODS =
MAN3PODS = General.pm MAN3PODS = General.pm
HTMLEXT = html HTMLEXT = html
INST_MAN1DIR = blib/man1 INST_MAN1DIR = blib/man1
INSTALLMAN1DIR = /usr/man/man1 INSTALLMAN1DIR = $(PREFIX)/share/man/man1
MAN1EXT = 1 MAN1EXT = 1
INST_MAN3DIR = blib/man3 INST_MAN3DIR = blib/man3
INSTALLMAN3DIR = /usr/man/man3 INSTALLMAN3DIR = $(PREFIX)/share/man/man3
MAN3EXT = 3 MAN3EXT = 3pm
PERM_RW = 644 PERM_RW = 644
PERM_RWX = 755 PERM_RWX = 755
@@ -168,7 +168,7 @@ AUTOSPLITFILE = $(PERL) "-I$(PERL_ARCHLIB)" "-I$(PERL_LIB)" -e 'use AutoSplit;au
SHELL = /bin/sh SHELL = /bin/sh
CHMOD = chmod CHMOD = chmod
CP = cp CP = cp
LD = cc LD = gcc
MV = mv MV = mv
NOOP = $(SHELL) -c true NOOP = $(SHELL) -c true
RM_F = rm -f RM_F = rm -f
@@ -290,21 +290,21 @@ config :: $(INST_ARCHAUTODIR)/.exists
config :: $(INST_AUTODIR)/.exists config :: $(INST_AUTODIR)/.exists
@$(NOOP) @$(NOOP)
$(INST_AUTODIR)/.exists :: /usr/lib/perl5/5.6.0/i686-linux/CORE/perl.h $(INST_AUTODIR)/.exists :: /usr/lib/perl5/5.6.0/i386-linux/CORE/perl.h
@$(MKPATH) $(INST_AUTODIR) @$(MKPATH) $(INST_AUTODIR)
@$(EQUALIZE_TIMESTAMP) /usr/lib/perl5/5.6.0/i686-linux/CORE/perl.h $(INST_AUTODIR)/.exists @$(EQUALIZE_TIMESTAMP) /usr/lib/perl5/5.6.0/i386-linux/CORE/perl.h $(INST_AUTODIR)/.exists
-@$(CHMOD) $(PERM_RWX) $(INST_AUTODIR) -@$(CHMOD) $(PERM_RWX) $(INST_AUTODIR)
$(INST_LIBDIR)/.exists :: /usr/lib/perl5/5.6.0/i686-linux/CORE/perl.h $(INST_LIBDIR)/.exists :: /usr/lib/perl5/5.6.0/i386-linux/CORE/perl.h
@$(MKPATH) $(INST_LIBDIR) @$(MKPATH) $(INST_LIBDIR)
@$(EQUALIZE_TIMESTAMP) /usr/lib/perl5/5.6.0/i686-linux/CORE/perl.h $(INST_LIBDIR)/.exists @$(EQUALIZE_TIMESTAMP) /usr/lib/perl5/5.6.0/i386-linux/CORE/perl.h $(INST_LIBDIR)/.exists
-@$(CHMOD) $(PERM_RWX) $(INST_LIBDIR) -@$(CHMOD) $(PERM_RWX) $(INST_LIBDIR)
$(INST_ARCHAUTODIR)/.exists :: /usr/lib/perl5/5.6.0/i686-linux/CORE/perl.h $(INST_ARCHAUTODIR)/.exists :: /usr/lib/perl5/5.6.0/i386-linux/CORE/perl.h
@$(MKPATH) $(INST_ARCHAUTODIR) @$(MKPATH) $(INST_ARCHAUTODIR)
@$(EQUALIZE_TIMESTAMP) /usr/lib/perl5/5.6.0/i686-linux/CORE/perl.h $(INST_ARCHAUTODIR)/.exists @$(EQUALIZE_TIMESTAMP) /usr/lib/perl5/5.6.0/i386-linux/CORE/perl.h $(INST_ARCHAUTODIR)/.exists
-@$(CHMOD) $(PERM_RWX) $(INST_ARCHAUTODIR) -@$(CHMOD) $(PERM_RWX) $(INST_ARCHAUTODIR)
@@ -312,9 +312,9 @@ config :: $(INST_MAN3DIR)/.exists
@$(NOOP) @$(NOOP)
$(INST_MAN3DIR)/.exists :: /usr/lib/perl5/5.6.0/i686-linux/CORE/perl.h $(INST_MAN3DIR)/.exists :: /usr/lib/perl5/5.6.0/i386-linux/CORE/perl.h
@$(MKPATH) $(INST_MAN3DIR) @$(MKPATH) $(INST_MAN3DIR)
@$(EQUALIZE_TIMESTAMP) /usr/lib/perl5/5.6.0/i686-linux/CORE/perl.h $(INST_MAN3DIR)/.exists @$(EQUALIZE_TIMESTAMP) /usr/lib/perl5/5.6.0/i386-linux/CORE/perl.h $(INST_MAN3DIR)/.exists
-@$(CHMOD) $(PERM_RWX) $(INST_MAN3DIR) -@$(CHMOD) $(PERM_RWX) $(INST_MAN3DIR)
@@ -648,7 +648,7 @@ testdb_static :: testdb_dynamic
# --- MakeMaker ppd section: # --- MakeMaker ppd section:
# Creates a PPD (Perl Package Description) for a binary distribution. # Creates a PPD (Perl Package Description) for a binary distribution.
ppd: ppd:
@$(PERL) -e "print qq{<SOFTPKG NAME=\"Config-General\" VERSION=\"1,17,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=\"i686-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,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
# --- MakeMaker pm_to_blib section: # --- MakeMaker pm_to_blib section: