OS/2 build

Message-ID: <20011219024541.A29803@math.ohio-state.edu>        

(skipped the t/TEST change)

p4raw-id: //depot/perl@13805

4 files changed, 14 insertions, 240 deletions

diff --git a/os2/Makefile.SHs b/os2/Makefile.SHs
index 2f697ed76e..9c44823a21 100644
--- a/os2/Makefile.SHs
+++ b/os2/Makefile.SHs
@@ -57,8 +57,9 @@ AOUT_EXTRA_LIBS	= $aout_extra_libs
 $spitshell >>Makefile <<'!NO!SUBS!'
 $(LIBPERL): perl.imp $(PERL_DLL) perl5.def libperl_override.lib
 	emximp -o $(LIBPERL) perl.imp
+	cp $(LIBPERL) perl.lib
 
-libperl_override.imp: os2/os2add.sym
+libperl_override.imp: os2/os2add.sym miniperl
 	./miniperl -wnle 'print "$$_\t$(PERL_DLL_BASE)\t$$_\t?"' os2/os2add.sym > tmp.imp
 	echo	'strdup	$(PERL_DLL_BASE)	Perl_strdup	?' >> tmp.imp
 	echo	'putenv	$(PERL_DLL_BASE)	Perl_putenv	?' >> tmp.imp
@@ -198,6 +199,7 @@ $(DYNALOADER_OBJ) : $(DYNALOADER)
 $(AOUT_LIBPERL) : $(aout_obj) perl$(AOUT_OBJ_EXT)
 	rm -f $@
 	$(AOUT_AR) rcu $@ perl$(AOUT_OBJ_EXT) $(aout_obj)
+	cp $@ perl.a
 
 .c$(AOUT_OBJ_EXT):
 	$(AOUT_CCCMD) $(PLDLFLAGS) -c $*.c
@@ -219,7 +221,10 @@ miniperl_: $& miniperlmain$(AOUT_OBJ_EXT) $(AOUT_LIBPERL) opmini$(AOUT_OBJ_EXT)
 
 # Forking statically loaded perl
 
-perl_$(EXE_EXT) perl_: $& aout_perlmain$(AOUT_OBJ_EXT) $(AOUT_LIBPERL) $(AOUT_DYNALOADER) $(aout_static_ext) ext.libs
+# Need a miniperl_ dependency, since $(AOUT_DYNALOADER) is build via implicit
+# rules, thus would not rebuild miniperl_ via an explicit rule
+
+perl_$(EXE_EXT) perl_: $& miniperl_ aout_perlmain$(AOUT_OBJ_EXT) $(AOUT_LIBPERL) $(AOUT_DYNALOADER) $(aout_static_ext) ext.libs
 	$(CC) $(AOUT_CLDFLAGS) $(CCDLFLAGS) -o perl_ aout_perlmain$(AOUT_OBJ_EXT) $(AOUT_DYNALOADER) $(aout_static_ext) $(AOUT_LIBPERL) `cat ext.libs` $(libs)
 
 # Remove -Zcrtdll
@@ -448,7 +453,7 @@ lib/auto/*/%.a : ext/%/Makefile.aout
 	@cd ext/$(basename $(notdir $@)) ; make -f Makefile.aout config || echo "\$(MAKE) config failed, continuing anyway..."
 	cd ext/$(basename $(notdir $@)) ; make -f Makefile.aout LINKTYPE=static CCCDLFLAGS=
 
-ext/%/Makefile.aout : miniperl_ \$(_preplibrary) \$(AOUT_EXTENSIONS_FORCE)
+ext/%/Makefile.aout : miniperl_ $(_preplibrary) $(AOUT_EXTENSIONS_FORCE)
 	cd $(dir $@) ; ../../miniperl_ -I ../../lib Makefile.PL FIRST_MAKEFILE=Makefile.aout INSTALLDIRS=perl 
 
 !NO!SUBS!
diff --git a/os2/OS2/REXX/DLL/Makefile.PL b/os2/OS2/REXX/DLL/Makefile.PL
index fb91688ce7..6756402c2f 100644
--- a/os2/OS2/REXX/DLL/Makefile.PL
+++ b/os2/OS2/REXX/DLL/Makefile.PL
@@ -2,7 +2,7 @@ use ExtUtils::MakeMaker;
 
 WriteMakefile(
 	      NAME => 'OS2::DLL',
-	      VERSION => '0.01',
+	      VERSION_FROM => 'DLL.pm',
 	      MAN3PODS 	=> {}, 	# Pods will be built by installman.
 	      XSPROTOARG => '-noprototypes',
 	      PERL_MALLOC_OK => 1,
diff --git a/os2/os2.c b/os2/os2.c
index 39463e6cb6..655e613a92 100644
--- a/os2/os2.c
+++ b/os2/os2.c
@@ -618,14 +618,14 @@ do_spawn_ve(pTHX_ SV *really, U32 flag, U32 execf, char *inicmd, U32 addflag)
 	if (strEQ(PL_Argv[0],"/bin/sh")) 
 	    PL_Argv[0] = PL_sh_path;
 
-	if (PL_Argv[0][0] != '/' && PL_Argv[0][0] != '\\'
-	    && !(PL_Argv[0][0] && PL_Argv[0][1] == ':' 
-		 && (PL_Argv[0][2] == '/' || PL_Argv[0][2] != '\\'))
-	    ) /* will spawnvp use PATH? */
-	    TAINT_ENV();	/* testing IFS here is overkill, probably */
 	/* We should check PERL_SH* and PERLLIB_* as well? */
 	if (!really || !*(tmps = SvPV(really, n_a)))
 	    tmps = PL_Argv[0];
