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

equal deleted inserted replaced

-:04b7640f6fb5
+:60c10715f092
 use File::Spec::Functions;
 use Getopt::Long;
 use Pod::Usage;
 # Version of the script - just use the date
-$main::VERSION = '12-July-2010';
+$main::VERSION = '02-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 EXTERNAL_UID_LOWER_CWRT => 0x2000DDC0; # Lower UID bound for CWRT widgets installed to removable cards
 use constant WIDGET_UI_UID => 0x10282822;   # UID of the widget app
 use constant CWRT_WIDGET_UI_UID => 0x200267C0;    # UID of the cwrt widget app
 use constant SWIDGET_UI_UID => 0x102829A0;	# UID of the securewidget app
 use constant CWRT_WIDGET_UI_NON_NOKIA_UID => 0x200267D6;    # UID of the cwrt widget app
+use constant JIL_NS => 'http://www.jil.org/ns/widgets1.2';
 # Folder paths
 use constant DESTINATION => 'private/10003a3f/import/apps/NonNative/Resource';
 use constant ROM_DEST => 'epoc32/release/winscw/udeb/Z/';
 use constant DRIVE_DEST => 'epoc32/winscw/%s';
 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);
-print "\n			INSTALLING FILES FOR DRIVE $drive				\n";
+print "\n     INSTALLING FILES FOR DRIVE $drive       \n";
 # Process each widget in turn
 my ( @installedProps );
 my ( @installedCWRTProps );
 foreach my $filename ( @$fileList )
 {
 my ( $root, $extracted, $size ) = $self->getFiles($tempdir);
 die "No files extracted from $filename" if !@$extracted;
 if ($self->{'operator'}{lc $filename})
-		{
+{
-	print "\n NON NOKIA WGT \n";
+print "\nNON NOKIA WGT \n";
-	$non_nokia_widget = 1;
+$non_nokia_widget = 1;
 }
 else
 {
-	print "\n NOKIA WGT \n";
+print "\nNOKIA WGT \n";
-	$non_nokia_widget = 0;
+$non_nokia_widget = 0;
 }
 if (($filename =~ /.wgz/ )&& (my $plist = catfile($tempdir, $root, 'Info.plist')))
 {
 # Parse the XML file into a hash
 $widgetdata = parsePList($plist);
 }
 elsif (($filename =~ /.wgt/ ) && ( my $confxml = catfile($tempdir, $root, 'config.xml')))
 {
-print (" W3C widget \n");
+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 && $isSharedWidget)) && (!$self->{'secure'}{lc $filename}))
+if( ((!$isSharedLibrary) || ($isSharedLibrary && $isSharedIcon)) && (!$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 && $isSharedWidget))
+if( (!$isSharedLibrary) || ($isSharedLibrary && $isSharedIcon))
 {
 my $mbmName = sprintf("[%08x].mbm", $widgetdata->{'Uid'});
 my $destFile;
 if($w3c_widget)
 {
 # Generate the registry and IBY file
 $self->addToRomList($drive, $self->makeRegistry($drive, \@installedProps, 0));
 $self->addToRomList($drive, $self->makeRegistry($drive, \@installedCWRTProps, 1));
-print "\n\n %%%%%          WIDGET PRE-INSTALLATION completed for Drive $drive          %%%%% \n\n";
+print "\n\n%%%%%          WIDGET PRE-INSTALLATION completed for Drive $drive          %%%%% \n\n";
 }
 sub un7zipWidget
 {
 my ( $self, $filename, $tempdir ) = @_;
 {
 my ($p, $el, %atts) = @_;
 if($el eq "widget")
 {
+my $jilFeature = JIL_NS;
+if( lc($atts{"xmlns:JIL"})=~ m/$jilFeature/i || lc($atts{"xmlns:jil"})=~ m/$jilFeature/i)
+{
+$plisthash->{'WidgetPackagingFormat'} = "jil";
+}
 if ( $atts{"id"} )
 {
 $plisthash->{'BundleIdentifier'} = $atts{"id"};
 $attributeMap = $attributeMap.WIDGET_ID.KEY_VALUE_SEPERATOR.$atts{"id"}.KEY_VALUE_PAIR_SEPERATOR;
 if ($atts{"value"})
 {
 $attributeMap = $attributeMap.$featureParamMap.KEY_ATTR_SEPERATOR."value".KEY_VALUE_SEPERATOR.$atts{"value"}.KEY_VALUE_PAIR_SEPERATOR;
 }
 }
-elsif ($el eq "access" || $el eq "jil:access")
+elsif ($el eq "access" || $el eq "jil:access" || $el eq "JIL:access")
 {
 $accessMap = WIDGET_ACCESS . $accessCount;
 $attributeMap = $attributeMap.$accessMap.KEY_VALUE_SEPERATOR.KEY_VALUE_PAIR_SEPERATOR;
 if ( $atts{"network"} )
 my $registry = fixFilename(catfile($self->destLocation($drive), WIDGET_REGISTRY));
 # 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");
+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");
+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};
 my ( $reg, $loc ) = ( catfile($dest, sprintf("%08x_reg.rsc", $uid)), catfile($dest, sprintf("%08x_loc.rsc", $uid)) );
 unlink $mbm, $reg, $loc;
 # We also have to delete the widget directory otherwise it'll be re-registered
 my $id = $entry->{prop}->{BundleIdentifier}->{val}->{content};
-print " Unregistering $id ";
+print "Unregistering $id\n";
 my $basepath = $entry->{prop}->{BasePath}->{val}->{content};
 $w3c_widget = 1;
 my $sharedLib = "lib";          #BasePath will have lib only if the widget is shared Library
 if($basepath =~ m/$sharedLib/)
 	$non_nokia_widget = 1;
 }
 #sharedFolderName TBD
 my $dir = $self->installDir($drive, $id);
 rmtree $dir;
-print("BasePath:$basepath \nIs Non-Nokia? $non_nokia_widget		Is SharedLibrary? $isSharedLibrary \nDirectory:$dir \n");
+$dir =~ s/widgets_21D_4C7/data/;
-$dir =~ s/widgets_21D_4C7/data/;
 rmtree $dir;
 }
 }
 #delete CWRT webapp DB if exists
 my $cwrtdbPath = catfile($self->destLocation($drive), CWRT_WEBAPP_REGISTRY);
 	 print $fh "<prop>$key<val>$data->{$key}<type>$type</type></val></prop>\n" if defined $data->{$key};
 	}
 }
 }
 print $fh "</entry>\n";
