Author: jhoblitt
Date: Sat Oct 22 01:11:23 2005
New Revision: 9533
Modified:
trunk/CREDITS
trunk/config/init/data.pl
trunk/config/init/hints/mswin32.pl
trunk/config/init/hints/msys.pl
trunk/languages/m4/t/basic/003_getopt.t
trunk/languages/m4/t/basic/012_eval.t
trunk/languages/m4/t/freezing/001_freeze.t
trunk/languages/m4/t/freezing/002_many_files.t
trunk/t/pmc/sys.t
Log:
remove slash_exec from config, patch from Francois Perrad
Modified: trunk/CREDITS
==============================================================================
--- trunk/CREDITS (original)
+++ trunk/CREDITS Sat Oct 22 01:11:23 2005
@@ -135,6 +135,7 @@ D: delegate.pmc patch
N: François PERRAD
D: build fixes for MinGW
+D: a patch to remove slash_exec from config
N: Garrett Rooney
D: Fix typo in PARROT_BIGENDIAN case
Modified: trunk/config/init/data.pl
==============================================================================
--- trunk/config/init/data.pl (original)
+++ trunk/config/init/data.pl Sat Oct 22 01:11:23 2005
@@ -140,10 +140,7 @@ sub runstep {
cp => '$(PERL) -MExtUtils::Command -e cp',
lns => $Config{lns}, # soft link
- # On all platform slash == slash_exec, except with MinGW
- # slash_exec is needed by pathname of executable in test or makefile
slash => '/',
- slash_exec => '/',
VERSION => $main::parrot_version,
MAJOR => $main::parrot_version[0],
Modified: trunk/config/init/hints/mswin32.pl
==============================================================================
--- trunk/config/init/hints/mswin32.pl (original)
+++ trunk/config/init/hints/mswin32.pl Sat Oct 22 01:11:23 2005
@@ -21,7 +21,6 @@
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 ) {
Modified: trunk/config/init/hints/msys.pl
==============================================================================
--- trunk/config/init/hints/msys.pl (original)
+++ trunk/config/init/hints/msys.pl Sat Oct 22 01:11:23 2005
@@ -10,7 +10,6 @@
ld_load_flags => '-shared ',
libs => '-lmsvcrt -lmoldname -lkernel32 -luser32 -lgdi32
-lwinspool -lcomdlg32 -ladvapi32 -lshell32 -lole32 -loleaut32 -lnetapi32 -luuid
-lws2_32 -lmpr -lwinmm -lversion -lodbc32 ',
ncilib_link_extra => 'src/libnci_test.def',
- slash_exec => '\\',
);
}
Modified: trunk/languages/m4/t/basic/003_getopt.t
==============================================================================
--- trunk/languages/m4/t/basic/003_getopt.t (original)
+++ trunk/languages/m4/t/basic/003_getopt.t Sat Oct 22 01:11:23 2005
@@ -8,7 +8,7 @@ use Parrot::Config;
use Test::More tests => 25;
my $real_out;
-my $parrot_m4 = "cd .. && .$PConfig{slash_exec}parrot$PConfig{exe}
languages/m4/m4.pbc";
+my $parrot_m4 = "cd .. && .$PConfig{slash}parrot$PConfig{exe}
languages/m4/m4.pbc";
my $examples_dir = 'languages/m4/examples';
Modified: trunk/languages/m4/t/basic/012_eval.t
==============================================================================
--- trunk/languages/m4/t/basic/012_eval.t (original)
+++ trunk/languages/m4/t/basic/012_eval.t Sat Oct 22 01:11:23 2005
@@ -8,7 +8,7 @@ use Parrot::Config;
use Test::More tests => 1;
my $real_out;
-my $parrot = "cd .. && .$PConfig{slash_exec}parrot$PConfig{exe}";
+my $parrot = "cd .. && .$PConfig{slash}parrot$PConfig{exe}";
$real_out = `$parrot languages/m4/examples/eval.imc 2>&1`;
is( $real_out, << 'END_OUT', 'single expression' );
Modified: trunk/languages/m4/t/freezing/001_freeze.t
==============================================================================
--- trunk/languages/m4/t/freezing/001_freeze.t (original)
+++ trunk/languages/m4/t/freezing/001_freeze.t Sat Oct 22 01:11:23 2005
@@ -8,7 +8,7 @@ use Parrot::Config;
#use Test::More tests => 1;
use Test::More skip_all => 'infinite loop lurking';
-my $parrot_m4 = "cd .. && .$PConfig{slash_exec}parrot$PConfig{exe}
languages/m4/m4.pbc";
+my $parrot_m4 = "cd .. && .$PConfig{slash}parrot$PConfig{exe}
languages/m4/m4.pbc";
my $cat = "$PConfig{perl} -MExtUtils::Command -e cat";
my $rm_f = "$PConfig{perl} -MExtUtils::Command -e rm_f";
Modified: trunk/languages/m4/t/freezing/002_many_files.t
==============================================================================
--- trunk/languages/m4/t/freezing/002_many_files.t (original)
+++ trunk/languages/m4/t/freezing/002_many_files.t Sat Oct 22 01:11:23 2005
@@ -9,7 +9,7 @@ use Parrot::Config;
use Test::More skip_all => 'infinite loop lurking';
my $real_out;
-my $parrot_m4 = "cd .. && .$PConfig{slash_exec}parrot$PConfig{exe}
languages/m4/m4.pbc";
+my $parrot_m4 = "cd .. && .$PConfig{slash}parrot$PConfig{exe}
languages/m4/m4.pbc";
#--------------------------------------------
Modified: trunk/t/pmc/sys.t
==============================================================================
--- trunk/t/pmc/sys.t (original)
+++ trunk/t/pmc/sys.t Sat Oct 22 01:11:23 2005
@@ -35,7 +35,7 @@ pir_output_is(<<'CODE', <<OUT, "spawnw,
.local pmc conf_hash
conf_hash = _config()
.local string slash
- slash = conf_hash["slash_exec"]
+ slash = conf_hash["slash"]
.local string parrot
parrot = conf_hash["test_prog"]
.local string cmd
