EPOC fixes from Olaf Flebbe.

p4raw-id: //depot/perl@13665

1 files changed, 19 insertions, 16 deletions

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;