From db5886f1c778575b40da80b66a50b6ab376ad943 Mon Sep 17 00:00:00 2001 From: Jarkko Hietaniemi Date: Wed, 9 Nov 2005 19:45:07 +0200 Subject: blead@26052 Symbian update Message-ID: p4raw-id: //depot/perl@26068 --- symbian/config.pl | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'symbian/config.pl') diff --git a/symbian/config.pl b/symbian/config.pl index e21b35754c..e23b35992c 100644 --- a/symbian/config.pl +++ b/symbian/config.pl @@ -336,8 +336,9 @@ qq[;Supports UIQ v2.1\n(0x101F617B), $1, $2, 0, {"UIQ21ProductID"}\n] : if (($SDK_VARIANT eq 'S60' && $SDK_VERSION ne '1.2' || $WIN eq 'winscw') || defined $S80SDK) { # Do only if not in S60 1.2 VC. $APPS =~ s!\\epoc32\\release\\(.+)\\$UARM$!\\epoc32\\data\\z\\system\\apps\\PerlApp!i; } - # In S60 3.0 there will be no more recognizers. + # TODO: in S60 3.0 there will be no more recognizers. my $mdl = qq["$UREL\\PerlRecog.mdl"-"!:\\system\\recogs\\PerlRecog.mdl";]; + my $AIF = $SDK_VARIANT =~ /^S[68]0/ ? qq["$APPS\\PerlApp.aif"-"!:\\system\\apps\\PerlApp\\PerlApp.aif"] : ""; print PERLAPP_PKG <<__EOF__; ; !!!!!! DO NOT EDIT THIS FILE !!!!!! ; This file is built by symbian\\config.pl. @@ -359,7 +360,7 @@ $ProductId "$UREL\\PerlApp.APP"-"!:\\system\\apps\\PerlApp\\PerlApp.app" $mdl "$APPS\\PerlApp.rsc"-"!:\\system\\apps\\PerlApp\\PerlApp.rsc" -"$APPS\\PerlApp.aif"-"!:\\system\\apps\\PerlApp\\PerlApp.aif" +$AIF __EOF__ if ( open( DEMOS, "perl symbian\\demo_pl list |" ) ) { while () { @@ -814,7 +815,8 @@ clean: clean_${WIN} clean_arm rerename_makedef -del /f symbian\\abld.bat symbian\\*.sis symbian\\*.zip -del /f symbian\\perl5*.pkg symbian\\miniperl.pkg -del arm_*.mf ${WIN}_*.mf vc*.mf cw*.mf - -del symbian\\PerlUi.rss + -del symbian\\Makefile + -del symbian\\PerlUi.rss symbian\\PerlApp.rss -del perlappmin.hex perlrscmin.hex -perl symbian\\xsbuild.pl \$(XSBOPT) --clean \$(EXT) -rmdir /s /q perl${VERSION}_Data @@ -886,6 +888,7 @@ clean: -del PerlApp.rss abld clean $WIN abld clean thumb + -del Makefile distclean: clean -del /f *.cwlink *.resources *.pref @@ -921,6 +924,8 @@ for my $config ( "lib\\Config.pm", "xlib\\symbian\\Config.pm", "xlib\\symbian\\Config_heavy.pl", + "symbian\\PerlUi.rss", + "symbian\\PerlApp.rss", ) { print "\t$config\n"; unlink($config); -- cgit v1.2.1