diff -r 5b32dc297d05 -r 3c36c452f013 sysmodellibs/sysmodelgen/installer/SystemModelToolkit.nsi
--- a/sysmodellibs/sysmodelgen/installer/SystemModelToolkit.nsi	Wed Oct 13 14:00:36 2010 +0100
+++ b/sysmodellibs/sysmodelgen/installer/SystemModelToolkit.nsi	Wed Oct 13 16:21:25 2010 +0100
@@ -2,8 +2,8 @@
 ; Script generated by the HM NIS Edit Script Wizard.
 
 ; HM NIS Edit Wizard helper defines
-!define PRODUCT_NAME "SystemModelToolkit"
-!define PRODUCT_VERSION "1.1.9"
+!define PRODUCT_NAME "SystemModelGenerator"
+!define PRODUCT_VERSION "2.0.0"
 !define PRODUCT_PUBLISHER "Symbian Software Ltd"
 !define PRODUCT_WEB_SITE "http://www.symbian.com"
 !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
@@ -18,7 +18,7 @@
 !define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\modern-uninstall-full.ico"
 
 ; Welcome page
-!define MUI_WELCOMEPAGE_TEXT "This wizard will guide you through the installation of SystemModelToolkit 1.1\n\nClick Next to continue..."
+!define MUI_WELCOMEPAGE_TEXT "This wizard will guide you through the installation of SystemModelGenerator 2.0\n\nClick Next to continue..."
 !insertmacro MUI_PAGE_WELCOME
 ; License page
 !define MUI_LICENSEPAGE_CHECKBOX
@@ -39,8 +39,8 @@
 ; MUI end ------
 
 Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"
-OutFile "SystemModelToolkitInstaller.exe"
-InstallDir "D:\SystemModelToolkit"
+OutFile "SystemModelGeneratorInstaller.exe"
+InstallDir "C:\Apps\SystemModelGenerator"
 InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" ""
 ShowInstDetails show
 ShowUnInstDetails show
@@ -51,7 +51,7 @@
 
   SetOutPath "$INSTDIR"
   SetOverwrite try
-  File "..\src\old\svg\DrawSvg.pl"
+  File "..\SysModGen.pl"
 
   SetOutPath "$INSTDIR\src\old\svg"
   SetOverwrite try
@@ -98,6 +98,39 @@
   SetOverwrite try
   File "..\src\Logger.pm"
   File "..\src\LogItem.pm"
+  File "..\src\SysModelGen.pm"
+
+
+  SetOutPath "$INSTDIR\core"
+  SetOverwrite try
+  File "..\core\draw-model.xsl"
+  File "..\core\draw.xsl"
+  File "..\core\filtersysdef-module.xsl"
+  File "..\core\joinmodel.xsl"
+  File "..\core\joinsysdef-module.xsl"
+  File "..\core\joinsysdef.xsl"
+  File "..\core\layout-module.xsl"
+  File "..\core\layoutsysdef.xsl"
+  File "..\core\legend-module.xsl"
+  File "..\core\legend.xsl"
+  File "..\core\mergesysdef-module.xsl"
+  File "..\core\mergesysdef.xsl"
+  File "..\core\overlay-module.xsl"
+  File "..\core\shapes.xsl"
+
+  SetOutPath "$INSTDIR\extra"
+  SetOverwrite try
+  File "..\extra\css-module.xsl"
+  File "..\extra\css2xml.xsl"
+  File "..\extra\dependencies.xsl"
+  File "..\extra\makeabbrev.xsl"
+  File "..\extra\output-csv.xsl"
+  File "..\extra\output-sysdef.xsl"
+  File "..\extra\postprocess.xsl"
+  File "..\extra\tovisio.xsl"
+  File "..\extra\validate-raw.xsl"
+  File "..\extra\validate.xsl"
+  File "..\extra\sample_config.ini"
 
   SetOutPath "$INSTDIR\rsc\installed\Xalan"
   SetOverwrite try
@@ -106,16 +139,15 @@
   File "..\rsc\installed\Xalan\XalanMessages_1_8.dll"
   File "..\rsc\installed\Xalan\xerces-c_2_5_0.dll"
 
-  SetOutPath "$INSTDIR\resources\auxiliary"
+  SetOutPath "$INSTDIR\rsc"
   SetOverwrite try
