EPOC fixes from Olaf Flebbe.

p4raw-id: //depot/perl@13665

2 files changed, 31 insertions, 28 deletions

diff --git a/epoc/config.sh b/epoc/config.sh
index 268b28325e..6909d55ffe 100644
--- a/epoc/config.sh
+++ b/epoc/config.sh
@@ -32,7 +32,7 @@ aphostname=''
 apirevision=''
 apisubversion=''
 apiversion=''
-ar='arm-pe-ar'
+ar='arm-epoc-pe-ar'
 archlib='?:/perl/lib/5.7.2/epoc'
 archlibexp='?:/perl/lib/5.7.2/epoc'
 archname64=''
@@ -50,14 +50,14 @@ byteorder='1234'
 c=''
 castflags='0'
 cat='cat'
-cc='arm-pe-gcc -B/usr/local/lib/gcc-lib/arm-pe/cygnus-2.7.2-960323/ -nostdinc -D__SYMBIAN32__ -D__PSISOFT32__ -D__GCC32__ -D__EPOC32__ -D__MARM__ -D__EXE__ -I/usr/local/epoc/include/ -I/usr/local/epoc/include/libc -DEPOC'
+cc='arm-epoc-pe-gcc -DEPOC'
 cccdlflags=''
 ccdlflags=''
-ccflags='-Wno-ctor-dtor-privacy -mcpu-arm710 -mapcs-32 -mshort-load-bytes -msoft-float -fcheck-new -fvtable-thunks'
+ccflags=''
 ccsymbols=''
 cf_by='olaf'
 cf_email='o.flebbe@gmx.de'
-cf_time='Dec 1999'
+cf_time='Dec 2001'
 chgrp=''
 chmod=''
 chown=''
@@ -67,14 +67,14 @@ compress=''
 contains='grep'
 cp='cp'
 cpio=''
-cpp='arm-pe-cpp'
+cpp='arm-epoc-pe-cpp'
 cpp_stuff='42'
 cppccsymbols='EPOC=1'
-cppflags=' -nostdinc -D__SYMBIAN32__ -D__PSISOFT32__ -D__GCC32__ -D__EPOC32__ -D__MARM__ -D__EXE__ -I/usr/local/epoc/include/ -I/usr/local/epoc/include/libc'
+cppflags=''
 cpplast='-'
 cppminus='-'
-cpprun='arm-pe-gcc -E  -B/usr/local/lib/gcc-lib/arm-pe/cygnus-2.7.2-960323/'
-cppstdin='arm-pe-gcc -E -B/usr/local/lib/gcc-lib/arm-pe/cygnus-2.7.2-960323/'
+cpprun='arm-epoc-pe-gcc -E'
+cppstdin='arm-epoc-pe-gcc -E'
 cppsymbols=''
 cryptlib=''
 csh='csh'
@@ -436,7 +436,7 @@ firstmakefile='makefile'
 flex=''
 fpostype='fpos_t'
 freetype='void'
-full_ar='/usr/local/bin/arm-pe-ar'
+full_ar='arm-epoc-pe-ar'
 full_csh=''
 full_sed='/usr/bin/sed'
 gccversion=''
@@ -546,7 +546,7 @@ known_extensions='Data/Dumper File/Glob IO Socket Fcntl Sys/Hostname Errno'
 ksh=''
 ld='echo'
 lddlflags=''
-ldflags=''
+ldflags='-Wl,-heap,0x04000000'
 ldlibpthname=''
 less=''
 lib_ext=''
@@ -615,7 +615,7 @@ netdb_hlen_type='int'
 netdb_host_type='const char *'
 netdb_name_type='const char *'
 netdb_net_type='int'
-nm='arm-pe-nm'
+nm='arm-epoc-pe-nm'
 nm_opt=''
 nm_so_opt=''
 nonxs_ext='Errno'
@@ -652,7 +652,7 @@ ptrsize='4'
 randbits='31'
 randfunc=''
 randseedtype='unsigned'
-ranlib='arm-pe-ranlib'
+ranlib='arm-epoc-pe-ranlib'
 rd_nodata='-1'
 rm='rm'
 rmail=''
diff --git a/epoc/createpkg.pl b/epoc/createpkg.pl
index 5ce70fc92c..39cd8c4666 100644
--- a/epoc/createpkg.pl
+++ b/epoc/createpkg.pl
@@ -6,35 +6,38 @@ use Cwd;
 $VERSION="5.7";
 $PATCH="1";
 $EPOC_VERSION=27;
-$CROSSCOMPILEPATH=cwd;
-$CROSSREPLACEPATH="H:\\perl";
 
 
 sub filefound {
-    my $f = $File::Find::name;
-    
-    return if ( $f =~ /CVS|unicode|CPAN|ExtUtils|IPC|User|DB.pm|\.a$|\.ld$|\.exists$|\.pod$/i);
-    my $back = $f;
-
-    $back =~ s|$CROSSCOMPILEPATH||;
 
-    $back =~ s|/|\\|g;
+  my $f = $File::Find::name;
+    
+  return if ( $f =~ /CVS|unicode|CPAN|ExtUtils|IPC|User|DB.pm|\.a$|\.ld$|\.exists$|\.pod$/i);
+  my $back = $f;
 
-    my $psiback = $back;
+  my $psiback = $back;
 
-    $psiback =~ s/\\lib\\/\\perl\\lib\\$VERSION.$PATCH\\/i;
+  $psiback =~ s|.*/lib/|\\perl\\lib\\$VERSION.$PATCH\\|;
 
-    print OUT "\"$CROSSREPLACEPATH$back\"-\"!:$psiback\"\n"  if ( -f $f );
-;
+  print OUT "\"$back\"-\"!:$psiback\"\n"  if ( -f $f );
 }
 
 open OUT,">perl.pkg";
 
 print OUT "#{\"perl$VERSION\"},(0x100051d8),$PATCH,$EPOC_VERSION,0\n";
-print OUT "\"$CROSSREPLACEPATH\\Artistic\"-\"\",FT,TA\n";
-print OUT "\"$CROSSREPLACEPATH\\perlmain.exe\"-\"!:\\system\\programs\\perl.exe\"\n";
+print OUT "\"" . cwd . "/Artistic.txt\"-\"\",FT,TA\n";
+print OUT "\"" . cwd . "/perl\"-\"!:\\system\\programs\\perl.exe\"\n";
 
 find(\&filefound, cwd.'/lib');
-print OUT "@\"G:\\lib\\stdlib.sis\",(0x0100002c3)\n"
+# print OUT "@\"G:\\lib\\stdlib.sis\",(0x0100002c3)\n";
+
+open IN,  "<Artistic";
+open OUT, ">Artistic.txt";
+while (my $line = <IN>) {
+  chomp $line;
+  print OUT "$line\x13\x10";
+}
 
+close IN;
+close OUT;