diff --git a/Makefile b/Makefile index 2c42fb4..8c4e798 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ # This Makefile is for the Catalyst::Helper::Controller::DBIC::API::REST extension to perl. # # It was generated automatically by MakeMaker version -# 6.50 (Revision: 65000) from the contents of +# 6.54 (Revision: 65400) from the contents of # Makefile.PL. Don't edit this file, edit Makefile.PL instead. # # ANY CHANGES MADE HERE WILL BE LOST! @@ -27,7 +27,7 @@ # --- MakeMaker const_config section: -# These definitions are from config.sh (via /usr/lib/perl/5.10/Config.pm). +# These definitions are from config.sh (via /home/amiri/local/lib/perl5/5.10.1/i686-linux/Config.pm). # They may have been overridden via Makefile.PL or on the command line. AR = ar CC = cc @@ -38,19 +38,19 @@ DLSRC = dl_dlopen.xs EXE_EXT = FULL_AR = /usr/bin/ar LD = cc -LDDLFLAGS = -shared -O2 -g -L/usr/local/lib -LDFLAGS = -L/usr/local/lib +LDDLFLAGS = -shared -O2 -L/usr/local/lib -fstack-protector +LDFLAGS = -fstack-protector -L/usr/local/lib LIBC = /lib/libc-2.8.90.so LIB_EXT = .a OBJ_EXT = .o OSNAME = linux -OSVERS = 2.6.24-16-server +OSVERS = 2.6.27-14-generic RANLIB = : -SITELIBEXP = /usr/local/share/perl/5.10.0 -SITEARCHEXP = /usr/local/lib/perl/5.10.0 +SITELIBEXP = /home/amiri/local/lib/perl5/site_perl/5.10.1 +SITEARCHEXP = /home/amiri/local/lib/perl5/site_perl/5.10.1/i686-linux SO = so -VENDORARCHEXP = /usr/lib/perl5 -VENDORLIBEXP = /usr/share/perl5 +VENDORARCHEXP = +VENDORLIBEXP = # --- MakeMaker constants section: @@ -72,58 +72,60 @@ INST_BIN = blib/bin INST_LIB = blib/lib INST_MAN1DIR = blib/man1 INST_MAN3DIR = blib/man3 -MAN1EXT = 1p -MAN3EXT = 3pm +MAN1EXT = 1 +MAN3EXT = 3 INSTALLDIRS = site -INSTALL_BASE = /home/amiri/Automation/Catalyst-Helper-Controller-DBIC-API-REST-0.01 DESTDIR = -PREFIX = $(INSTALL_BASE) -INSTALLPRIVLIB = $(INSTALL_BASE)/lib/perl5 +PREFIX = $(SITEPREFIX) +PERLPREFIX = /home/amiri/local +SITEPREFIX = /home/amiri/local +VENDORPREFIX = +INSTALLPRIVLIB = /home/amiri/local/lib/perl5/5.10.1 DESTINSTALLPRIVLIB = $(DESTDIR)$(INSTALLPRIVLIB) -INSTALLSITELIB = $(INSTALL_BASE)/lib/perl5 +INSTALLSITELIB = /home/amiri/local/lib/perl5/site_perl/5.10.1 DESTINSTALLSITELIB = $(DESTDIR)$(INSTALLSITELIB) -INSTALLVENDORLIB = $(INSTALL_BASE)/lib/perl5 +INSTALLVENDORLIB = DESTINSTALLVENDORLIB = $(DESTDIR)$(INSTALLVENDORLIB) -INSTALLARCHLIB = $(INSTALL_BASE)/lib/perl5/i486-linux-gnu-thread-multi +INSTALLARCHLIB = /home/amiri/local/lib/perl5/5.10.1/i686-linux DESTINSTALLARCHLIB = $(DESTDIR)$(INSTALLARCHLIB) -INSTALLSITEARCH = $(INSTALL_BASE)/lib/perl5/i486-linux-gnu-thread-multi +INSTALLSITEARCH = /home/amiri/local/lib/perl5/site_perl/5.10.1/i686-linux DESTINSTALLSITEARCH = $(DESTDIR)$(INSTALLSITEARCH) -INSTALLVENDORARCH = $(INSTALL_BASE)/lib/perl5/i486-linux-gnu-thread-multi +INSTALLVENDORARCH = DESTINSTALLVENDORARCH = $(DESTDIR)$(INSTALLVENDORARCH) -INSTALLBIN = $(INSTALL_BASE)/bin +INSTALLBIN = /home/amiri/local/bin DESTINSTALLBIN = $(DESTDIR)$(INSTALLBIN) -INSTALLSITEBIN = $(INSTALL_BASE)/bin +INSTALLSITEBIN = /home/amiri/local/bin DESTINSTALLSITEBIN = $(DESTDIR)$(INSTALLSITEBIN) -INSTALLVENDORBIN = $(INSTALL_BASE)/bin +INSTALLVENDORBIN = DESTINSTALLVENDORBIN = $(DESTDIR)$(INSTALLVENDORBIN) -INSTALLSCRIPT = $(INSTALL_BASE)/bin +INSTALLSCRIPT = /home/amiri/local/bin DESTINSTALLSCRIPT = $(DESTDIR)$(INSTALLSCRIPT) -INSTALLSITESCRIPT = $(INSTALL_BASE)/bin +INSTALLSITESCRIPT = /home/amiri/local/bin DESTINSTALLSITESCRIPT = $(DESTDIR)$(INSTALLSITESCRIPT) -INSTALLVENDORSCRIPT = $(INSTALL_BASE)/bin +INSTALLVENDORSCRIPT = DESTINSTALLVENDORSCRIPT = $(DESTDIR)$(INSTALLVENDORSCRIPT) -INSTALLMAN1DIR = $(INSTALL_BASE)/man/man1 +INSTALLMAN1DIR = /home/amiri/local/man/man1 DESTINSTALLMAN1DIR = $(DESTDIR)$(INSTALLMAN1DIR) -INSTALLSITEMAN1DIR = $(INSTALL_BASE)/man/man1 +INSTALLSITEMAN1DIR = /home/amiri/local/man/man1 DESTINSTALLSITEMAN1DIR = $(DESTDIR)$(INSTALLSITEMAN1DIR) -INSTALLVENDORMAN1DIR = $(INSTALL_BASE)/man/man1 +INSTALLVENDORMAN1DIR = DESTINSTALLVENDORMAN1DIR = $(DESTDIR)$(INSTALLVENDORMAN1DIR) -INSTALLMAN3DIR = $(INSTALL_BASE)/man/man3 +INSTALLMAN3DIR = /home/amiri/local/man/man3 DESTINSTALLMAN3DIR = $(DESTDIR)$(INSTALLMAN3DIR) -INSTALLSITEMAN3DIR = $(INSTALL_BASE)/man/man3 +INSTALLSITEMAN3DIR = /home/amiri/local/man/man3 DESTINSTALLSITEMAN3DIR = $(DESTDIR)$(INSTALLSITEMAN3DIR) -INSTALLVENDORMAN3DIR = $(INSTALL_BASE)/man/man3 +INSTALLVENDORMAN3DIR = DESTINSTALLVENDORMAN3DIR = $(DESTDIR)$(INSTALLVENDORMAN3DIR) PERL_LIB = -PERL_ARCHLIB = /usr/lib/perl/5.10 +PERL_ARCHLIB = /home/amiri/local/lib/perl5/5.10.1/i686-linux LIBPERL_A = libperl.a FIRST_MAKEFILE = Makefile MAKEFILE_OLD = Makefile.old MAKE_APERL_FILE = Makefile.aperl PERLMAINCC = $(CC) -PERL_INC = /usr/lib/perl/5.10/CORE -PERL = /usr/bin/perl "-Iinc" -FULLPERL = /usr/bin/perl "-Iinc" +PERL_INC = /home/amiri/local/lib/perl5/5.10.1/i686-linux/CORE +PERL = /home/amiri/local/bin/perl "-Iinc" +FULLPERL = /home/amiri/local/bin/perl "-Iinc" ABSPERL = $(PERL) PERLRUN = $(PERL) FULLPERLRUN = $(FULLPERL) @@ -132,12 +134,13 @@ PERLRUNINST = $(PERLRUN) "-I$(INST_ARCHLIB)" "-Iinc" "-I$(INST_LIB)" FULLPERLRUNINST = $(FULLPERLRUN) "-I$(INST_ARCHLIB)" "-Iinc" "-I$(INST_LIB)" ABSPERLRUNINST = $(ABSPERLRUN) "-I$(INST_ARCHLIB)" "-Iinc" "-I$(INST_LIB)" PERL_CORE = 0 +PERM_DIR = 755 PERM_RW = 644 PERM_RWX = 755 -MAKEMAKER = /usr/share/perl/5.10/ExtUtils/MakeMaker.pm -MM_VERSION = 6.50 -MM_REVISION = 65000 +MAKEMAKER = /home/amiri/local/lib/perl5/5.10.1/ExtUtils/MakeMaker.pm +MM_VERSION = 6.54 +MM_REVISION = 65400 # FULLEXT = Pathname for extension directory (eg Foo/Bar/Oracle). # BASEEXT = Basename part of FULLEXT. May be just equal FULLEXT. (eg Oracle) @@ -591,7 +594,7 @@ PM_TO_BLIB = lib/perl5/Data/Serializer.pm \ # --- MakeMaker platform_constants section: -MM_Unix_VERSION = 6.50 +MM_Unix_VERSION = 6.54 PERL_MALLOC_DEF = -DPERL_EXTMALLOC_DEF -Dmalloc=Perl_malloc -Dfree=Perl_mfree -Drealloc=Perl_realloc -Dcalloc=Perl_calloc @@ -609,7 +612,7 @@ SHELL = /bin/sh CHMOD = chmod CP = cp MV = mv -NOOP = $(SHELL) -c true +NOOP = $(TRUE) NOECHO = @ RM_F = rm -f RM_RF = rm -rf @@ -617,20 +620,22 @@ TEST_F = test -f TOUCH = touch UMASK_NULL = umask 0 DEV_NULL = > /dev/null 2>&1 -MKPATH = $(ABSPERLRUN) "-MExtUtils::Command" -e mkpath -EQUALIZE_TIMESTAMP = $(ABSPERLRUN) "-MExtUtils::Command" -e eqtime +MKPATH = $(ABSPERLRUN) -MExtUtils::Command -e 'mkpath' -- +EQUALIZE_TIMESTAMP = $(ABSPERLRUN) -MExtUtils::Command -e 'eqtime' -- +FALSE = false +TRUE = true ECHO = echo ECHO_N = echo -n UNINST = 0 VERBINST = 0 -MOD_INSTALL = $(ABSPERLRUN) -MExtUtils::Install -e 'install({@ARGV}, '\''$(VERBINST)'\'', 0, '\''$(UNINST)'\'');' -- -DOC_INSTALL = $(ABSPERLRUN) "-MExtUtils::Command::MM" -e perllocal_install -UNINSTALL = $(ABSPERLRUN) "-MExtUtils::Command::MM" -e uninstall -WARN_IF_OLD_PACKLIST = $(ABSPERLRUN) "-MExtUtils::Command::MM" -e warn_if_old_packlist +MOD_INSTALL = $(ABSPERLRUN) -MExtUtils::Install -e 'install([ from_to => {@ARGV}, verbose => '\''$(VERBINST)'\'', uninstall_shadows => '\''$(UNINST)'\'', dir_mode => '\''$(PERM_DIR)'\'' ]);' -- +DOC_INSTALL = $(ABSPERLRUN) -MExtUtils::Command::MM -e 'perllocal_install' -- +UNINSTALL = $(ABSPERLRUN) -MExtUtils::Command::MM -e 'uninstall' -- +WARN_IF_OLD_PACKLIST = $(ABSPERLRUN) -MExtUtils::Command::MM -e 'warn_if_old_packlist' -- MACROSTART = MACROEND = USEMAKEFILE = -f -FIXIN = $(PERLRUN) "-MExtUtils::MY" -e "MY->fixin(shift)" +FIXIN = $(ABSPERLRUN) -MExtUtils::MY -e 'MY->fixin(shift)' -- # --- MakeMaker makemakerdflt section: @@ -679,8 +684,7 @@ DISTVNAME = Catalyst-Helper-Controller-DBIC-API-REST-0.03 PASTHRU = LIBPERL_A="$(LIBPERL_A)"\ LINKTYPE="$(LINKTYPE)"\ - PREFIX="$(PREFIX)"\ - INSTALL_BASE="$(INSTALL_BASE)" + PREFIX="$(PREFIX)" # --- MakeMaker special_targets section: @@ -727,42 +731,42 @@ blibdirs.ts : blibdirs $(INST_LIBDIR)$(DFSEP).exists :: Makefile.PL $(NOECHO) $(MKPATH) $(INST_LIBDIR) - $(NOECHO) $(CHMOD) 755 $(INST_LIBDIR) + $(NOECHO) $(CHMOD) $(PERM_DIR) $(INST_LIBDIR) $(NOECHO) $(TOUCH) $(INST_LIBDIR)$(DFSEP).exists $(INST_ARCHLIB)$(DFSEP).exists :: Makefile.PL $(NOECHO) $(MKPATH) $(INST_ARCHLIB) - $(NOECHO) $(CHMOD) 755 $(INST_ARCHLIB) + $(NOECHO) $(CHMOD) $(PERM_DIR) $(INST_ARCHLIB) $(NOECHO) $(TOUCH) $(INST_ARCHLIB)$(DFSEP).exists $(INST_AUTODIR)$(DFSEP).exists :: Makefile.PL $(NOECHO) $(MKPATH) $(INST_AUTODIR) - $(NOECHO) $(CHMOD) 755 $(INST_AUTODIR) + $(NOECHO) $(CHMOD) $(PERM_DIR) $(INST_AUTODIR) $(NOECHO) $(TOUCH) $(INST_AUTODIR)$(DFSEP).exists $(INST_ARCHAUTODIR)$(DFSEP).exists :: Makefile.PL $(NOECHO) $(MKPATH) $(INST_ARCHAUTODIR) - $(NOECHO) $(CHMOD) 755 $(INST_ARCHAUTODIR) + $(NOECHO) $(CHMOD) $(PERM_DIR) $(INST_ARCHAUTODIR) $(NOECHO) $(TOUCH) $(INST_ARCHAUTODIR)$(DFSEP).exists $(INST_BIN)$(DFSEP).exists :: Makefile.PL $(NOECHO) $(MKPATH) $(INST_BIN) - $(NOECHO) $(CHMOD) 755 $(INST_BIN) + $(NOECHO) $(CHMOD) $(PERM_DIR) $(INST_BIN) $(NOECHO) $(TOUCH) $(INST_BIN)$(DFSEP).exists $(INST_SCRIPT)$(DFSEP).exists :: Makefile.PL $(NOECHO) $(MKPATH) $(INST_SCRIPT) - $(NOECHO) $(CHMOD) 755 $(INST_SCRIPT) + $(NOECHO) $(CHMOD) $(PERM_DIR) $(INST_SCRIPT) $(NOECHO) $(TOUCH) $(INST_SCRIPT)$(DFSEP).exists $(INST_MAN1DIR)$(DFSEP).exists :: Makefile.PL $(NOECHO) $(MKPATH) $(INST_MAN1DIR) - $(NOECHO) $(CHMOD) 755 $(INST_MAN1DIR) + $(NOECHO) $(CHMOD) $(PERM_DIR) $(INST_MAN1DIR) $(NOECHO) $(TOUCH) $(INST_MAN1DIR)$(DFSEP).exists $(INST_MAN3DIR)$(DFSEP).exists :: Makefile.PL $(NOECHO) $(MKPATH) $(INST_MAN3DIR) - $(NOECHO) $(CHMOD) 755 $(INST_MAN3DIR) + $(NOECHO) $(CHMOD) $(PERM_DIR) $(INST_MAN3DIR) $(NOECHO) $(TOUCH) $(INST_MAN3DIR)$(DFSEP).exists @@ -1078,16 +1082,16 @@ distsignature : create_distdir # --- MakeMaker install section: -install :: all pure_install doc_install +install :: pure_install doc_install $(NOECHO) $(NOOP) -install_perl :: all pure_perl_install doc_perl_install +install_perl :: pure_perl_install doc_perl_install $(NOECHO) $(NOOP) -install_site :: all pure_site_install doc_site_install +install_site :: pure_site_install doc_site_install $(NOECHO) $(NOOP) -install_vendor :: all pure_vendor_install doc_vendor_install +install_vendor :: pure_vendor_install doc_vendor_install $(NOECHO) $(NOOP) pure_install :: pure_$(INSTALLDIRS)_install @@ -1102,7 +1106,7 @@ pure__install : pure_site_install doc__install : doc_site_install $(NOECHO) $(ECHO) INSTALLDIRS not defined, defaulting to INSTALLDIRS=site -pure_perl_install :: +pure_perl_install :: all $(NOECHO) $(MOD_INSTALL) \ read $(PERL_ARCHLIB)/auto/$(FULLEXT)/.packlist \ write $(DESTINSTALLARCHLIB)/auto/$(FULLEXT)/.packlist \ @@ -1116,7 +1120,7 @@ pure_perl_install :: $(SITEARCHEXP)/auto/$(FULLEXT) -pure_site_install :: +pure_site_install :: all $(NOECHO) $(MOD_INSTALL) \ read $(SITEARCHEXP)/auto/$(FULLEXT)/.packlist \ write $(DESTINSTALLSITEARCH)/auto/$(FULLEXT)/.packlist \ @@ -1129,7 +1133,7 @@ pure_site_install :: $(NOECHO) $(WARN_IF_OLD_PACKLIST) \ $(PERL_ARCHLIB)/auto/$(FULLEXT) -pure_vendor_install :: +pure_vendor_install :: all $(NOECHO) $(MOD_INSTALL) \ read $(VENDORARCHEXP)/auto/$(FULLEXT)/.packlist \ write $(DESTINSTALLVENDORARCH)/auto/$(FULLEXT)/.packlist \ @@ -1140,7 +1144,7 @@ pure_vendor_install :: $(INST_MAN1DIR) $(DESTINSTALLVENDORMAN1DIR) \ $(INST_MAN3DIR) $(DESTINSTALLVENDORMAN3DIR) -doc_perl_install :: +doc_perl_install :: all $(NOECHO) $(ECHO) Appending installation info to $(DESTINSTALLARCHLIB)/perllocal.pod -$(NOECHO) $(MKPATH) $(DESTINSTALLARCHLIB) -$(NOECHO) $(DOC_INSTALL) \ @@ -1151,7 +1155,7 @@ doc_perl_install :: EXE_FILES "$(EXE_FILES)" \ >> $(DESTINSTALLARCHLIB)/perllocal.pod -doc_site_install :: +doc_site_install :: all $(NOECHO) $(ECHO) Appending installation info to $(DESTINSTALLARCHLIB)/perllocal.pod -$(NOECHO) $(MKPATH) $(DESTINSTALLARCHLIB) -$(NOECHO) $(DOC_INSTALL) \ @@ -1162,7 +1166,7 @@ doc_site_install :: EXE_FILES "$(EXE_FILES)" \ >> $(DESTINSTALLARCHLIB)/perllocal.pod -doc_vendor_install :: +doc_vendor_install :: all $(NOECHO) $(ECHO) Appending installation info to $(DESTINSTALLARCHLIB)/perllocal.pod -$(NOECHO) $(MKPATH) $(DESTINSTALLARCHLIB) -$(NOECHO) $(DOC_INSTALL) \ @@ -1208,7 +1212,7 @@ $(FIRST_MAKEFILE) : Makefile.PL $(CONFIGDEP) $(PERLRUN) Makefile.PL $(NOECHO) $(ECHO) "==> Your Makefile has been rebuilt. <==" $(NOECHO) $(ECHO) "==> Please rerun the $(MAKE) command. <==" - false + $(FALSE) @@ -1216,7 +1220,7 @@ $(FIRST_MAKEFILE) : Makefile.PL $(CONFIGDEP) # --- MakeMaker makeaperl section --- MAP_TARGET = perl -FULLPERL = /usr/bin/perl +FULLPERL = /home/amiri/local/bin/perl $(MAP_TARGET) :: static $(MAKE_APERL_FILE) $(MAKE) $(USEMAKEFILE) $(MAKE_APERL_FILE) $@ @@ -1260,17 +1264,15 @@ testdb_static :: testdb_dynamic # --- MakeMaker ppd section: # Creates a PPD (Perl Package Description) for a binary distribution. ppd : - $(NOECHO) $(ECHO) '' > $(DISTNAME).ppd - $(NOECHO) $(ECHO) ' $(DISTNAME)' >> $(DISTNAME).ppd + $(NOECHO) $(ECHO) '' > $(DISTNAME).ppd $(NOECHO) $(ECHO) ' ' >> $(DISTNAME).ppd $(NOECHO) $(ECHO) ' Amiri Barksdale <amiri@metalabel.com>' >> $(DISTNAME).ppd $(NOECHO) $(ECHO) ' ' >> $(DISTNAME).ppd - $(NOECHO) $(ECHO) ' ' >> $(DISTNAME).ppd - $(NOECHO) $(ECHO) ' ' >> $(DISTNAME).ppd - $(NOECHO) $(ECHO) ' ' >> $(DISTNAME).ppd - $(NOECHO) $(ECHO) ' ' >> $(DISTNAME).ppd - $(NOECHO) $(ECHO) ' ' >> $(DISTNAME).ppd - $(NOECHO) $(ECHO) ' ' >> $(DISTNAME).ppd + $(NOECHO) $(ECHO) ' ' >> $(DISTNAME).ppd + $(NOECHO) $(ECHO) ' ' >> $(DISTNAME).ppd + $(NOECHO) $(ECHO) ' ' >> $(DISTNAME).ppd + $(NOECHO) $(ECHO) ' ' >> $(DISTNAME).ppd + $(NOECHO) $(ECHO) ' ' >> $(DISTNAME).ppd $(NOECHO) $(ECHO) ' ' >> $(DISTNAME).ppd $(NOECHO) $(ECHO) ' ' >> $(DISTNAME).ppd $(NOECHO) $(ECHO) '' >> $(DISTNAME).ppd @@ -1278,8 +1280,8 @@ ppd : # --- MakeMaker pm_to_blib section: -pm_to_blib : $(TO_INST_PM) - $(NOECHO) $(ABSPERLRUN) -MExtUtils::Install -e 'pm_to_blib({@ARGV}, '\''$(INST_LIB)/auto'\'', '\''$(PM_FILTER)'\'')' -- \ +pm_to_blib : $(FIRST_MAKEFILE) $(TO_INST_PM) + $(NOECHO) $(ABSPERLRUN) -MExtUtils::Install -e 'pm_to_blib({@ARGV}, '\''$(INST_LIB)/auto'\'', q[$(PM_FILTER)], '\''$(PERM_DIR)'\'')' -- \ lib/perl5/Data/Serializer.pm blib/lib/perl5/Data/Serializer.pm \ lib/perl5/Test/Deep/Array.pm blib/lib/perl5/Test/Deep/Array.pm \ lib/perl5/Test/Deep/Number.pm blib/lib/perl5/Test/Deep/Number.pm \ @@ -1311,7 +1313,7 @@ pm_to_blib : $(TO_INST_PM) lib/perl5/Test/Deep/Cache.pm blib/lib/perl5/Test/Deep/Cache.pm \ lib/perl5/Data/Serializer/Data/Denter.pm blib/lib/perl5/Data/Serializer/Data/Denter.pm \ lib/perl5/Data/Serializer/JSON/Syck.pm blib/lib/perl5/Data/Serializer/JSON/Syck.pm - $(NOECHO) $(ABSPERLRUN) -MExtUtils::Install -e 'pm_to_blib({@ARGV}, '\''$(INST_LIB)/auto'\'', '\''$(PM_FILTER)'\'')' -- \ + $(NOECHO) $(ABSPERLRUN) -MExtUtils::Install -e 'pm_to_blib({@ARGV}, '\''$(INST_LIB)/auto'\'', q[$(PM_FILTER)], '\''$(PERM_DIR)'\'')' -- \ lib/perl5/Catalyst/Controller/REST.pm blib/lib/perl5/Catalyst/Controller/REST.pm \ lib/perl5/Catalyst/Action/Deserialize/JSON.pm blib/lib/perl5/Catalyst/Action/Deserialize/JSON.pm \ lib/perl5/i486-linux-gnu-thread-multi/auto/Catalyst/Action/REST/.packlist blib/lib/perl5/i486-linux-gnu-thread-multi/auto/Catalyst/Action/REST/.packlist \ @@ -1341,7 +1343,7 @@ pm_to_blib : $(TO_INST_PM) lib/perl5/Data/Serializer/PHP/Serialization.pm blib/lib/perl5/Data/Serializer/PHP/Serialization.pm \ lib/perl5/Test/Deep/Cmp.pm blib/lib/perl5/Test/Deep/Cmp.pm \ lib/perl5/Test/Deep/NoTest.pm blib/lib/perl5/Test/Deep/NoTest.pm - $(NOECHO) $(ABSPERLRUN) -MExtUtils::Install -e 'pm_to_blib({@ARGV}, '\''$(INST_LIB)/auto'\'', '\''$(PM_FILTER)'\'')' -- \ + $(NOECHO) $(ABSPERLRUN) -MExtUtils::Install -e 'pm_to_blib({@ARGV}, '\''$(INST_LIB)/auto'\'', q[$(PM_FILTER)], '\''$(PERM_DIR)'\'')' -- \ lib/perl5/Data/Serializer/Config/General.pm blib/lib/perl5/Data/Serializer/Config/General.pm \ lib/RestTest/Controller/API/REST/Artist.pm blib/lib/RestTest/Controller/API/REST/Artist.pm \ lib/perl5/UNIVERSAL/isa.pm blib/lib/perl5/UNIVERSAL/isa.pm \ @@ -1370,7 +1372,7 @@ pm_to_blib : $(TO_INST_PM) lib/perl5/Catalyst/Request/REST.pm blib/lib/perl5/Catalyst/Request/REST.pm \ lib/perl5/i486-linux-gnu-thread-multi/auto/CGI/Expand/.packlist blib/lib/perl5/i486-linux-gnu-thread-multi/auto/CGI/Expand/.packlist \ lib/perl5/Test/Deep/RefType.pm blib/lib/perl5/Test/Deep/RefType.pm - $(NOECHO) $(ABSPERLRUN) -MExtUtils::Install -e 'pm_to_blib({@ARGV}, '\''$(INST_LIB)/auto'\'', '\''$(PM_FILTER)'\'')' -- \ + $(NOECHO) $(ABSPERLRUN) -MExtUtils::Install -e 'pm_to_blib({@ARGV}, '\''$(INST_LIB)/auto'\'', q[$(PM_FILTER)], '\''$(PERM_DIR)'\'')' -- \ lib/perl5/i486-linux-gnu-thread-multi/auto/Test/WWW/Mechanize/.packlist blib/lib/perl5/i486-linux-gnu-thread-multi/auto/Test/WWW/Mechanize/.packlist \ lib/perl5/Catalyst/Action/Serialize.pm blib/lib/perl5/Catalyst/Action/Serialize.pm \ lib/RestTest/Controller/API/REST/Producer.pm blib/lib/RestTest/Controller/API/REST/Producer.pm \ diff --git a/blib/lib/Catalyst/Helper/Controller/DBIC/API/REST.pm b/blib/lib/Catalyst/Helper/Controller/DBIC/API/REST.pm index 51dcc9b..394538b 100644 --- a/blib/lib/Catalyst/Helper/Controller/DBIC/API/REST.pm +++ b/blib/lib/Catalyst/Helper/Controller/DBIC/API/REST.pm @@ -174,12 +174,13 @@ sub mk_compclass { ## Lookup table for source lookups in list_prefetch_allows my %name_to_source = map { $schema->source($_)->name => $_ } $schema->sources; + my $path_app = File::Spec->catdir( $FindBin::Bin, "..", "lib", + $helper->{app} ); + ## Make api base - my $api_file = "$FindBin::Bin/../lib/" - . $helper->{app} - . "/" - . $helper->{type} - . "/API.pm"; + my $api_file + = File::Spec->catfile( $path_app, $helper->{type}, "API.pm" ); + (my $api_path = $api_file) =~ s/\.pm$//; $helper->mk_dir($api_path); $helper->render_file('apibase', $api_file); @@ -187,11 +188,10 @@ sub mk_compclass { $helper->_mk_comptest; ## Make rest base - my $rest_file = "$FindBin::Bin/../lib/" - . $helper->{app} - . "/" - . $helper->{type} - . "/API/REST.pm"; + my $rest_file + = File::Spec->catfile( $path_app, $helper->{type}, "API", + "REST.pm" ); + (my $rest_path = $rest_file) =~ s/\.pm$//; $helper->mk_dir($rest_path); $helper->render_file('restbase', $rest_file); @@ -199,13 +199,10 @@ sub mk_compclass { $helper->_mk_comptest; ## Make controller base - my $base_file = "$FindBin::Bin/../lib/" - . $helper->{app} - . "/ControllerBase" - . "/REST.pm"; - $helper->mk_dir("$FindBin::Bin/../lib/" - . $helper->{app} - . "/ControllerBase" ); + my $base_file + = File::Spec->catfile( $path_app, "ControllerBase", "REST.pm" ); + + $helper->mk_dir( File::Spec->catdir( $path_app, "ControllerBase" ) ); $helper->render_file('controllerbase', $base_file); $helper->{test} = $helper->next_test('controller_base'); $helper->_mk_comptest; @@ -213,12 +210,8 @@ sub mk_compclass { ## Make result class controllers for my $source ($schema->sources) { my ($class,$result_class); - my $file = "$FindBin::Bin/../lib/" - . $helper->{app} - . "/" . $helper->{type} - . "/API/REST/" - . $source - . ".pm"; + my $file = File::Spec->catfile( $path_app, + $helper->{type}, "API", "REST", $source . ".pm" ); $class = $helper->{app} . "::" . $helper->{type} diff --git a/blib/man3/Catalyst::Helper::Controller::DBIC::API::REST.3pm b/blib/man3/Catalyst::Helper::Controller::DBIC::API::REST.3pm deleted file mode 100644 index b738338..0000000 --- a/blib/man3/Catalyst::Helper::Controller::DBIC::API::REST.3pm +++ /dev/null @@ -1,297 +0,0 @@ -.\" Automatically generated by Pod::Man 2.16 (Pod::Simple 3.07) -.\" -.\" Standard preamble: -.\" ======================================================================== -.de Sh \" Subsection heading -.br -.if t .Sp -.ne 5 -.PP -\fB\\$1\fR -.PP -.. -.de Sp \" Vertical space (when we can't use .PP) -.if t .sp .5v -.if n .sp -.. -.de Vb \" Begin verbatim text -.ft CW -.nf -.ne \\$1 -.. -.de Ve \" End verbatim text -.ft R -.fi -.. -.\" Set up some character translations and predefined strings. \*(-- will -.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left -.\" double quote, and \*(R" will give a right double quote. \*(C+ will -.\" give a nicer C++. Capital omega is used to do unbreakable dashes and -.\" therefore won't be available. \*(C` and \*(C' expand to `' in nroff, -.\" nothing in troff, for use with C<>. -.tr \(*W- -.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p' -.ie n \{\ -. ds -- \(*W- -. ds PI pi -. if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch -. if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\" diablo 12 pitch -. ds L" "" -. ds R" "" -. ds C` "" -. ds C' "" -'br\} -.el\{\ -. ds -- \|\(em\| -. ds PI \(*p -. ds L" `` -. ds R" '' -'br\} -.\" -.\" Escape single quotes in literal strings from groff's Unicode transform. -.ie \n(.g .ds Aq \(aq -.el .ds Aq ' -.\" -.\" If the F register is turned on, we'll generate index entries on stderr for -.\" titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and index -.\" entries marked with X<> in POD. Of course, you'll have to process the -.\" output yourself in some meaningful fashion. -.ie \nF \{\ -. de IX -. tm Index:\\$1\t\\n%\t"\\$2" -.. -. nr % 0 -. rr F -.\} -.el \{\ -. de IX -.. -.\} -.\" -.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). -.\" Fear. Run. Save yourself. No user-serviceable parts. -. \" fudge factors for nroff and troff -.if n \{\ -. ds #H 0 -. ds #V .8m -. ds #F .3m -. ds #[ \f1 -. ds #] \fP -.\} -.if t \{\ -. ds #H ((1u-(\\\\n(.fu%2u))*.13m) -. ds #V .6m -. ds #F 0 -. ds #[ \& -. ds #] \& -.\} -. \" simple accents for nroff and troff -.if n \{\ -. ds ' \& -. ds ` \& -. ds ^ \& -. ds , \& -. ds ~ ~ -. ds / -.\} -.if t \{\ -. ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u" -. ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u' -. ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u' -. ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u' -. ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u' -. ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u' -.\} -. \" troff and (daisy-wheel) nroff accents -.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V' -.ds 8 \h'\*(#H'\(*b\h'-\*(#H' -.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#] -.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H' -.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u' -.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#] -.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#] -.ds ae a\h'-(\w'a'u*4/10)'e -.ds Ae A\h'-(\w'A'u*4/10)'E -. \" corrections for vroff -.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u' -.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u' -. \" for low resolution devices (crt and lpr) -.if \n(.H>23 .if \n(.V>19 \ -\{\ -. ds : e -. ds 8 ss -. ds o a -. ds d- d\h'-1'\(ga -. ds D- D\h'-1'\(hy -. ds th \o'bp' -. ds Th \o'LP' -. ds ae ae -. ds Ae AE -.\} -.rm #[ #] #H #V #F C -.\" ======================================================================== -.\" -.IX Title "Catalyst::Helper::Controller::DBIC::API::REST 3" -.TH Catalyst::Helper::Controller::DBIC::API::REST 3 "2009-06-29" "perl v5.10.0" "User Contributed Perl Documentation" -.\" For nroff, turn off justification. Always turn off hyphenation; it makes -.\" way too many mistakes in technical documents. -.if n .ad l -.nh -.SH "VERSION" -.IX Header "VERSION" -Version 0.03 -.SH "NAME" -Catalyst::Helper::Controller::DBIC::API::REST -.SH "SYNOPSIS" -.IX Header "SYNOPSIS" -.Vb 3 -\& $ catalyst.pl myapp -\& $ cd myapp -\& $ script/myapp_create.pl controller API::REST DBIC::API::REST myapp -\& -\& ... -\& -\& package myapp::Controller::API::REST::Producer; -\& -\& use strict; -\& use warnings; -\& use base qw/myapp::ControllerBase::REST/; -\& use JSON::Syck; -\& -\& _\|_PACKAGE_\|_\->config( -\& action => { setup => { PathPart => \*(Aqproducer\*(Aq, Chained => \*(Aq/api/rest/rest_base\*(Aq } }, -\& # define parent chain action and partpath -\& class => \*(AqDB::Producer\*(Aq, # DBIC result class -\& create_requires => [qw/name/], # columns required to create -\& create_allows => [qw//], # additional non\-required columns that create allows -\& update_allows => [qw/name/], # columns that update allows -\& list_returns => [qw/producerid name/], # columns that list returns -\& -\& -\& list_prefetch_allows => [ # every possible prefetch param allowed -\& [qw/cd_to_producer/], { \*(Aqcd_to_producer\*(Aq => [qw//] }, -\& [qw/tags/], { \*(Aqtags\*(Aq => [qw//] }, -\& [qw/tracks/], { \*(Aqtracks\*(Aq => [qw//] }, -\& -\& ], -\& -\& list_ordered_by => [qw/producerid/], # order of generated list -\& list_search_exposes => [ -\& qw/producerid name/, -\& -\& ], # columns that can be searched on via list -\& ); -.Ve -.SH "DESCRIPTION" -.IX Header "DESCRIPTION" -.Vb 3 -\& This creates REST controllers according to the specifications at L -\& and L for all the classes in your Catalyst app. Your -\& application must access your model at myapp::Model::DB. -\& -\& It creates the following files: -\& -\& myapp/lib/myapp/Controller/API.pm -\& myapp/lib/myapp/Controller/API/REST.pm -\& myapp/lib/myapp/Controller/API/REST/* (this is where the individual class controllers are located) -\& myapp/lib/myapp/ControllerBase/REST.pm -.Ve -.Sh "\s-1CONFIGURATION\s0" -.IX Subsection "CONFIGURATION" -.Vb 2 -\& The idea is to make configuration as painless and as automatic as possible, so most -\& of the work has been done for you. -\& -\& There are 8 _\|_PACKAGE_\|_\->config(...) options for L. -\& Here are the defaults. -.Ve -.Sh "create_requires" -.IX Subsection "create_requires" -.Vb 2 -\& All non\-nullable columns that are (1) not autoincrementing, (2) don\*(Aqt have a default value, -\& are neither (3) nextvals, (4) sequences, nor (5) timestamps. -.Ve -.Sh "create_allows" -.IX Subsection "create_allows" -.Vb 2 -\& All nullable columns that are (1) not autoincrementing, (2) don\*(Aqt have a default value, -\& are neither (3) nextvals, (4) sequences, nor (5) timestamps. -.Ve -.Sh "update_allows" -.IX Subsection "update_allows" -.Vb 1 -\& The union of create_requires and create_allows. -.Ve -.Sh "list_returns" -.IX Subsection "list_returns" -.Vb 1 -\& Every column in the class. -.Ve -.Sh "list_prefetch" -.IX Subsection "list_prefetch" -.Vb 1 -\& Nothing is prefetched by default. -.Ve -.Sh "list_prefetch_allows" -.IX Subsection "list_prefetch_allows" -.Vb 4 -\& (1) An arrayref consisting of the name of each of the class\*(Aqs has_many relationships, accompanied -\& by (2) a hashref keyed on the name of that relationship, whose values are the names of its -\& has_many\*(Aqs, e.g., in the "Producer" controller above, a Producer has many cd_to_producers, -\& many tags, and many tracks. None of those classes have any has_many\*(Aqs: -\& -\& list_prefetch_allows => [ -\& [qw/cd_to_producer/], { \*(Aqcd_to_producer\*(Aq => [qw//] }, -\& [qw/tags/], { \*(Aqtags\*(Aq => [qw//] }, -\& [qw/tracks/], { \*(Aqtracks\*(Aq => [qw//] }, -\& ], -.Ve -.Sh "list_ordered_by" -.IX Subsection "list_ordered_by" -.Vb 1 -\& The primary key. -.Ve -.Sh "list_search_exposes" -.IX Subsection "list_search_exposes" -.Vb 3 -\& (1) An arrayref consisting of the name of each column in the class, and (2) a hashref keyed -\& on the name of each of the class\*(Aqs has many relationships, the values of which are all the -\& columns in the corresponding class, e.g., -\& -\& list_search_exposes => [ -\& qw/cdid artist title year/, -\& { \*(Aqcd_to_producer\*(Aq => [qw/cd producer/] }, -\& { \*(Aqtags\*(Aq => [qw/tagid cd tag/] }, -\& { \*(Aqtracks\*(Aq => [qw/trackid cd position title last_updated_on/] }, -\& ], # columns that can be searched on via list -.Ve -.SH "CONTROLLERBASE" -.IX Header "CONTROLLERBASE" -.Vb 4 -\& Following the advice in L, this module creates an -\& intermediate class between your controllers and L. -\& It contains one method, create, which serializes object information and stores it in the stash, -\& which is not the default behavior. -.Ve -.SH "METHODS" -.IX Header "METHODS" -.Sh "mk_compclass" -.IX Subsection "mk_compclass" -This is the meat of the helper. It writes the directory structure if it is not in place, \s-1API\s0.pm, -\&\s-1REST\s0.pm, the controllerbase, and the result class controllers. It replaces \f(CW$helper\fR\->{} values as -it goes through, rendering the files for each. -.SH "AUTHOR" -.IX Header "AUTHOR" -Amiri Barksdale -.SH "SEE ALSO" -.IX Header "SEE ALSO" -.SH "LICENSE" -.IX Header "LICENSE" -This library is free software; you can redistribute it and/or modify -it under the same terms as Perl itself. -.SH "POD ERRORS" -.IX Header "POD ERRORS" -Hey! \fBThe above document had some coding errors, which are explained below:\fR -.IP "Around line 147:" 4 -.IX Item "Around line 147:" -=back without =over diff --git a/inc/Test/More.pm b/inc/Test/More.pm index 937f556..9e98a6a 100644 --- a/inc/Test/More.pm +++ b/inc/Test/More.pm @@ -1,6 +1,5 @@ #line 1 package Test::More; -# $Id$ use 5.006; use strict; @@ -19,7 +18,7 @@ sub _carp { return warn @_, " at $file line $line\n"; } -our $VERSION = '0.86'; +our $VERSION = '0.92'; $VERSION = eval $VERSION; ## no critic (BuiltinFunctions::ProhibitStringyEval) use Test::Builder::Module; @@ -32,12 +31,13 @@ our @EXPORT = qw(ok use_ok require_ok eq_array eq_hash eq_set $TODO plan + done_testing can_ok isa_ok new_ok diag note explain BAIL_OUT ); -#line 158 +#line 163 sub plan { my $tb = Test::More->builder; @@ -71,7 +71,14 @@ sub import_extra { return; } -#line 258 +#line 216 + +sub done_testing { + my $tb = Test::More->builder; + $tb->done_testing(@_); +} + +#line 289 sub ok ($;$) { my( $test, $name ) = @_; @@ -80,7 +87,7 @@ sub ok ($;$) { return $tb->ok( $test, $name ); } -#line 325 +#line 367 sub is ($$;$) { my $tb = Test::More->builder; @@ -96,7 +103,7 @@ sub isnt ($$;$) { *isn't = \&isnt; -#line 369 +#line 411 sub like ($$;$) { my $tb = Test::More->builder; @@ -104,7 +111,7 @@ sub like ($$;$) { return $tb->like(@_); } -#line 384 +#line 426 sub unlike ($$;$) { my $tb = Test::More->builder; @@ -112,7 +119,7 @@ sub unlike ($$;$) { return $tb->unlike(@_); } -#line 423 +#line 471 sub cmp_ok($$$;$) { my $tb = Test::More->builder; @@ -120,7 +127,7 @@ sub cmp_ok($$$;$) { return $tb->cmp_ok(@_); } -#line 458 +#line 506 sub can_ok ($@) { my( $proto, @methods ) = @_; @@ -154,46 +161,53 @@ sub can_ok ($@) { return $ok; } -#line 519 +#line 572 sub isa_ok ($$;$) { my( $object, $class, $obj_name ) = @_; my $tb = Test::More->builder; my $diag; - $obj_name = 'The object' unless defined $obj_name; - my $name = "$obj_name isa $class"; + if( !defined $object ) { + $obj_name = 'The thing' unless defined $obj_name; $diag = "$obj_name isn't defined"; } - elsif( !ref $object ) { - $diag = "$obj_name isn't a reference"; - } else { + my $whatami = ref $object ? 'object' : 'class'; # We can't use UNIVERSAL::isa because we want to honor isa() overrides my( $rslt, $error ) = $tb->_try( sub { $object->isa($class) } ); if($error) { if( $error =~ /^Can't call method "isa" on unblessed reference/ ) { # Its an unblessed reference + $obj_name = 'The reference' unless defined $obj_name; if( !UNIVERSAL::isa( $object, $class ) ) { my $ref = ref $object; $diag = "$obj_name isn't a '$class' it's a '$ref'"; } } + elsif( $error =~ /Can't call method "isa" without a package/ ) { + # It's something that can't even be a class + $diag = "$obj_name isn't a class or reference"; + } else { die <isa on your object and got some weird error. +WHOA! I tried to call ->isa on your $whatami and got some weird error. Here's the error. $error WHOA } } - elsif( !$rslt ) { - my $ref = ref $object; - $diag = "$obj_name isn't a '$class' it's a '$ref'"; + else { + $obj_name = "The $whatami" unless defined $obj_name; + if( !$rslt ) { + my $ref = ref $object; + $diag = "$obj_name isn't a '$class' it's a '$ref'"; + } } } + my $name = "$obj_name isa $class"; my $ok; if($diag) { $ok = $tb->ok( 0, $name ); @@ -206,7 +220,7 @@ WHOA return $ok; } -#line 590 +#line 650 sub new_ok { my $tb = Test::More->builder; @@ -231,7 +245,7 @@ sub new_ok { return $obj; } -#line 630 +#line 690 sub pass (;$) { my $tb = Test::More->builder; @@ -245,7 +259,7 @@ sub fail (;$) { return $tb->ok( 0, @_ ); } -#line 693 +#line 753 sub use_ok ($;@) { my( $module, @imports ) = @_; @@ -307,7 +321,7 @@ sub _eval { return( $eval_result, $eval_error ); } -#line 762 +#line 822 sub require_ok ($) { my($module) = shift; @@ -351,7 +365,7 @@ sub _is_module_name { return $module =~ /^[a-zA-Z]\w*$/ ? 1 : 0; } -#line 839 +#line 899 our( @Data_Stack, %Refs_Seen ); my $DNE = bless [], 'Does::Not::Exist'; @@ -458,7 +472,7 @@ sub _type { return ''; } -#line 999 +#line 1059 sub diag { return Test::More->builder->diag(@_); @@ -468,13 +482,13 @@ sub note { return Test::More->builder->note(@_); } -#line 1025 +#line 1085 sub explain { return Test::More->builder->explain(@_); } -#line 1091 +#line 1151 ## no critic (Subroutines::RequireFinalReturn) sub skip { @@ -502,7 +516,7 @@ sub skip { last SKIP; } -#line 1178 +#line 1238 sub todo_skip { my( $why, $how_many ) = @_; @@ -523,7 +537,7 @@ sub todo_skip { last TODO; } -#line 1231 +#line 1293 sub BAIL_OUT { my $reason = shift; @@ -532,7 +546,7 @@ sub BAIL_OUT { $tb->BAIL_OUT($reason); } -#line 1270 +#line 1332 #'# sub eq_array { @@ -590,6 +604,10 @@ sub _deep_check { if( defined $e1 xor defined $e2 ) { $ok = 0; } + elsif( !defined $e1 and !defined $e2 ) { + # Shortcut if they're both defined. + $ok = 1; + } elsif( _dne($e1) xor _dne($e2) ) { $ok = 0; } @@ -654,7 +672,7 @@ WHOA } } -#line 1399 +#line 1465 sub eq_hash { local @Data_Stack = (); @@ -687,7 +705,7 @@ sub _eq_hash { return $ok; } -#line 1456 +#line 1522 sub eq_set { my( $a1, $a2 ) = @_; @@ -712,6 +730,6 @@ sub eq_set { ); } -#line 1645 +#line 1735 1;