# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1268571868 0
# Node ID 9b0e0f600ff50a66adc334e435674f4d29e0308d
# Parent  ed9c993d0f5dded1fed74c4d0be74fd422539382# Parent  882d065be445437c2631fee210b2bfba14829230
Catch up from PDK_3.0.h - now identical

diff -r ed9c993d0f5d -r 9b0e0f600ff5 dtdinstaller/bin/dtd_installer.pl
--- a/dtdinstaller/bin/dtd_installer.pl	Mon Mar 08 21:43:12 2010 +0000
+++ b/dtdinstaller/bin/dtd_installer.pl	Sun Mar 14 13:04:28 2010 +0000
@@ -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 ed9c993d0f5d -r 9b0e0f600ff5 dtdinstaller/config/export.mk
--- a/dtdinstaller/config/export.mk	Mon Mar 08 21:43:12 2010 +0000
+++ b/dtdinstaller/config/export.mk	Sun Mar 14 13:04:28 2010 +0000
@@ -15,7 +15,7 @@
 #
 # dtdinstaller's actual configuration export makefile
 
-MAKEFILE =	/sf/tools/homescreentools/dtdinstaller/config/export.mk
+MAKEFILE =	/sf/app/homescreentools/dtdinstaller/config/export.mk
 $(call push,MAKEFILE_STACK,$(MAKEFILE))
 
 DTDINSTALLERFILES =	$(MAKEFILEDIR)../bin/dtd_installer.pl													/epoc32/tools/ \
diff -r ed9c993d0f5d -r 9b0e0f600ff5 dtdinstaller/makefile
--- a/dtdinstaller/makefile	Mon Mar 08 21:43:12 2010 +0000
+++ b/dtdinstaller/makefile	Sun Mar 14 13:04:28 2010 +0000
@@ -1,6 +1,6 @@
 # dtdinstaller level configuration makefile 
  
-MAKEFILE = /sf/tools/homescreentools/dtdinstaller/makefile
+MAKEFILE = /sf/app/homescreentools/dtdinstaller/makefile
 
 # Place the first target as the default target which is executed from this level 
 dtdinstaller_all :: dtdinstaller_config
diff -r ed9c993d0f5d -r 9b0e0f600ff5 layers.sysdef.xml
--- a/layers.sysdef.xml	Mon Mar 08 21:43:12 2010 +0000
+++ b/layers.sysdef.xml	Sun Mar 14 13:04:28 2010 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE SystemDefinition SYSTEM "sysdef_1_4_0.dtd" [
-  <!ENTITY layer_real_source_path "sf/tools/homescreentools" >
+  <!ENTITY layer_real_source_path "sf/app/homescreentools" >
 ]>
 
 <SystemDefinition name="homescreentools" schema="1.4.0">
@@ -10,7 +10,7 @@
         <unit unitID="hsdo.dtdinstaller" mrp="" bldFile="&layer_real_source_path;/dtdinstaller/group" name="dtdinstaller" />
       </module>
     </layer>
-    <layer name="tools_layer">
+    <layer name="app_layer">
       <module name="homescreentools">
         <unit unitID="hsdo.themeinstaller" mrp="" bldFile="&layer_real_source_path;/themeinstaller/group" name="themeinstaller" />
         <unit unitID="hsdo.widgettools" mrp="" bldFile="&layer_real_source_path;/widgettools/group" name="widgettools" />
