FCL/sf/app/homescreentools: comparison widgettools/wrtwidgetpreinstaller/src/installwidgets.pl

equal deleted inserted replaced

-:60c10715f092
+:a3ff8024e841
 use File::Spec::Functions;
 use Getopt::Long;
 use Pod::Usage;
 # Version of the script - just use the date
-$main::VERSION = '02-August-2010';
+$main::VERSION = '26-August-2010';
 # New getopt::long provides this - but old version doesn't?
 sub version
 {
 print sprintf("$0: $main::VERSION\n$^X: %vd\nos: $^O", $^V);
 use constant KEY_ATTR_SEPERATOR => ':';
 our $w3c_widget = 0 ;
 our $hashval;
 our $non_nokia_widget = 0;
-our ($isSharedLibrary, $sharedFolderName ,$isSharedWidget, $isSharedIcon)= (0,'',0,0);
+our ($isSharedLibrary, $sharedFolderName ,$isSharedWidget, $isSharedIcon, $isHiddenIcon)= (0,'',0,0,0);
 our (@staticUidWrtIntList,@staticUidCwrtIntList,@staticUidWrtExtList,@staticUidCwrtExtList) = ({},{},{},{});
 our $isSecureWidget = 0;
 # Create a new object
 sub new
 $isSharedLibrary = 0;
 $isSharedWidget = 0;
 $isSharedIcon = 0;
 $sharedFolderName ='';
 $isSecureWidget = 0;
+$isHiddenIcon = 0;
 print "Installing files for drive $drive\n" if $self->{'args'}->{'verbose'};
 # Unregister any existing widgets as otherwise when the registry is rewritten their icons will appear in the emulator but they won't work
 $self->unregisterWidgets($drive);
 $isSharedLibrary = 0;
 $isSharedWidget = 0;
 $isSharedIcon = 0;
 $sharedFolderName ='';
+$isHiddenIcon = 0;
 my ( $root, $extracted, $size ) = $self->getFiles($tempdir);
 die "No files extracted from $filename" if !@$extracted;
 if ($self->{'operator'}{lc $filename})
-{
+		{
 print "\nNON NOKIA WGT \n";
-$non_nokia_widget = 1;
+	$non_nokia_widget = 1;
 }
 else
 {
 print "\nNOKIA WGT \n";
-$non_nokia_widget = 0;
+	$non_nokia_widget = 0;
 }
 if (($filename =~ /.wgz/ )&& (my $plist = catfile($tempdir, $root, 'Info.plist')))
 {
 $widgetdata = parsePList($plist);
 }
 elsif (($filename =~ /.wgt/ ) && ( my $confxml = catfile($tempdir, $root, 'config.xml')))
 {
 print ("W3C widget \n");
 # Parse the XML file into a hash
 $widgetdata = parseConfXml($confxml,$self->{'args'}->{'l10n'});
 $w3c_widget = 1;
 }
 else
 # Create the MBM file icon - in case of sharedlibrary, create only if NOKIA:widget is true
 my $mbm;
 print("\nIs shared library - $isSharedLibrary \nIs sharedlib widget - $isSharedWidget \nIs Secure WGZ - $self->{'secure'}{lc $filename}\n");
-if( ((!$isSharedLibrary) || ($isSharedLibrary && $isSharedIcon)) && (!$self->{'secure'}{lc $filename}))
+		if( ((!$isSharedLibrary) || ($isSharedLibrary && $isSharedWidget)) && (!$self->{'secure'}{lc $filename}))
 {
 	  print "Creating mbm !!!\n";
 die "ERROR: Can't find PNG2MBM command in PATH." if !(my $cmd = findCmd('png2mbm.exe'));
 $mbm = $self->regFileName($drive, sprintf("[%08x].mbm", $widgetdata->{'Uid'}));
 print "Generating: $mbm\n";
 }
 # Copy the MBM file into the widget install directory
 # because native installation does and uses it after
 # installation to manage UID consistency.
-if( (!$isSharedLibrary) || ($isSharedLibrary && $isSharedIcon))
+if( (!$isSharedLibrary) || ($isSharedLibrary && $isSharedWidget))
 {
 my $mbmName = sprintf("[%08x].mbm", $widgetdata->{'Uid'});
 my $destFile;
 if($w3c_widget)
 {
 }
 # Make INI file describing widget - this is passed to widgetregfiles.exe
 sub makeIni
 {
+my $hidden = 0;
+if ($isSharedWidget && !$isSharedIcon) {$hidden = 1;}
+if ($isHiddenIcon) {$hidden = 1;}
 my ( $self, $data, $file ) = @_;
 open INI, ">$file" or die "Failed to open $file for writing: $!";
 binmode INI, ":utf8" if $] >= 5.008;
 # Get directory where mbm should go
 print INI sprintf("uid=%08x\n", $data->{'Uid'});
 print INI "app_file=$data->{'MainHTML'}\n";
 print INI "caption=$data->{'BundleDisplayName'}\n";
 print INI "drive_name=$data->{'DriveName'}\n";
 print INI "results_dir=$dir\n";
+print INI "hidden=$hidden\n";
 if( $w3c_widget )
 {
 print INI "app_type=200267DC\n";
 print " WGT Widget:: app_type added to ini of widgetregfiles.exe \n" if $debug;
 {
 $isSharedIcon = 1;
 }
 $attributeMap = $attributeMap.WIDGET_NOKIA_SHAREDLIB_ICON.KEY_VALUE_SEPERATOR.$val.KEY_VALUE_PAIR_SEPERATOR;
 }
+elsif ($el eq "NOKIAEX:hideicon")
+{
+chomp($val);
+if( lc($val) eq "true" )
+{
+$isHiddenIcon = 1;
+print "Found NOKIAEX:hideicon == true";
+}
+}
 $val = ''
 }
 }
 # If the WRT registry already exists, remove apparc registry info for those widgets
 # This should avoid problems with unregistered widget icons in the emulator?
 if (-e $registry)
 {
 print("\n     UNREGISTERING WGZ WIDGETS       \n");
 my $ref = XMLin($registry, 'forcearray' => [ 'entry' ], 'keyattr' => { 'prop' => 'content' } );
 foreach my $entry ( @{ $ref->{entry} } )
 {
 my $uid = $entry->{prop}->{Uid}->{val}->{content};
 # If the CWRT registry already exists, remove apparc registry info for those widgets
 # This should avoid problems with unregistered widget icons in the emulator?
 if (-e $registry)
 {
 print("\n     UNREGISTERING WGT WIDGETS       \n");
 my $ref = XMLin($registry, 'forcearray' => [ 'entry' ], 'keyattr' => { 'prop' => 'content' } );
 foreach my $entry ( @{ $ref->{entry} } )
 {
 my $uid = $entry->{prop}->{Uid}->{val}->{content};
 	$non_nokia_widget = 1;
 }
 #sharedFolderName TBD
 my $dir = $self->installDir($drive, $id);
 rmtree $dir;
 $dir =~ s/widgets_21D_4C7/data/;
 rmtree $dir;
 }
 }
 #delete CWRT webapp DB if exists
 my $cwrtdbPath = catfile($self->destLocation($drive), CWRT_WEBAPP_REGISTRY);

branch	RCL_3
changeset 36	a3ff8024e841
parent 34	60c10715f092