-print "\n Is a w3c widget? -- $w3c\n";
 if( $w3c )
 {
 my $dbPath = fixFilename(catfile($self->destLocation('C'), CWRT_WEBAPP_REGISTRY));
 mkpath dirname($dbPath);
 die "ERROR: Can't find CWRTWebAppRegistry.exe in PATH" if !(my $cmd = findCmd('CWRTWebAppRegistry.exe'));
 my $regCmd;
 if($encodeddata->{'AttributeList'})
 {
-print "\n AttributeList argument sent to DB\n";
+print "\nAttributeList argument sent to DB\n";
 $regCmd = "$cmd $dbPath $encodeddata->{'BundleIdentifier'} $encodeddata->{'Uid'} $encodeddata->{'BundleDisplayName'} $encodeddata->{'BasePath'} $encodeddata->{'DBIconPath'} $encodeddata->{'WidgetPackagingFormat'} $encodeddata->{'MainHTML'} $encodeddata->{'AttributeList'}";
 }
 else
 {
-print "\n AttributeList argument not sent to DB\n";
+print "\nAttributeList argument not sent to DB\n";
 $regCmd = "$cmd $dbPath $encodeddata->{'BundleIdentifier'} $encodeddata->{'Uid'} $encodeddata->{'BundleDisplayName'} $encodeddata->{'BasePath'} $encodeddata->{'DBIconPath'} $encodeddata->{'WidgetPackagingFormat'} $encodeddata->{'MainHTML'}";
 }
 print "\n regCmd : $regCmd \n\n";
 system($regCmd);
 }

branch	RCL_3
changeset 34	60c10715f092
parent 33	04b7640f6fb5
child 36	a3ff8024e841