diff -r ed9c993d0f5d -r 9b0e0f600ff5 package_definition.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/package_definition.xml	Sun Mar 14 13:04:28 2010 +0000
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+  <package id="homescreentools" name="Home Screen Tools" levels="tool install">
+    <collection id="dtdinstaller" name="DTD Installer" level="install">
+      <component id="dtdinstaller_build" filter="s60" name="DTD Installer Build" target="desktop" class="tool">
+        <unit bldFile="/tools/homescreentools/dtdinstaller/group"/>
+      </component>
+    </collection>
+    <collection id="themeinstaller" name="Theme Installer" level="install">
+      <component id="themeinstaller_build" filter="s60" name="Theme Installer Build" target="desktop" class="tool">
+        <unit bldFile="/tools/homescreentools/themeinstaller/group"/>
+      </component>
+    </collection>
+    <collection id="themetool" name="Theme Tool" level="tool">
+      <component id="themetool_build" filter="s60" name="Theme Tool Build"  target="desktop" class="tool">
+        <unit bldFile="/tools/homescreentools/themetool/group"/>
+      </component>
+    </collection>
+  </package>
+</SystemDefinition>
diff -r ed9c993d0f5d -r 9b0e0f600ff5 themeinstaller/bin/themeinstaller.zip
Binary file themeinstaller/bin/themeinstaller.zip has changed
diff -r ed9c993d0f5d -r 9b0e0f600ff5 themeinstaller/source/ReadMe.txt
--- a/themeinstaller/source/ReadMe.txt	Mon Mar 08 21:43:12 2010 +0000
+++ b/themeinstaller/source/ReadMe.txt	Sun Mar 14 13:04:28 2010 +0000
@@ -55,6 +55,6 @@
 All rights reserved.
 
 This component and the accompanying materials are made available
-under the terms of the License "Symbian Foundation License v1.0"
+under the terms of the License "Eclipse Public License v1.0"
 which accompanies this distribution, and is available
-at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
\ No newline at end of file
+at the URL "http://www.eclipse.org/legal/epl-v10.html".
\ No newline at end of file
diff -r ed9c993d0f5d -r 9b0e0f600ff5 widgettools/hspluginspreinstaller/bin/hspluginpreinstaller_v_2_1.zip
Binary file widgettools/hspluginspreinstaller/bin/hspluginpreinstaller_v_2_1.zip has changed
diff -r ed9c993d0f5d -r 9b0e0f600ff5 widgettools/hspluginspreinstaller/bin/hspluginpreinstaller_v_2_2.zip
Binary file widgettools/hspluginspreinstaller/bin/hspluginpreinstaller_v_2_2.zip has changed
diff -r ed9c993d0f5d -r 9b0e0f600ff5 widgettools/hspluginspreinstaller/group/bld.inf
--- a/widgettools/hspluginspreinstaller/group/bld.inf	Mon Mar 08 21:43:12 2010 +0000
+++ b/widgettools/hspluginspreinstaller/group/bld.inf	Sun Mar 14 13:04:28 2010 +0000
@@ -18,5 +18,5 @@
 
 
 PRJ_EXPORTS
-:zip ../bin/hspluginpreinstaller_v_2_0.zip
+:zip ../bin/hspluginpreinstaller_v_2_2.zip
 
diff -r ed9c993d0f5d -r 9b0e0f600ff5 widgettools/wrtwidgetpreinstaller/bin/widgetpreinstaller_v_1_1.zip
Binary file widgettools/wrtwidgetpreinstaller/bin/widgetpreinstaller_v_1_1.zip has changed
diff -r ed9c993d0f5d -r 9b0e0f600ff5 widgettools/wrtwidgetpreinstaller/conf/availablewrtwidgets.confml
Binary file widgettools/wrtwidgetpreinstaller/conf/availablewrtwidgets.confml has changed
diff -r ed9c993d0f5d -r 9b0e0f600ff5 widgettools/wrtwidgetpreinstaller/conf/availablewrtwidgets.gcfml
--- a/widgettools/wrtwidgetpreinstaller/conf/availablewrtwidgets.gcfml	Mon Mar 08 21:43:12 2010 +0000
+++ b/widgettools/wrtwidgetpreinstaller/conf/availablewrtwidgets.gcfml	Sun Mar 14 13:04:28 2010 +0000
@@ -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 ed9c993d0f5d -r 9b0e0f600ff5 widgettools/wrtwidgetpreinstaller/group/bld.inf
--- a/widgettools/wrtwidgetpreinstaller/group/bld.inf	Mon Mar 08 21:43:12 2010 +0000
+++ b/widgettools/wrtwidgetpreinstaller/group/bld.inf	Sun Mar 14 13:04:28 2010 +0000
@@ -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)