diff options
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/GenCAPI.pl | 12 | ||||
| -rw-r--r-- | win32/Makefile | 7 | ||||
| -rw-r--r-- | win32/config_H.bc | 16 | ||||
| -rw-r--r-- | win32/config_H.gc | 16 | ||||
| -rw-r--r-- | win32/config_H.vc | 16 | ||||
| -rw-r--r-- | win32/makefile.mk | 11 |
6 files changed, 46 insertions, 32 deletions
diff --git a/win32/GenCAPI.pl b/win32/GenCAPI.pl index 33ffe9446d..4c3947fec5 100644 --- a/win32/GenCAPI.pl +++ b/win32/GenCAPI.pl @@ -141,10 +141,14 @@ while () { @args = split(',', $args); if ($args[$#args] =~ /\s*\.\.\.\s*/) { if(($name eq "croak") or ($name eq "deb") or ($name eq "die") - or ($name eq "form") or ($name eq "warn")) { + or ($name eq "form") or ($name eq "warn") + or ($name eq "warner")) { print OUTFILE "\n#ifdef $name" . "_defined" unless ($separateObj == 0); - $args[0] =~ /(\w+)\W*$/; - $arg = $1; + for (@args) { $_ = $1 if /(\w+)\W*$/; } + $arg = $args[$#args-1]; + my $start = ''; + $start = join(', ',@args[0 .. ($#args - 2)]) if @args > 2; + $start .= ', ' if $start; print OUTFILE <<ENDCODE; #undef $name @@ -157,7 +161,7 @@ extern "C" $type $funcName ($args) pmsg = pPerl->Perl_mess($arg, &args); New(0, pstr, strlen(pmsg)+1, char); strcpy(pstr, pmsg); -$return pPerl->Perl_$name(pstr); +$return pPerl->Perl_$name($start pstr); va_end(args); } ENDCODE diff --git a/win32/Makefile b/win32/Makefile index b98d1f9607..eae991f762 100644 --- a/win32/Makefile +++ b/win32/Makefile @@ -25,7 +25,7 @@ INST_TOP = $(INST_DRV)\perl # versioned installation can be obtained by setting INST_TOP above to a # path that includes an arbitrary version string. # -INST_VER = \5.00502 +INST_VER = \5.00551 # # uncomment to enable threads-capabilities @@ -91,6 +91,8 @@ INST_VER = \5.00502 # # set the install locations of the compiler include/libraries +# Some versions of Visual C don't define MSVCDIR in the environment, +# so you may have to set CCHOME explicitly. # #CCHOME = f:\msvc20 CCHOME = $(MSVCDIR) @@ -355,6 +357,7 @@ MICROCORE_SRC = \ ..\taint.c \ ..\toke.c \ ..\universal.c \ + ..\utf8.c \ ..\util.c !IF "$(PERL_MALLOC)" == "define" @@ -428,7 +431,9 @@ CORE_NOCFG_H = \ ..\sv.h \ ..\thread.h \ ..\unixish.h \ + ..\utf8.h \ ..\util.h \ + ..\warning.h \ ..\XSUB.h \ ..\EXTERN.h \ ..\perlvars.h \ diff --git a/win32/config_H.bc b/win32/config_H.bc index c42b961470..71ebeef71e 100644 --- a/win32/config_H.bc +++ b/win32/config_H.bc @@ -34,8 +34,8 @@ * This symbol is the filename expanded version of the BIN symbol, for * programs that do not want to deal with that at run-time. */ -#define BIN "c:\\perl\\5.00502\\bin\\MSWin32-x86" /**/ -#define BIN_EXP "c:\\perl\\5.00502\\bin\\MSWin32-x86" /**/ +#define BIN "c:\\perl\\5.00551\\bin\\MSWin32-x86" /**/ +#define BIN_EXP "c:\\perl\\5.00551\\bin\\MSWin32-x86" /**/ /* CPPSTDIN: * This symbol contains the first part of the string which will invoke @@ -1829,7 +1829,7 @@ * This symbol contains the ~name expanded version of ARCHLIB, to be used * in programs that are not prepared to deal with ~ expansion at run-time. */ -#define ARCHLIB "c:\\perl\\5.00502\\lib\\MSWin32-x86" /**/ +#define ARCHLIB "c:\\perl\\5.00551\\lib\\MSWin32-x86" /**/ /*#define ARCHLIB_EXP "" /**/ /* DLSYM_NEEDS_UNDERSCORE: @@ -1875,8 +1875,8 @@ * This symbol contains the ~name expanded version of PRIVLIB, to be used * in programs that are not prepared to deal with ~ expansion at run-time. */ -#define PRIVLIB "c:\\perl\\5.00502\\lib" /**/ -#define PRIVLIB_EXP (win32_get_privlib("5.00502")) /**/ +#define PRIVLIB "c:\\perl\\5.00551\\lib" /**/ +#define PRIVLIB_EXP (win32_get_privlib("5.00551")) /**/ /* SITEARCH: * This symbol contains the name of the private library for this package. @@ -1891,7 +1891,7 @@ * This symbol contains the ~name expanded version of SITEARCH, to be used * in programs that are not prepared to deal with ~ expansion at run-time. */ -#define SITEARCH "c:\\perl\\site\\5.00502\\lib\\MSWin32-x86" /**/ +#define SITEARCH "c:\\perl\\site\\5.00551\\lib\\MSWin32-x86" /**/ /*#define SITEARCH_EXP "" /**/ /* SITELIB: @@ -1907,8 +1907,8 @@ * This symbol contains the ~name expanded version of SITELIB, to be used * in programs that are not prepared to deal with ~ expansion at run-time. */ -#define SITELIB "c:\\perl\\site\\5.00502\\lib" /**/ -#define SITELIB_EXP (win32_get_sitelib("5.00502")) /**/ +#define SITELIB "c:\\perl\\site\\5.00551\\lib" /**/ +#define SITELIB_EXP (win32_get_sitelib("5.00551")) /**/ /* STARTPERL: * This variable contains the string to put in front of a perl diff --git a/win32/config_H.gc b/win32/config_H.gc index 97a18a6160..e158822388 100644 --- a/win32/config_H.gc +++ b/win32/config_H.gc @@ -34,8 +34,8 @@ * This symbol is the filename expanded version of the BIN symbol, for * programs that do not want to deal with that at run-time. */ -#define BIN "c:\\perl\\5.00502\\bin\\MSWin32-x86" /**/ -#define BIN_EXP "c:\\perl\\5.00502\\bin\\MSWin32-x86" /**/ +#define BIN "c:\\perl\\5.00551\\bin\\MSWin32-x86" /**/ +#define BIN_EXP "c:\\perl\\5.00551\\bin\\MSWin32-x86" /**/ /* CPPSTDIN: * This symbol contains the first part of the string which will invoke @@ -1829,7 +1829,7 @@ * This symbol contains the ~name expanded version of ARCHLIB, to be used * in programs that are not prepared to deal with ~ expansion at run-time. */ -#define ARCHLIB "c:\\perl\\5.00502\\lib\\MSWin32-x86" /**/ +#define ARCHLIB "c:\\perl\\5.00551\\lib\\MSWin32-x86" /**/ /*#define ARCHLIB_EXP "" /**/ /* DLSYM_NEEDS_UNDERSCORE: @@ -1875,8 +1875,8 @@ * This symbol contains the ~name expanded version of PRIVLIB, to be used * in programs that are not prepared to deal with ~ expansion at run-time. */ -#define PRIVLIB "c:\\perl\\5.00502\\lib" /**/ -#define PRIVLIB_EXP (win32_get_privlib("5.00502")) /**/ +#define PRIVLIB "c:\\perl\\5.00551\\lib" /**/ +#define PRIVLIB_EXP (win32_get_privlib("5.00551")) /**/ /* SITEARCH: * This symbol contains the name of the private library for this package. @@ -1891,7 +1891,7 @@ * This symbol contains the ~name expanded version of SITEARCH, to be used * in programs that are not prepared to deal with ~ expansion at run-time. */ -#define SITEARCH "c:\\perl\\site\\5.00502\\lib\\MSWin32-x86" /**/ +#define SITEARCH "c:\\perl\\site\\5.00551\\lib\\MSWin32-x86" /**/ /*#define SITEARCH_EXP "" /**/ /* SITELIB: @@ -1907,8 +1907,8 @@ * This symbol contains the ~name expanded version of SITELIB, to be used * in programs that are not prepared to deal with ~ expansion at run-time. */ -#define SITELIB "c:\\perl\\site\\5.00502\\lib" /**/ -#define SITELIB_EXP (win32_get_sitelib("5.00502")) /**/ +#define SITELIB "c:\\perl\\site\\5.00551\\lib" /**/ +#define SITELIB_EXP (win32_get_sitelib("5.00551")) /**/ /* STARTPERL: * This variable contains the string to put in front of a perl diff --git a/win32/config_H.vc b/win32/config_H.vc index 5311236a75..a816261724 100644 --- a/win32/config_H.vc +++ b/win32/config_H.vc @@ -34,8 +34,8 @@ * This symbol is the filename expanded version of the BIN symbol, for * programs that do not want to deal with that at run-time. */ -#define BIN "c:\\perl\\5.00502\\bin\\MSWin32-x86" /**/ -#define BIN_EXP "c:\\perl\\5.00502\\bin\\MSWin32-x86" /**/ +#define BIN "c:\\perl\\5.00551\\bin\\MSWin32-x86" /**/ +#define BIN_EXP "c:\\perl\\5.00551\\bin\\MSWin32-x86" /**/ /* CPPSTDIN: * This symbol contains the first part of the string which will invoke @@ -1829,7 +1829,7 @@ * This symbol contains the ~name expanded version of ARCHLIB, to be used * in programs that are not prepared to deal with ~ expansion at run-time. */ -#define ARCHLIB "c:\\perl\\5.00502\\lib\\MSWin32-x86" /**/ +#define ARCHLIB "c:\\perl\\5.00551\\lib\\MSWin32-x86" /**/ /*#define ARCHLIB_EXP "" /**/ /* DLSYM_NEEDS_UNDERSCORE: @@ -1875,8 +1875,8 @@ * This symbol contains the ~name expanded version of PRIVLIB, to be used * in programs that are not prepared to deal with ~ expansion at run-time. */ -#define PRIVLIB "c:\\perl\\5.00502\\lib" /**/ -#define PRIVLIB_EXP (win32_get_privlib("5.00502")) /**/ +#define PRIVLIB "c:\\perl\\5.00551\\lib" /**/ +#define PRIVLIB_EXP (win32_get_privlib("5.00551")) /**/ /* SITEARCH: * This symbol contains the name of the private library for this package. @@ -1891,7 +1891,7 @@ * This symbol contains the ~name expanded version of SITEARCH, to be used * in programs that are not prepared to deal with ~ expansion at run-time. */ -#define SITEARCH "c:\\perl\\site\\5.00502\\lib\\MSWin32-x86" /**/ +#define SITEARCH "c:\\perl\\site\\5.00551\\lib\\MSWin32-x86" /**/ /*#define SITEARCH_EXP "" /**/ /* SITELIB: @@ -1907,8 +1907,8 @@ * This symbol contains the ~name expanded version of SITELIB, to be used * in programs that are not prepared to deal with ~ expansion at run-time. */ -#define SITELIB "c:\\perl\\site\\5.00502\\lib" /**/ -#define SITELIB_EXP (win32_get_sitelib("5.00502")) /**/ +#define SITELIB "c:\\perl\\site\\5.00551\\lib" /**/ +#define SITELIB_EXP (win32_get_sitelib("5.00551")) /**/ /* STARTPERL: * This variable contains the string to put in front of a perl diff --git a/win32/makefile.mk b/win32/makefile.mk index 3efe59c929..12dbd22723 100644 --- a/win32/makefile.mk +++ b/win32/makefile.mk @@ -29,7 +29,7 @@ INST_TOP *= $(INST_DRV)\perl # versioned installation can be obtained by setting INST_TOP above to a # path that includes an arbitrary version string. # -INST_VER *= \5.00502 +INST_VER *= \5.00551 # # uncomment to enable threads-capabilities @@ -99,9 +99,11 @@ CCTYPE *= BORLAND # # set the install locations of the compiler include/libraries +# Some versions of Visual C don't define MSVCDIR in the environment, +# so you may have to set CCHOME explicitly. # -#CCHOME *= f:\msdev\vc CCHOME *= C:\bc5 +#CCHOME *= $(MSVCDIR) #CCHOME *= D:\packages\mingw32 CCINCDIR *= $(CCHOME)\include CCLIBDIR *= $(CCHOME)\lib @@ -199,7 +201,7 @@ OPTIMIZE = -O2 $(RUNTIME) LINK_DBG = .ENDIF -CFLAGS = -w -d -tWM -tWD $(INCLUDES) $(DEFINES) $(LOCDEFS) \ +CFLAGS = -w -g0 -d -tWM -tWD $(INCLUDES) $(DEFINES) $(LOCDEFS) \ $(PCHFLAGS) $(OPTIMIZE) LINK_FLAGS = $(LINK_DBG) -L$(CCLIBDIR) $(EXTRALIBDIRS:^"-L") OBJOUT_FLAG = -o @@ -472,6 +474,7 @@ MICROCORE_SRC = \ ..\taint.c \ ..\toke.c \ ..\universal.c \ + ..\utf8.c \ ..\util.c .IF "$(PERL_MALLOC)" == "define" @@ -545,7 +548,9 @@ CORE_NOCFG_H = \ ..\sv.h \ ..\thread.h \ ..\unixish.h \ + ..\utf8.h \ ..\util.h \ + ..\warning.h \ ..\XSUB.h \ ..\EXTERN.h \ ..\perlvars.h \ |