diff options
| author | Nicholas Clark <nick@ccl4.org> | 2009-09-17 15:00:01 +0100 |
|---|---|---|
| committer | Nicholas Clark <nick@ccl4.org> | 2009-09-17 15:00:01 +0100 |
| commit | 19ec6f53213f9991324bf8d63675bf45dc8b0af0 (patch) | |
| tree | 536741ace4766fc2755823cdd6e7f93bf176041e /win32 | |
| parent | 281da5eaa82c552216e167aece73c3f8df066bd4 (diff) | |
| download | perl-19ec6f53213f9991324bf8d63675bf45dc8b0af0.tar.gz | |
Now no need to run AutoSplit on lib on Win32, with DynaLoader builing in ext
This reverts the win32 part of commit 9139c7231c70a9388d718abc41e91edaf43422ec,
reinstating the win32 part of commit 109e4020ef40828991be28fb05d9f269b4d92530.
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/Makefile | 6 | ||||
| -rw-r--r-- | win32/makefile.mk | 6 | ||||
| -rw-r--r-- | win32/splittree.pl | 24 |
3 files changed, 2 insertions, 34 deletions
diff --git a/win32/Makefile b/win32/Makefile index fa02e3bd4e..8e911cb536 100644 --- a/win32/Makefile +++ b/win32/Makefile @@ -1022,8 +1022,6 @@ $(PERLEXE): $(PERLDLL) $(CONFIGPM) $(PERLEXE_OBJ) $(PERLEXE_RES) $(EMBED_EXE_MANI) copy $(PERLEXE) $(WPERLEXE) $(MINIPERL) -I..\lib bin\exetype.pl $(WPERLEXE) WINDOWS - copy splittree.pl .. - $(MINIPERL) -I..\lib -I..\ext\Cwd ..\splittree.pl "../LIB" $(AUTODIR) $(PERLEXESTATIC): $(PERLSTATICLIB) $(CONFIGPM) $(PERLEXEST_OBJ) $(PERLEXE_RES) $(LINK32) -subsystem:console -out:$@ -stack:0x1000000 $(LINK_FLAGS) \ @@ -1204,7 +1202,7 @@ distclean: realclean perldoc perlivp dprofpp libnetcfg enc2xs piconv cpan *.bat \ xsubpp instmodsh prove ptar ptardiff cpanp-run-perl cpanp cpan2dist shasum corelist config_data -cd ..\x2p && del /f find2perl s2p psed *.bat - -del /f ..\config.sh ..\splittree.pl perlmain.c dlutils.c config.h.new \ + -del /f ..\config.sh perlmain.c dlutils.c config.h.new \ perlmainst.c -del /f $(CONFIGPM) -del /f ..\lib\Config_git.pl @@ -1235,8 +1233,6 @@ installhtml : doc $(RCOPY) $(HTMLDIR)\*.* $(INST_HTML)\*.* inst_lib : $(CONFIGPM) - copy splittree.pl .. - $(MINIPERL) -I..\lib -I..\ext\Cwd ..\splittree.pl "../LIB" $(AUTODIR) $(RCOPY) ..\lib $(INST_LIB)\*.* $(UNIDATAFILES) : $(MINIPERL) $(CONFIGPM) ..\lib\unicore\mktables Extensions_nonxs diff --git a/win32/makefile.mk b/win32/makefile.mk index af0cb3f21f..e1e58fc693 100644 --- a/win32/makefile.mk +++ b/win32/makefile.mk @@ -1342,8 +1342,6 @@ $(PERLEXE): $(PERLDLL) $(CONFIGPM) $(PERLEXE_OBJ) $(PERLEXE_RES) .ENDIF copy $(PERLEXE) $(WPERLEXE) $(MINIPERL) -I..\lib bin\exetype.pl $(WPERLEXE) WINDOWS - copy splittree.pl .. - $(MINIPERL) -I..\lib -I..\ext\Cwd ..\splittree.pl "../LIB" $(AUTODIR) $(PERLEXESTATIC): $(PERLSTATICLIB) $(CONFIGPM) $(PERLEXEST_OBJ) $(PERLEXE_RES) .IF "$(CCTYPE)" == "BORLAND" @@ -1532,7 +1530,7 @@ distclean: realclean perldoc perlivp dprofpp libnetcfg enc2xs piconv cpan *.bat \ xsubpp instmodsh prove ptar ptardiff cpanp-run-perl cpanp cpan2dist shasum corelist config_data -cd ..\x2p && del /f find2perl s2p psed *.bat - -del /f ..\config.sh ..\splittree.pl perlmain.c dlutils.c config.h.new \ + -del /f ..\config.sh perlmain.c dlutils.c config.h.new \ perlmainst.c -del /f $(CONFIGPM) -del /f ..\lib\Config_git.pl @@ -1563,8 +1561,6 @@ installhtml : doc $(RCOPY) $(HTMLDIR)\*.* $(INST_HTML)\*.* inst_lib : $(CONFIGPM) - copy splittree.pl .. - $(MINIPERL) -I..\lib -I..\ext\Cwd ..\splittree.pl "../LIB" $(AUTODIR) $(RCOPY) ..\lib $(INST_LIB)\*.* $(UNIDATAFILES) .UPDATEALL : $(MINIPERL) $(CONFIGPM) ..\lib\unicore\mktables Extensions_nonxs diff --git a/win32/splittree.pl b/win32/splittree.pl deleted file mode 100644 index 3c76daadb1..0000000000 --- a/win32/splittree.pl +++ /dev/null @@ -1,24 +0,0 @@ -use DirHandle; -use AutoSplit; - -sub splitthis { -my ($top,$base,$dest) = @_; -my $d = new DirHandle $base; -if (defined $d) { - while (defined($_ = $d->read)) { - next if $_ eq "."; - next if $_ eq ".."; - my $entry = "$base\\$_"; - my $entrywithouttop = $entry; - $entrywithouttop =~ s/^$top//; - if (-d $entry) {splitthis ($top,$entry,$dest);} - else { - next unless ($entry=~/pm$/i); - #print "Will run autosplit on $entry to $dest\n"; - autosplit($entry,$dest,0,1,1); - }; - }; - }; -} - -splitthis $ARGV[0],$ARGV[0],$ARGV[1]; |