From: Gurusamy Sarathy Date: Tue, 21 Jul 1998 05:46:59 +0000 (+0000) Subject: change case of PERL_OBJECT filenames, consistent with the rest X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=6de196ee48b72f30391cfba66f39b3056b7ed095;p=p5sagit%2Fp5-mst-13.2.git change case of PERL_OBJECT filenames, consistent with the rest p4raw-id: //depot/perl@1609 --- diff --git a/MANIFEST b/MANIFEST index 21c2f94..aa8154a 100644 --- a/MANIFEST +++ b/MANIFEST @@ -12,7 +12,7 @@ INSTALL Detailed installation instructions INTERN.h Included before domestic .h files MANIFEST This list of files Makefile.SH A script that generates Makefile -ObjXSub.h Scoping macros for Perl Object in extensions +objXSUB.h Scoping macros for Perl Object in extensions Policy_sh.SH Hold site-wide preferences between Configure runs. Porting/Contract Social contract for contributed modules in Perl core Porting/Glossary Glossary of config.sh variables @@ -38,7 +38,7 @@ README.vms Notes about VMS port README.win32 Notes about Win32 port Todo The Wishlist Todo-5.005 What needs doing before 5.005 release -XSLock.h Include file for extensions built with PERL_OBJECT defined +XSlock.h Include file for extensions built with PERL_OBJECT defined XSUB.h Include file for extension subroutines av.c Array value code av.h Array value header diff --git a/XSUB.h b/XSUB.h index 48cf876..dc805d8 100644 --- a/XSUB.h +++ b/XSUB.h @@ -80,14 +80,14 @@ #endif #ifdef PERL_OBJECT -#include "ObjXSub.h" +#include "objXSUB.h" #ifndef NO_XSLOCKS #ifdef WIN32 -#include "XSLock.h" +#include "XSlock.h" #endif /* WIN32 */ #endif /* NO_XSLOCKS */ #else #ifdef PERL_CAPI -#include "PerlCAPI.h" +#include "perlCAPI.h" #endif #endif /* PERL_OBJECT */ diff --git a/XSLock.h b/XSlock.h similarity index 93% rename from XSLock.h rename to XSlock.h index 43c6109..8fb0ce4 100644 --- a/XSLock.h +++ b/XSlock.h @@ -1,5 +1,5 @@ -#ifndef __XSLock_h__ -#define __XSLock_h__ +#ifndef __XSlock_h__ +#define __XSlock_h__ class XSLockManager { diff --git a/lib/ExtUtils/MM_Win32.pm b/lib/ExtUtils/MM_Win32.pm index 7ec474e..4b478bb 100644 --- a/lib/ExtUtils/MM_Win32.pm +++ b/lib/ExtUtils/MM_Win32.pm @@ -452,7 +452,7 @@ sub perl_archive my ($self) = @_; if($OBJ) { if ($self->{CAPI} eq 'TRUE') { - return '$(PERL_INC)\PerlCAPI$(LIB_EXT)'; + return '$(PERL_INC)\perlCAPI$(LIB_EXT)'; } else { return '$(PERL_INC)\perlcore$(LIB_EXT)'; diff --git a/ObjXSub.h b/objXSUB.h similarity index 99% rename from ObjXSub.h rename to objXSUB.h index 5e768d6..d548d20 100644 --- a/ObjXSub.h +++ b/objXSUB.h @@ -1,5 +1,5 @@ -#ifndef __ObjXSub_h__ -#define __ObjXSub_h__ +#ifndef __objXSUB_h__ +#define __objXSUB_h__ /* Varibles */ @@ -2051,5 +2051,5 @@ #define NtGetDebugScriptStr pPerl->NtGetDebugScriptStr #endif /* WIN32 */ -#endif /* __ObjXSub_h__ */ +#endif /* __objXSUB_h__ */ diff --git a/perl.h b/perl.h index f1f22f0..e2b34bc 100644 --- a/perl.h +++ b/perl.h @@ -75,11 +75,11 @@ pointer to the PERL_OBJECT. This pointer type is CPerlObj*. This is made transparent to extension developers by the following macros: #define var pPerl->Perl_var #define func pPerl->Perl_func - * these are done in ObjXSub.h + * these are done in objXSUB.h This requires that the extension be compiled as C++, which means that the code must be ANSI C and not K&R C. For K&R extensions, please see the C API notes located in Win32/GenCAPI.pl. This script -creates a PerlCAPI.lib that provides a K & R compatible C interface +creates a perlCAPI.lib that provides a K & R compatible C interface to the PERL_OBJECT. 2. Local variables and functions cannot have the same name as perl's variables or functions since the macros will redefine these. Look for diff --git a/win32/GenCAPI.pl b/win32/GenCAPI.pl index 79e0105..09827f2 100644 --- a/win32/GenCAPI.pl +++ b/win32/GenCAPI.pl @@ -1,9 +1,9 @@ # creates a C API file from proto.h # takes one argument, the path to lib/CORE directory. -# creates 2 files: "PerlCAPI.cpp" and "PerlCAPI.h". +# creates 2 files: "perlCAPI.cpp" and "perlCAPI.h". -my $hdrfile = "$ARGV[0]\\PerlCAPI.h"; +my $hdrfile = "$ARGV[0]\\perlCAPI.h"; my $infile = '..\\proto.h'; my $embedfile = '..\\embed.h'; my $separateObj = 0; @@ -81,8 +81,8 @@ if (!open(INFILE, "<$infile")) { return 1; } -if (!open(OUTFILE, ">PerlCAPI.cpp")) { - print "open of PerlCAPI.cpp failed: $!\n"; +if (!open(OUTFILE, ">perlCAPI.cpp")) { + print "open of perlCAPI.cpp failed: $!\n"; return 1; } diff --git a/win32/Makefile b/win32/Makefile index 4db1e36..6e79984 100644 --- a/win32/Makefile +++ b/win32/Makefile @@ -267,7 +267,7 @@ EXTUTILSDIR = $(LIBDIR)\extutils !IF "$(OBJECT)" == "-DPERL_OBJECT" PERLIMPLIB = ..\perlcore.lib PERLDLL = ..\perlcore.dll -CAPILIB = $(COREDIR)\PerlCAPI.lib +CAPILIB = $(COREDIR)\perlCAPI.lib !ELSE PERLIMPLIB = ..\perl.lib PERLDLL = ..\perl.dll @@ -724,15 +724,15 @@ $(DYNALOADER).c: $(MINIPERL) $(EXTDIR)\DynaLoader\dl_win32.xs $(CONFIGPM) cd ..\..\win32 !IF "$(OBJECT)" == "-DPERL_OBJECT" -PerlCAPI.cpp : $(MINIPERL) +perlCAPI.cpp : $(MINIPERL) $(MINIPERL) GenCAPI.pl $(COREDIR) -PerlCAPI$(o) : PerlCAPI.cpp +perlCAPI$(o) : perlCAPI.cpp $(CC) $(CFLAGS_O) $(RUNTIME) -UPERLDLL -c \ - $(OBJOUT_FLAG)PerlCAPI$(o) PerlCAPI.cpp + $(OBJOUT_FLAG)perlCAPI$(o) perlCAPI.cpp -$(CAPILIB) : PerlCAPI.cpp PerlCAPI$(o) - lib /OUT:$(CAPILIB) PerlCAPI$(o) +$(CAPILIB) : perlCAPI.cpp perlCAPI$(o) + lib /OUT:$(CAPILIB) perlCAPI$(o) !ENDIF $(EXTDIR)\DynaLoader\dl_win32.xs: dl_win32.xs @@ -912,7 +912,7 @@ clean : -@erase perlmain$(o) -@erase config.w32 -@erase /f config.h - -@erase PerlCAPI.cpp + -@erase perlCAPI.cpp -@erase $(GLOBEXE) -@erase $(PERLEXE) -@erase $(PERLDLL) diff --git a/win32/makefile.mk b/win32/makefile.mk index d1ab241..f93807d 100644 --- a/win32/makefile.mk +++ b/win32/makefile.mk @@ -425,7 +425,7 @@ PERL95EXE = ..\perl95.exe .IF "$(OBJECT)" == "-DPERL_OBJECT" PERLIMPLIB *= ..\perlcore$(a) PERLDLL = ..\perlcore.dll -CAPILIB = $(COREDIR)\PerlCAPI$(a) +CAPILIB = $(COREDIR)\perlCAPI$(a) .ELSE PERLIMPLIB *= ..\perl$(a) PERLDLL = ..\perl.dll @@ -889,24 +889,24 @@ $(DYNALOADER).c: $(MINIPERL) $(EXTDIR)\DynaLoader\dl_win32.xs $(CONFIGPM) .IF "$(OBJECT)" == "-DPERL_OBJECT" -PerlCAPI.cpp : $(MINIPERL) +perlCAPI.cpp : $(MINIPERL) $(MINIPERL) GenCAPI.pl $(COREDIR) -PerlCAPI$(o) : PerlCAPI.cpp +perlCAPI$(o) : perlCAPI.cpp .IF "$(CCTYPE)" == "BORLAND" - $(CC) $(CFLAGS_O) -c $(OBJOUT_FLAG)PerlCAPI$(o) PerlCAPI.cpp + $(CC) $(CFLAGS_O) -c $(OBJOUT_FLAG)perlCAPI$(o) perlCAPI.cpp .ELIF "$(CCTYPE)" == "GCC" - $(CC) $(CFLAGS_O) -c $(OBJOUT_FLAG)PerlCAPI$(o) PerlCAPI.cpp + $(CC) $(CFLAGS_O) -c $(OBJOUT_FLAG)perlCAPI$(o) perlCAPI.cpp .ELSE $(CC) $(CFLAGS_O) $(RUNTIME) -UPERLDLL -c \ - $(OBJOUT_FLAG)PerlCAPI$(o) PerlCAPI.cpp + $(OBJOUT_FLAG)perlCAPI$(o) perlCAPI.cpp .ENDIF -$(CAPILIB) : PerlCAPI.cpp PerlCAPI$(o) +$(CAPILIB) : perlCAPI.cpp perlCAPI$(o) .IF "$(CCTYPE)" == "BORLAND" - $(LIB32) $(LIBOUT_FLAG)$(CAPILIB) +PerlCAPI$(o) + $(LIB32) $(LIBOUT_FLAG)$(CAPILIB) +perlCAPI$(o) .ELSE - $(LIB32) $(LIBOUT_FLAG)$(CAPILIB) PerlCAPI$(o) + $(LIB32) $(LIBOUT_FLAG)$(CAPILIB) perlCAPI$(o) .ENDIF .ENDIF @@ -1068,7 +1068,7 @@ clean : -@erase $(MINIPERL) -@erase perlglob$(o) -@erase perlmain$(o) - -@erase PerlCAPI.cpp + -@erase perlCAPI.cpp -@erase config.w32 -@erase /f config.h -@erase $(GLOBEXE)