# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1266612193 -7200
# Node ID 882d065be445437c2631fee210b2bfba14829230
# Parent  05da4621cfb2a3b0325b9e33bd8f7c7065db2144
Revision: 201003
Kit: 201007

diff -r 05da4621cfb2 -r 882d065be445 dtdinstaller/bin/dtd_installer.pl
--- a/dtdinstaller/bin/dtd_installer.pl	Tue Feb 02 00:15:44 2010 +0200
+++ b/dtdinstaller/bin/dtd_installer.pl	Fri Feb 19 22:43:13 2010 +0200
@@ -324,7 +324,7 @@
 		    	my $temp=$1; # lang code	
 		    	my $temp2=$3;	# file name
 		    	if ((lc $2) eq "sources") {
-		    		$out_file = "${out_path}\\$2\\$3";
+		    		$out_file = "${out_path}\\$3";
 		    	} else {
 		    		if (length($temp) > 4) { #skip extra files
 		    			next;
@@ -457,7 +457,7 @@
 	$file_name =~ s/\//\\/g;    #Change / marks to \
 	chomp $file_name;
 	next if ( -d $file_name ); # Skip directories
-	next if ((!($file_name =~ /o0000/i)) && (!($file_name =~ /\/sources\//i))); # Skip other then resource and source files
+	next if ((!($file_name =~ /o0000/i)) && (!($file_name =~ /\\sources\\/i))); # Skip other then resource and source files
 	push @find_files, $file_name;
 }
 
diff -r 05da4621cfb2 -r 882d065be445 themeinstaller/bin/themeinstaller.zip
Binary file themeinstaller/bin/themeinstaller.zip has changed
diff -r 05da4621cfb2 -r 882d065be445 widgettools/hspluginspreinstaller/bin/hspluginpreinstaller_v_2_1.zip
Binary file widgettools/hspluginspreinstaller/bin/hspluginpreinstaller_v_2_1.zip has changed
diff -r 05da4621cfb2 -r 882d065be445 widgettools/hspluginspreinstaller/bin/hspluginpreinstaller_v_2_2.zip
Binary file widgettools/hspluginspreinstaller/bin/hspluginpreinstaller_v_2_2.zip has changed
diff -r 05da4621cfb2 -r 882d065be445 widgettools/hspluginspreinstaller/group/bld.inf
--- a/widgettools/hspluginspreinstaller/group/bld.inf	Tue Feb 02 00:15:44 2010 +0200
+++ b/widgettools/hspluginspreinstaller/group/bld.inf	Fri Feb 19 22:43:13 2010 +0200
@@ -18,5 +18,5 @@
 
 
 PRJ_EXPORTS
-:zip ../bin/hspluginpreinstaller_v_2_0.zip
+:zip ../bin/hspluginpreinstaller_v_2_2.zip
 
diff -r 05da4621cfb2 -r 882d065be445 widgettools/wrtwidgetpreinstaller/bin/widgetpreinstaller_v_1_1.zip
Binary file widgettools/wrtwidgetpreinstaller/bin/widgetpreinstaller_v_1_1.zip has changed
diff -r 05da4621cfb2 -r 882d065be445 widgettools/wrtwidgetpreinstaller/conf/availablewrtwidgets.confml
Binary file widgettools/wrtwidgetpreinstaller/conf/availablewrtwidgets.confml has changed
diff -r 05da4621cfb2 -r 882d065be445 widgettools/wrtwidgetpreinstaller/conf/availablewrtwidgets.gcfml
--- a/widgettools/wrtwidgetpreinstaller/conf/availablewrtwidgets.gcfml	Tue Feb 02 00:15:44 2010 +0200
+++ b/widgettools/wrtwidgetpreinstaller/conf/availablewrtwidgets.gcfml	Fri Feb 19 22:43:13 2010 +0200
@@ -1,20 +1,18 @@
-<file xmlns="http://www.s60.com/xml/genconfml/1" name="widget_config.ini" target="epoc32\tools\rom\">
+<file xmlns="http://www.s60.com/xml/genconfml/1" name="widget_config.ini" target="\epoc32\tools\widget_tools\widgetpreinstaller\">
 	<setting ref="WrtWidgetsC/WrtWidgetC"/>
 	<setting ref="WrtWidgetsC/DriveC"/>
-	<setting ref="WrtWidgetsC/CommandsExtension"/>
 	<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/TR/xhtml1/strict">
-		<xsl:output method="text" encoding="UTF-16"/>
+		<xsl:output method="text" encoding="UTF-8"/>
 		<xsl:template match="configuration/data">
 		<xsl:value-of select="WrtWidgetsC/DriveC"/><xsl:text>&#xA;</xsl:text>
 			<xsl:for-each select="WrtWidgetsC/WrtWidgetC">
 			 <xsl:if test="PreInstalled = 1">
-				<xsl:value-of select="path" /><xsl:text>&#x20;</xsl:text><xsl:value-of select="homescreen"/> <xsl:text>&#xA;</xsl:text>
+				<xsl:value-of select="path" />
+				<xsl:text>&#x20;</xsl:text>
+				<xsl:value-of select="homescreen"/> 
+				<xsl:text>&#xA;</xsl:text>
 			 </xsl:if>
-			</xsl:for-each>
-		  <xsl:text>&#xA;</xsl:text>[run-commands]<xsl:text>&#xA;</xsl:text>
-		  <xsl:for-each select="WrtWidgetsC/CommandsExtension">				
-				<xsl:value-of select="CommandExt" /><xsl:text>&#xA;</xsl:text>			
-		  </xsl:for-each>
+			</xsl:for-each>	  
 		</xsl:template>
 	</xsl:stylesheet>
 </file>
diff -r 05da4621cfb2 -r 882d065be445 widgettools/wrtwidgetpreinstaller/group/bld.inf
--- a/widgettools/wrtwidgetpreinstaller/group/bld.inf	Tue Feb 02 00:15:44 2010 +0200
+++ b/widgettools/wrtwidgetpreinstaller/group/bld.inf	Fri Feb 19 22:43:13 2010 +0200
@@ -18,7 +18,7 @@
 
 
 PRJ_EXPORTS
-:zip ../bin/widgetpreinstaller.zip
+:zip ../bin/widgetpreinstaller_v_1_1.zip
 
-//../conf/availablewrtwidgets.confml   APP_LAYER_CONFML(availablewrtwidgets.confml)
-//../conf/availablewrtwidgets.gcfml    APP_LAYER_GCFML(availablewrtwidgets.gcfml)
+../conf/availablewrtwidgets.confml   APP_LAYER_CONFML(availablewrtwidgets.confml)
+../conf/availablewrtwidgets.gcfml    APP_LAYER_GCFML(availablewrtwidgets.gcfml)