-  File "..\resources\auxiliary\system_model_colors.xml"
-  File "..\resources\auxiliary\display-names.xml"
-  File "..\resources\auxiliary\Levels.xml"
-  File "..\resources\auxiliary\Levels91.xml"
-  File "..\resources\auxiliary\Shapes.xml"
-  File "..\resources\auxiliary\Example-shapes.xml"
-  File "..\resources\auxiliary\SystemInfo.xml"
-
+  File "..\rsc\dictionary.xml"
+  File "..\rsc\fshapes.xml"
+  File "..\rsc\ModelTemplate.94.xml"
+  File "..\rsc\ModelTemplate.95.xml"
+  File "..\rsc\ModelTemplate.older.xml"
+  File "..\rsc\ModelTemplate.xml"
+  File "..\rsc\shapes.xml"
 
 
 SectionEnd
@@ -147,10 +179,42 @@
 Section Uninstall
 
   Delete "$INSTDIR\uninst.exe"
+  Delete "$INSTDIR\core\draw-model.xsl"
+  Delete "$INSTDIR\core\draw.xsl"
+  Delete "$INSTDIR\core\filtersysdef-module.xsl"
+  Delete "$INSTDIR\core\joinmodel.xsl"
+  Delete "$INSTDIR\core\joinsysdef-module.xsl"
+  Delete "$INSTDIR\core\joinsysdef.xsl"
+  Delete "$INSTDIR\core\layout-module.xsl"
+  Delete "$INSTDIR\core\layoutsysdef.xsl"
+  Delete "$INSTDIR\core\legend-module.xsl"
+  Delete "$INSTDIR\core\legend.xsl"
+  Delete "$INSTDIR\core\mergesysdef-module.xsl"
+  Delete "$INSTDIR\core\mergesysdef.xsl"
+  Delete "$INSTDIR\core\overlay-module.xsl"
+  Delete "$INSTDIR\core\shapes.xsl"
+  Delete "$INSTDIR\extra\css-module.xsl"
+  Delete "$INSTDIR\extra\css2xml.xsl"
+  Delete "$INSTDIR\extra\dependencies.xsl"
+  Delete "$INSTDIR\extra\makeabbrev.xsl"
+  Delete "$INSTDIR\extra\output-csv.xsl"
+  Delete "$INSTDIR\extra\output-sysdef.xsl"
+  Delete "$INSTDIR\extra\postprocess.xsl"
+  Delete "$INSTDIR\extra\sample_config.ini"
+  Delete "$INSTDIR\extra\tovisio.xsl"
+  Delete "$INSTDIR\extra\validate-raw.xsl"
+  Delete "$INSTDIR\extra\validate.xsl"
+  Delete "$INSTDIR\rsc\dictionary.xml"
+  Delete "$INSTDIR\rsc\fshapes.xml"
   Delete "$INSTDIR\rsc\installed\Xalan\Xalan-C_1_8.dll"
   Delete "$INSTDIR\rsc\installed\Xalan\Xalan.exe"
   Delete "$INSTDIR\rsc\installed\Xalan\XalanMessages_1_8.dll"
   Delete "$INSTDIR\rsc\installed\Xalan\xerces-c_2_5_0.dll"
+  Delete "$INSTDIR\rsc\ModelTemplate.94.xml"
+  Delete "$INSTDIR\rsc\ModelTemplate.95.xml"
+  Delete "$INSTDIR\rsc\ModelTemplate.older.xml"
+  Delete "$INSTDIR\rsc\ModelTemplate.xml"
+  Delete "$INSTDIR\rsc\shapes.xml"
   Delete "$INSTDIR\src\old\resources\auxiliary\display-names.xml"
   Delete "$INSTDIR\src\old\resources\auxiliary\Example-shapes.xml"
   Delete "$INSTDIR\src\old\resources\auxiliary\Levels.xml"
@@ -179,13 +243,21 @@
   Delete "$INSTDIR\src\old\svg\Postprocess.xsl"
   Delete "$INSTDIR\src\old\svg\Shapes.xsl"
   Delete "$INSTDIR\src\old\svg\sysdefdowngrade.xsl"
+  Delete "$INSTDIR\src\old\svg\validate-raw.xsl"
+  Delete "$INSTDIR\src\old\svg\validate.xsl"
   Delete "$INSTDIR\src\Logger.pm"
   Delete "$INSTDIR\src\LogItem.pm"
+  Delete "$INSTDIR\src\SysModelGen.pm"
+  Delete "$INSTDIR\SysModGen.pl"
 
   RMDir "$INSTDIR\src\old\svg"
   RMDir "$INSTDIR\common"
+  RMDir "$INSTDIR\src\old\resources\installed\Xalan"
+  RMDir "$INSTDIR\src\old\resources\installed"
   RMDir "$INSTDIR\src\old\resources\auxiliary"
   RMDir "$INSTDIR\src\old\resources"
+  RMDir "$INSTDIR\core"
+  RMDir "$INSTDIR\extra"
   RMDir "$INSTDIR\rsc"
   RMDir "$INSTDIR"