+	if (tmps[0] != '/' && tmps[0] != '\\'
+	    && !(tmps[0] && tmps[1] == ':' 
+		 && (tmps[2] == '/' || tmps[2] != '\\'))
+	    ) /* will spawnvp use PATH? */
+	    TAINT_ENV();	/* testing IFS here is overkill, probably */
 
       reread:
 	force_shell = 0;
diff --git a/os2/perlrexx.c b/os2/perlrexx.c
index 5706b18969..fbeb493e95 100644
--- a/os2/perlrexx.c
+++ b/os2/perlrexx.c
@@ -320,234 +320,3 @@ PERLDROPALLEXIT(PCSZ name, LONG rargc, const RXSTRING *rargv, PCSZ queuename, PR
    retstr->strlength = 0;
    return 0;
 }
-#define INCL_DOSPROCESS
-#define INCL_DOSSEMAPHORES
-#define INCL_DOSMODULEMGR
-#define INCL_DOSMISC
-#define INCL_DOSEXCEPTIONS
-#define INCL_DOSERRORS
-#define INCL_REXXSAA
-#include <os2.h>
-
-/*
- * "The Road goes ever on and on, down from the door where it began."
- */
-
-#ifdef OEMVS
-#ifdef MYMALLOC
-/* sbrk is limited to first heap segement so make it big */
-#pragma runopts(HEAP(8M,500K,ANYWHERE,KEEP,8K,4K) STACK(,,ANY,) ALL31(ON))
-#else
-#pragma runopts(HEAP(2M,500K,ANYWHERE,KEEP,8K,4K) STACK(,,ANY,) ALL31(ON))
-#endif
-#endif
-
-
-#include "EXTERN.h"
-#include "perl.h"
-
-static void xs_init (pTHX);
-static PerlInterpreter *my_perl;
-
-#if defined (__MINT__) || defined (atarist)
-/* The Atari operating system doesn't have a dynamic stack.  The
-   stack size is determined from this value.  */
-long _stksize = 64 * 1024;
-#endif
-
-/* Register any extra external extensions */
-
-/* Do not delete this line--writemain depends on it */
-EXTERN_C void boot_DynaLoader (pTHX_ CV* cv);
-
-static void
-xs_init(pTHX)
-{
-    char *file = __FILE__;
-    dXSUB_SYS;
-        newXS("DynaLoader::boot_DynaLoader", boot_DynaLoader, file);
-}
-
-int perlos2_is_inited;
-
-static void
-init_perlos2(void)
-{
-/*    static char *env[1] = {NULL};	*/
-
-    Perl_OS2_init3(0, 0, 0);
-}
-
-static int
-init_perl(int doparse)
-{
-    int exitstatus;
-    char *argv[3] = {"perl_in_REXX", "-e", ""};
-
-    if (!perlos2_is_inited) {
-	perlos2_is_inited = 1;
-	init_perlos2();
-    }
-    if (my_perl)
-	return 1;
-    if (!PL_do_undump) {
-	my_perl = perl_alloc();
-	if (!my_perl)
-	    return 0;
-	perl_construct(my_perl);
-	PL_perl_destruct_level = 1;
-    }
-    if (!doparse)
-        return 1;
-    exitstatus = perl_parse(my_perl, xs_init, 3, argv, (char **)NULL);
-    return !exitstatus;
-}
-
-/* The REXX-callable entrypoints ... */
-
-ULONG PERL (PCSZ name, LONG rargc, const RXSTRING *rargv,
-                    PCSZ queuename, PRXSTRING retstr)
-{
-    int exitstatus;
-    char buf[256];
-    char *argv[3] = {"perl_from_REXX", "-e", buf};
-    ULONG ret;
-
-    if (rargc != 1) {
-	sprintf(retstr->strptr, "one argument expected, got %ld", rargc);
-	retstr->strlength = strlen (retstr->strptr);
-	return 1;
-    }
-    if (rargv[0].strlength >= sizeof(buf)) {
-	sprintf(retstr->strptr,
-		"length of the argument %ld exceeds the maximum %ld",
-		rargv[0].strlength, (long)sizeof(buf) - 1);
-	retstr->strlength = strlen (retstr->strptr);
-	return 1;
-    }
-
-    if (!init_perl(0))
-	return 1;
-
-    memcpy(buf, rargv[0].strptr, rargv[0].strlength);
-    buf[rargv[0].strlength] = 0;
-    
-    exitstatus = perl_parse(my_perl, xs_init, 3, argv, (char **)NULL);
-    if (!exitstatus) {
-	exitstatus = perl_run(my_perl);
-    }
-
-    perl_destruct(my_perl);
-    perl_free(my_perl);
-    my_perl = 0;
-
-    if (exitstatus)
-	ret = 1;
-    else {
-	ret = 0;
-	sprintf(retstr->strptr, "%s", "ok");
-	retstr->strlength = strlen (retstr->strptr);
-    }
-    PERL_SYS_TERM1(0);
-    return ret;
-}
-
-ULONG PERLEXIT (PCSZ name, LONG rargc, const RXSTRING *rargv,
-                    PCSZ queuename, PRXSTRING retstr)
-{
-    if (rargc != 0) {
-	sprintf(retstr->strptr, "no arguments expected, got %ld", rargc);
-	retstr->strlength = strlen (retstr->strptr);
-	return 1;
-    }
-    PERL_SYS_TERM1(0);
-    return 0;
-}
-
-ULONG PERLTERM (PCSZ name, LONG rargc, const RXSTRING *rargv,
-                    PCSZ queuename, PRXSTRING retstr)
-{
-    if (rargc != 0) {
-	sprintf(retstr->strptr, "no arguments expected, got %ld", rargc);
-	retstr->strlength = strlen (retstr->strptr);
-	return 1;
-    }
-    if (!my_perl) {
-	sprintf(retstr->strptr, "no perl interpreter present");
-	retstr->strlength = strlen (retstr->strptr);
-	return 1;
-    }
-    perl_destruct(my_perl);
-    perl_free(my_perl);
-    my_perl = 0;
-
-    sprintf(retstr->strptr, "%s", "ok");
-    retstr->strlength = strlen (retstr->strptr);
-    return 0;
-}
-
-
-ULONG PERLINIT (PCSZ name, LONG rargc, const RXSTRING *rargv,
-                    PCSZ queuename, PRXSTRING retstr)
-{
-    if (rargc != 0) {
-	sprintf(retstr->strptr, "no argument expected, got %ld", rargc);
-	retstr->strlength = strlen (retstr->strptr);
-	return 1;
-    }
-    if (!init_perl(1))
-	return 1;
-
-    sprintf(retstr->strptr, "%s", "ok");
-    retstr->strlength = strlen (retstr->strptr);
-    return 0;
-}
-
-ULONG PERLEVAL (PCSZ name, LONG rargc, const RXSTRING *rargv,
-                    PCSZ queuename, PRXSTRING retstr)
-{
-    SV *res, *in;
-    STRLEN len;
-    char *str;
-
-    if (rargc != 1) {
-	sprintf(retstr->strptr, "one argument expected, got %ld", rargc);
-	retstr->strlength = strlen (retstr->strptr);
-	return 1;
-    }
-
-    if (!init_perl(1))
-	return 1;
-
-  {
-    dSP;
-    int ret;
-
-    ENTER;
-    SAVETMPS;
-
-    PUSHMARK(SP);
-    in = sv_2mortal(newSVpvn(rargv[0].strptr, rargv[0].strlength));
-    eval_sv(in, G_SCALAR);
-    SPAGAIN;
-    res = POPs;
-    PUTBACK;
-
-    ret = 0;
-    if (SvTRUE(ERRSV) || !SvOK(res))
-	ret = 1;
-    str = SvPV(res, len);
-    if (len <= 256			/* Default buffer is 256-char long */
-	|| !DosAllocMem((PPVOID)&retstr->strptr, len,
-			PAG_READ|PAG_WRITE|PAG_COMMIT)) {
-	    memcpy(retstr->strptr, str, len);
-	    retstr->strlength = len;
-    } else
-	ret = 1;
-
-    FREETMPS;
-    LEAVE;
-
-    return ret;
-  }
-}