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.

diff --git a/MANIFEST b/MANIFEST
index 347c600..a40b586 100644 (file)
--- a/MANIFEST
+++ b/MANIFEST
@@ -4618,7 +4618,6 @@ win32/perlmaince.c                WinCE port
 win32/perl.rc                  WinCE port
 win32/pod.mak                  Win32 port
 win32/runperl.c                        Win32 port
-win32/splittree.pl             Win32 port
 win32/sync_ext.pl              Win32 port
 win32/vdir.h                   Perl "host" virtual directory manager for CE
 win32/vmem.h                   Perl "host" memory manager for CE

diff --git a/win32/Makefile b/win32/Makefile
index fa02e3b..8e911cb 100644 (file)
--- 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 af0cb3f..e1e58fc 100644 (file)
--- 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 (file)
index 3c76daa..0000000
--- 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];