Replace the uuencoded perlexe.ico.packd with the genuine, binary, article.

Given that git is perfectly happy to store binary files efficiently, and
serve them anonymously, we no longer need to jump through the ASCII-only hoops
of the Perforce/APC combination.

diff --git a/MANIFEST b/MANIFEST
index 145b65a..76a42e7 100644 (file)
--- a/MANIFEST
+++ b/MANIFEST
@@ -4590,7 +4590,7 @@ win32/Makefile                    Win32 makefile for NMAKE (Visual C++ build)
 win32/Makefile.ce              WinCE port
 win32/makefile.mk              Win32 makefile for DMAKE (BC++, VC++ builds)
 win32/mdelete.bat              multifile delete
-win32/perlexe.ico.packd                uupacktool.pl packed perlexe.ico image file, 'packd' ext is deliberate!
+win32/perlexe.ico              perlexe.ico image file
 win32/perlexe.rc               associated perl binary with icon
 win32/perlglob.c               Win32 port
 win32/perlhost.h               Perl "host" implementation

diff --git a/win32/.gitignore b/win32/.gitignore
index ec11036..e9422f2 100644 (file)
--- a/win32/.gitignore
+++ b/win32/.gitignore
@@ -5,4 +5,5 @@ bin/*.bat
 Extensions_static
 dlutils.c
 perllibst.h
-perlmain.c
\ No newline at end of file
+perlmain.c
+!perlexe.ico

diff --git a/win32/Makefile b/win32/Makefile
index 7c458e1..057089d 100644 (file)
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -965,9 +965,6 @@ $(PERLSTATICLIB): Extensions_static
 <<
        $(XCOPY) $(PERLSTATICLIB) $(COREDIR)
 
-$(PERLEXE_ICO): $(MINIPERL) ..\uupacktool.pl $(PERLEXE_ICO).packd
-       $(MINIPERL) -I..\lib ..\uupacktool.pl -u $(PERLEXE_ICO).packd $(PERLEXE_ICO)
-
 $(PERLEXE_RES): perlexe.rc $(PERLEXE_ICO)
 
 $(MINIMOD) : $(MINIPERL) ..\minimod.pl
@@ -1229,7 +1226,7 @@ distclean: realclean
        -del /f ..\lib\Config_git.pl
        -del /f bin\*.bat
        -del /f perllibst.h
-       -del /f $(PERLEXE_ICO) perl.base
+       -del /f perl.base
        -cd .. && del /s *.lib *.map *.pdb *.ilk *.bs *$(o) .exists pm_to_blib
        -cd $(EXTDIR) && del /s *.def Makefile Makefile.old
        -if exist $(AUTODIR) rmdir /s /q $(AUTODIR)

diff --git a/win32/makefile.mk b/win32/makefile.mk
index ad3ed95..1d1c51a 100644 (file)
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -1264,9 +1264,6 @@ $(PERLSTATICLIB): Extensions_static
 .ENDIF
        $(XCOPY) $(PERLSTATICLIB) $(COREDIR)
 
-$(PERLEXE_ICO): $(MINIPERL) ..\uupacktool.pl $(PERLEXE_ICO).packd
-       $(MINIPERL) -I..\lib ..\uupacktool.pl -u $(PERLEXE_ICO).packd $(PERLEXE_ICO)
-
 $(PERLEXE_RES): perlexe.rc $(PERLEXE_ICO)
 
 $(MINIMOD) : $(MINIPERL) ..\minimod.pl
@@ -1554,7 +1551,7 @@ distclean: realclean
        -del /f ..\lib\Config_git.pl
        -del /f bin\*.bat
        -del /f perllibst.h
-       -del /f $(PERLEXE_ICO) perl.base
+       -del /f perl.base
        -cd .. && del /s *$(a) *.map *.pdb *.ilk *.tds *.bs *$(o) .exists pm_to_blib
        -cd $(EXTDIR) && del /s *.def Makefile Makefile.old
        -if exist $(AUTODIR) rmdir /s /q $(AUTODIR)

diff --git a/win32/perlexe.ico b/win32/perlexe.ico
new file mode 100644 (file)
index 0000000..8dfccd0
Binary files /dev/null and b/win32/perlexe.ico differ

diff --git a/win32/perlexe.ico.packd b/win32/perlexe.ico.packd
deleted file mode 100644 (file)
index 93dd263..0000000
--- a/win32/perlexe.ico.packd
+++ /dev/null
@@ -1,79 +0,0 @@
-#########################################################################
-This is a binary file that was packed with the 'uupacktool.pl' which
-is included in the Perl distribution.
-
-To unpack this file use the following command:
-
-     uupacktool.pl -u perlexe.ico.packd perlexe.ico 
-
-To recreate it use the following command:
-
-     uupacktool.pl -p perlexe.ico perlexe.ico.packd 
-
-Created at Wed Dec 20 15:48:40 2006
-#########################################################################
-__UU__
-M```!``,`$!`0``$`!``H`0``-@```!`0```!``@`:`4``%X!```0$````0`@
-M`&@$``#&!@``*````!`````@`````0`$``````#`````````````````````
-M`````/___P![`````'L``'M[`````'L`>P![``![>P"]O;T`>WM[`/\`````
-M_P``__\`````_P#_`/\``/__``````#________________W_X________^/
-M_________W__________C_________^/_________X]___________A_____
-M__________C____X_____X__________^/__?___C_C_C__________X____
-M________________________GES[MW0@_9MX9?V;('3]6W,@_5MN(/T3=7/P
-M`7!RX`-L9>`#('?D!VX@Y@=E=\,/9R#_GV4@__]O;O__;B`H````$````"``
-M```!``@``````$`!````````````````````````____`/[^_@#6UM8`JJJJ
-M`/W]_0!Y>7D``````'IZ>@#\_/P`04%!`'5U=0"$A(0`'AX>`,O+RP"WM[<`
-M`P,#`(B(B``"`@(`@8&!`/;V]@`@("``MK:V`(J*B@`$!`0`&AH:`.?GYP`.
-M#@X`.#@X`&MK:P`8&!@`LK*R`,'!P0`5%18`%Q<7``L+"P`!`0$`'Q\?``H*
-M"@!P<'``FYN;`.GIZ`!X>'@`$1$1`",C(P!$1$0`XN+B`*:FI@!E964`:FIJ
-M`+2TM`"OKZ\`S\_/``@("`!L;&P`CX^/`+&QL0"_O[\`\?'Q`%A86`":FIH`
-M____`/___P#___\`____`/___P#___\`____`/___P#___\`____`/___P#_
-M__\`____`/___P#___\`____`/___P#___\`____`/___P#___\`____`/__
-M_P#___\`____`/___P#___\`____`/___P#___\`____`/___P#___\`____
-M`/___P#___\`____`/___P#___\`____`/___P#___\`____`/___P#___\`
-M____`/___P#___\`____`/___P#___\`____`/___P#___\`____`/___P#_
-M__\`____`/___P#___\`____`/___P#___\`____`/___P#___\`____`/__
-M_P#___\`____`/___P#___\`____`/___P#___\`____`/___P#___\`____
-M`/___P#___\`____`/___P#___\`____`/___P#___\`____`/___P#___\`
-M____`/___P#___\`____`/___P#___\`____`/___P#___\`____`/___P#_
-M__\`____`/___P#___\`____`/___P#___\`____`/___P#___\`____`/__
-M_P#___\`____`/___P#___\`____`/___P#___\`____`/___P#___\`____
-M`/___P#___\`____`/___P#___\`____`/___P#___\`____`/___P#___\`
-M____`/___P#___\`____`/___P#___\`____`/___P#___\`____`/___P#_
-M__\`____`/___P#___\`____`/___P#___\`____`/___P#___\`____`/__
-M_P#___\`____`/___P#___\`____`/___P#___\`____`/___P#___\`____
-M`/___P#___\`____`/___P#___\`____`/___P#___\`____`/___P#___\`
-M____`/___P#___\`____`/___P#___\`____`/___P#___\`____`/___P#_
-M__\`____`/___P#___\`____``8&!@8&!@8&!@8&!@8&!@8&!@8&!@8&!@8-
-M!@8Z!@8&!@8&!@8&!@8&!AP&!@8&!@8&!@8&!@8&!@8#!@8&!@8&!@8&!@8&
-M!@8&'`8&!@8&!@8&!@8&!@8&!AP&!@8&!@8&!@8&!@8&#!0)!@4&!@8&!@8&
-M#`P&!@8&!A0&!2<&!@8&!@8&!@8&!@8&!@P&!@8&!@8&&P8&!@8&!@8<!@8&
-M!@8&%`8+!@8&!@8,!@8&!@8&!@8&!@L&!@8&"P8&!@8&"08&!08&"P8&#`8&
-M!@8&!@8&!@8&!@8%!@8&!@8&!@8&!@8&!@8&!@8&!@8&!@8&!@8&!@8&!@8&
-M!@8&!@;__YY<^[=T(/V;>&7]FR!T_5MS(/U;;B#]$W5S\`%P<N`#;&7@`R!W
-MY`=N(.8'97?##V<@_Y]E(/__;V[__VX@*````!`````@`````0`@``````!`
-M!```````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M`````````````````````/\```!P`````0```$Z_O[]`````#@````!86%BG
-M````90`````````````````````````````````````````P````_P````$`
-M```!"`@(]VQL;),``````````0```/\`````````````````````````````
-M`````````````P```/\````!````2P```/^OKZ]0``````````$```#_````
-M`0````````````````````````````````````$```#_`````0```/\`````
-M:FIJE0````$````!````_P````$`````````````````````````````````
-M```!````_P````$```#_````665E99H````!`````0```/\`````````````
-M````````````````````````````%P```/\```"'$1$1[B,C(]Q$1$2[````
-M`7IZ>H4```#_````'0````````````````````$````^%146ZA<7%^@"`@+]
-M"PL+]`$!`?X```#_`@("_1\?'^`*"@KU<'!PCYN;FV0`````````````````
-M```!````_P```/\```#_````_P```/\```#_````_P```/\```#_````_Q@8
-M&.<```!-`````````````````````0```/\.#@[Q.#@XQP```/\```#_````
-M_P```/\```#_````_P```/]K:VN4``````````````````````````````#_
-M("`@WP```$F*BHIU!`0$^P```/\```#_````_P```/\:&AKE````&```````
-M``````````````````!(````_P,#`_P```"*`````8B(B'<"`@+]````_P``
-M`/\```#_@8&!?@````D`````````````````````04%!O@```/\```#_=75U
-MB@``````````A(2$>P```/\```#_'AX>X0```#0`````````````````````
-M``````````$````I````50````$```````````````)Y>7F&````_P```(4`
-M```#````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M``````````#__YY<^[=T(/V;>&7]FR!T_5MS(/U;;B#]$W5S\`%P<N`#;&7@
-;`R!WY`=N(.8'97?##V<@_Y]E(/__;V[__VX@