Un-TODO a fixed test

[p5sagit/p5-mst-13.2.git] / symbian / config.pl

diff --git a/symbian/config.pl b/symbian/config.pl
index e21b357..e23b359 100644 (file)
--- 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 (<DEMOS>) {
@@ -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);