cvsuser 05/03/31 01:06:10
Modified: config/init data.pl
config/init/hints mswin32.pl msys.pl
ops var.ops
t/pmc sys.t
tools/dev install_files.pl
Log:
[perl #34605] [PATCH] t/pmc/sys.t failure with MinGW32
After Dan's response concerning "Parrot_Exec_OS_Command interface ?".
He says : This is a low-level interface and is designed to be OS-dependent.
I add a new key in Configure : 'slash_exec'
I patch the following files :
config/init/data.pl
config/init/hints/mswin32.pl
config/init/hints/msys.pl
t/pmc/sys.t
[perl #34606] [PATCH] make install on MSWin32
With this small patch, parrot.exe is installed.
Today, the file MANIFEST.generated is OS-dependent.
(When shared library (.dll) will produced, an over patch must be needed.)
Both
Courtesy of Fran�ois Perrad <[EMAIL PROTECTED]>
---
remove a warning
Revision Changes Path
1.41 +2 -1 parrot/config/init/data.pl
Index: data.pl
===================================================================
RCS file: /cvs/public/parrot/config/init/data.pl,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- data.pl 8 Mar 2005 22:52:08 -0000 1.40
+++ data.pl 31 Mar 2005 09:06:02 -0000 1.41
@@ -1,5 +1,5 @@
# Copyright: 2001-2005 The Perl Foundation. All Rights Reserved.
-# $Id: data.pl,v 1.40 2005/03/08 22:52:08 bernhard Exp $
+# $Id: data.pl,v 1.41 2005/03/31 09:06:02 leo Exp $
=head1 NAME
@@ -128,6 +128,7 @@
cp => 'cp',
lns => $Config{lns}, # soft link
slash => '/',
+ slash_exec => '/',
VERSION => $main::parrot_version,
MAJOR => $main::parrot_version[0],
1.27 +2 -1 parrot/config/init/hints/mswin32.pl
Index: mswin32.pl
===================================================================
RCS file: /cvs/public/parrot/config/init/hints/mswin32.pl,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- mswin32.pl 18 Mar 2005 08:47:26 -0000 1.26
+++ mswin32.pl 31 Mar 2005 09:06:07 -0000 1.27
@@ -1,5 +1,5 @@
# Copyright: 2005 The Perl Foundation. All Rights Reserved.
-# $Id: mswin32.pl,v 1.26 2005/03/18 08:47:26 leo Exp $
+# $Id: mswin32.pl,v 1.27 2005/03/31 09:06:07 leo Exp $
{
my %args;
@@ -23,6 +23,7 @@
PQ => '"',
make_c=> '$(PERL) -e "chdir shift @ARGV; system \'$(MAKE)\',
@ARGV; exit $$? >> 8;"',
ncilib_link_extra => '-def:src/libnci_test.def',
+ slash_exec => '\\',
);
if( $is_msvc ) {
1.2 +2 -1 parrot/config/init/hints/msys.pl
Index: msys.pl
===================================================================
RCS file: /cvs/public/parrot/config/init/hints/msys.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- msys.pl 18 Mar 2005 08:47:26 -0000 1.1
+++ msys.pl 31 Mar 2005 09:06:07 -0000 1.2
@@ -1,5 +1,5 @@
# Copyright: 2005 The Perl Foundation. All Rights Reserved.
-# $Id: msys.pl,v 1.1 2005/03/18 08:47:26 leo Exp $
+# $Id: msys.pl,v 1.2 2005/03/31 09:06:07 leo Exp $
{
my %args;
@@ -9,6 +9,7 @@
ld => '$(PERL) /bin/perlld',
libs => '-lmsvcrt -lmoldname -lkernel32 -luser32 -lgdi32
-lwinspool -lcomdlg32 -ladvapi32 -lshell32 -lole32 -loleaut32 -lnetapi32 -luuid
-lws2_32 -lmpr -lwinmm -lversion -lodbc32 ',
ncilib_link_extra => '-def:src/libnci_test.def',
+ slash_exec => '\\',
);
}
1.29 +1 -1 parrot/ops/var.ops
Index: var.ops
===================================================================
RCS file: /cvs/public/parrot/ops/var.ops,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- var.ops 30 Mar 2005 11:12:34 -0000 1.28
+++ var.ops 31 Mar 2005 09:06:08 -0000 1.29
@@ -314,7 +314,7 @@
opcode_t * next;
if (PMC_IS_NULL($2))
internal_exception(1, "Tried to get from null namespace.");
- if (PMC_IS_NULL($3))
+ if (!$3)
internal_exception(1, "Tried to get null global.");
next = expr NEXT();
1.3 +2 -2 parrot/t/pmc/sys.t
Index: sys.t
===================================================================
RCS file: /cvs/public/parrot/t/pmc/sys.t,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sys.t 4 Mar 2005 17:49:11 -0000 1.2
+++ sys.t 31 Mar 2005 09:06:09 -0000 1.3
@@ -1,6 +1,6 @@
#! perl -w
# Copyright: 2001-2004 The Perl Foundation. All Rights Reserved.
-# $Id: sys.t,v 1.2 2005/03/04 17:49:11 bernhard Exp $
+# $Id: sys.t,v 1.3 2005/03/31 09:06:09 leo Exp $
=head1 NAME
@@ -35,7 +35,7 @@
.local pmc conf_hash
conf_hash = _config()
.local string slash
- slash = conf_hash["slash"]
+ slash = conf_hash["slash_exec"]
.local string parrot
parrot = conf_hash["test_prog"]
.local string cmd
1.12 +9 -1 parrot/tools/dev/install_files.pl
Index: install_files.pl
===================================================================
RCS file: /cvs/public/parrot/tools/dev/install_files.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- install_files.pl 7 Oct 2004 16:05:16 -0000 1.11
+++ install_files.pl 31 Mar 2005 09:06:10 -0000 1.12
@@ -1,7 +1,7 @@
#! perl -w
################################################################################
# Copyright: 2001-2003 The Perl Foundation. All Rights Reserved.
-# $Id: install_files.pl,v 1.11 2004/10/07 16:05:16 leo Exp $
+# $Id: install_files.pl,v 1.12 2005/03/31 09:06:10 leo Exp $
################################################################################
=head1 TITLE
@@ -114,6 +114,10 @@
use File::Copy;
use File::Spec;
use strict;
+use lib 'lib';
+use Parrot::Config;
+
+my $exe = $PConfig{'exe'};
# When run from the makefile, which is probably the only time this
# script will ever be used, all of these defaults will get overridden.
@@ -170,6 +174,10 @@
$dest = File::Spec->catdir($options{libdir}, $dest);
} elsif ($meta{bin}) {
$dest = File::Spec->catdir($options{bindir}, $dest);
+ if ($exe) {
+ $src .= $exe;
+ $dest .= $exe;
+ }
} elsif ($meta{include}) {
$dest = File::Spec->catdir($options{includedir}, $dest);
} else {
