At 08:07 30/03/2005 +0000, you wrote:
François" PERRAD <[EMAIL PROTECTED]> wrote:
> --- data.pl.orig 2005-02-21 11:56:08.000000000 +0100
> +++ data.pl 2005-03-19 11:53:30.000000000 +0100
^^^^^^^
Please provide one patch for #34605 and #34606, diffed from Parrot root
directory one directory outside, so that they can be applied with either:
patch -p0
or
patch -p1
See also:
$ perldoc -F docs/submissions.pod
I tried to follow the documentation.
Francois.
Thanks,
leo
diff -ur parrot/config/init/data.pl parrot.new/config/init/data.pl
--- parrot/config/init/data.pl 2005-03-14 13:43:30.000000000 +0100
+++ parrot.new/config/init/data.pl 2005-03-19 11:53:30.000000000 +0100
@@ -130,6 +130,7 @@
cp => 'cp',
lns => $Config{lns}, # soft link
slash => '/',
+ slash_exec => '/',
VERSION => $main::parrot_version,
MAJOR => $main::parrot_version[0],
diff -ur parrot/config/init/hints/mswin32.pl
parrot.new/config/init/hints/mswin32.pl
--- parrot/config/init/hints/mswin32.pl 2005-03-15 23:46:16.000000000 +0100
+++ parrot.new/config/init/hints/mswin32.pl 2005-03-20 16:40:00.000000000
+0100
@@ -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 ) {
diff -ur parrot/config/init/hints/msys.pl parrot.new/config/init/hints/msys.pl
--- parrot/config/init/hints/msys.pl 2005-03-16 11:53:02.000000000 +0100
+++ parrot.new/config/init/hints/msys.pl 2005-03-30 11:29:38.000000000
+0200
@@ -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 => '\\',
);
}
diff -ur parrot/t/pmc/sys.t parrot.new/t/pmc/sys.t
--- parrot/t/pmc/sys.t 2005-03-04 23:37:02.000000000 +0100
+++ parrot.new/t/pmc/sys.t 2005-03-19 12:36:54.000000000 +0100
@@ -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
diff -ur parrot/tools/dev/install_files.pl parrot.new/tools/dev/install_files.pl
--- parrot/tools/dev/install_files.pl 2004-10-07 18:06:42.000000000 +0200
+++ parrot.new/tools/dev/install_files.pl 2005-03-16 16:12:20.000000000
+0100
@@ -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 {
