diff -r e7e0ae78773e -r 5b32dc297d05 sysmodellibs/sysmodelgen/installer/SystemModelToolkit.nsi
--- a/sysmodellibs/sysmodelgen/installer/SystemModelToolkit.nsi	Tue Aug 10 14:29:28 2010 +0300
+++ b/sysmodellibs/sysmodelgen/installer/SystemModelToolkit.nsi	Wed Oct 13 14:00:36 2010 +0100
@@ -3,7 +3,7 @@
 
 ; HM NIS Edit Wizard helper defines
 !define PRODUCT_NAME "SystemModelToolkit"
-!define PRODUCT_VERSION "1.1.8"
+!define PRODUCT_VERSION "1.1.9"
 !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}"
@@ -51,40 +51,63 @@
 
   SetOutPath "$INSTDIR"
   SetOverwrite try
-  File "..\src\svg\DrawSvg.pl"
-  File "..\src\svg\distribution.policy"
+  File "..\src\old\svg\DrawSvg.pl"
 
-  SetOutPath "$INSTDIR\svg"
+  SetOutPath "$INSTDIR\src\old\svg"
   SetOverwrite try
-  File "..\src\svg\Model.xsl"
-  File "..\src\svg\Draw.xsl"
-  File "..\src\svg\Legend.xsl"
-  File "..\src\svg\DrawSvg.pm"
-  File "..\src\svg\ModelTemplate.xml"
-  File "..\src\svg\ModelTemplate.older.xml"
-  File "..\src\svg\Overlay.xsl"
-  File "..\src\svg\Postprocess.xsl"
-  File "..\src\svg\Shapes.xsl"
+  File "..\src\old\svg\Draw.xsl"
+  File "..\src\old\svg\DrawSvg.pl"
+  File "..\src\old\svg\DrawSvg.pm"
+  File "..\src\old\svg\Legend.xsl"
+  File "..\src\old\svg\Model.xsl"
+  File "..\src\old\svg\ModelTemplate.mid.xml"
+  File "..\src\old\svg\ModelTemplate.older.xml"
+  File "..\src\old\svg\ModelTemplate.xml"
+  File "..\src\old\svg\output-csv.xsl"
+  File "..\src\old\svg\output-sysdef.xsl"
+  File "..\src\old\svg\Overlay.xsl"
+  File "..\src\old\svg\Postprocess.xsl"
+  File "..\src\old\svg\Shapes.xsl"
+  File "..\src\old\svg\sysdefdowngrade.xsl"
+  File "..\src\old\svg\validate-raw.xsl"
+  File "..\src\old\svg\validate.xsl"
+
+  SetOutPath "$INSTDIR\src\old\resources\auxiliary"
+  SetOverwrite try
+  File "..\src\old\resources\auxiliary\display-names.xml"
+  File "..\src\old\resources\auxiliary\Example-shapes.xml"
+  File "..\src\old\resources\auxiliary\Levels.xml"
+  File "..\src\old\resources\auxiliary\Levels91.xml"
+  File "..\src\old\resources\auxiliary\Shapes.xml"
+  File "..\src\old\resources\auxiliary\system_model_colors.xml"
+  File "..\src\old\resources\auxiliary\SystemInfo.xml"
 
 
-  SetOutPath "$INSTDIR\common"
+  SetOutPath "$INSTDIR\src\old\resources\xsd"
   SetOverwrite try
-  File "..\src\common\DepConstants.pm"
-  File "..\src\common\Logger.pm"
-  File "..\src\common\LogItem.pm"
-  File "..\src\common\distribution.policy"
+  File "..\src\old\resources\xsd\Border-shapes.xsd"
+  File "..\src\old\resources\xsd\Border-styles.xsd"
+  File "..\src\old\resources\xsd\Colours.xsd"
+  File "..\src\old\resources\xsd\Levels.xsd"
+  File "..\src\old\resources\xsd\Localisation.xsd"
+  File "..\src\old\resources\xsd\Patterns.xsd"
+  File "..\src\old\resources\xsd\Shapes.xsd"
 
-  SetOutPath "$INSTDIR\resources\installed\Xalan"
+  
+  SetOutPath "$INSTDIR\src"
   SetOverwrite try
-  File "..\resources\installed\Xalan\DISTRIBUTION.POLICY"
-  File "..\resources\installed\Xalan\Xalan-C_1_8.dll"
-  File "..\resources\installed\Xalan\Xalan.exe"
-  File "..\resources\installed\Xalan\XalanMessages_1_8.dll"
-  File "..\resources\installed\Xalan\xerces-c_2_5_0.dll"
+  File "..\src\Logger.pm"
+  File "..\src\LogItem.pm"
+
+  SetOutPath "$INSTDIR\rsc\installed\Xalan"
+  SetOverwrite try
+  File "..\rsc\installed\Xalan\Xalan-C_1_8.dll"
+  File "..\rsc\installed\Xalan\Xalan.exe"
+  File "..\rsc\installed\Xalan\XalanMessages_1_8.dll"
+  File "..\rsc\installed\Xalan\xerces-c_2_5_0.dll"
 
   SetOutPath "$INSTDIR\resources\auxiliary"
   SetOverwrite try
-  File "..\resources\auxiliary\DISTRIBUTION.POLICY"
   File "..\resources\auxiliary\system_model_colors.xml"
   File "..\resources\auxiliary\display-names.xml"
   File "..\resources\auxiliary\Levels.xml"
@@ -93,16 +116,6 @@
   File "..\resources\auxiliary\Example-shapes.xml"
   File "..\resources\auxiliary\SystemInfo.xml"
 
-  SetOutPath "$INSTDIR\docs"
-  SetOverwrite try
-  File "..\docs\Building the System Model.doc"
-  File "..\docs\Customising the System Model Presentation.doc"
-  File "..\docs\distribution.policy"
-  File "..\docs\dep.css"
-  File "..\docs\guide.css"
-  File "..\docs\sample_drawsvg.ini"
-  File "..\docs\SystemModelToolkitInstaller_main.jpg"
-  File "..\docs\user_guide_system_model_toolkit.html"
 
 
 SectionEnd
@@ -134,50 +147,46 @@
 Section Uninstall
 
   Delete "$INSTDIR\uninst.exe"
-  Delete "$INSTDIR\DrawSvg.pl"
-  Delete "$INSTDIR\distribution.policy"
-  Delete "$INSTDIR\svg\Draw.xsl"
-  Delete "$INSTDIR\svg\Legend.xsl"
-  Delete "$INSTDIR\svg\DrawSvg.pm"
-  Delete "$INSTDIR\svg\Model.xsl"
-  Delete "$INSTDIR\svg\ModelTemplate.xml"
-  Delete "$INSTDIR\svg\ModelTemplate.older.xml"
-  Delete "$INSTDIR\svg\Overlay.xsl"
-  Delete "$INSTDIR\svg\Postprocess.xsl"
-  Delete "$INSTDIR\svg\Shapes.xsl"
-  Delete "$INSTDIR\common\DepConstants.pm"
-  Delete "$INSTDIR\common\Logger.pm"
-  Delete "$INSTDIR\common\LogItem.pm"
-  Delete "$INSTDIR\common\distribution.policy"
-  Delete "$INSTDIR\resources\installed\Xalan\DISTRIBUTION.POLICY"
-  Delete "$INSTDIR\resources\installed\Xalan\Xalan-C_1_8.dll"
-  Delete "$INSTDIR\resources\installed\Xalan\Xalan.exe"
-  Delete "$INSTDIR\resources\installed\Xalan\XalanMessages_1_8.dll"
-  Delete "$INSTDIR\resources\installed\Xalan\xerces-c_2_5_0.dll"
-  Delete "$INSTDIR\resources\auxiliary\DISTRIBUTION.POLICY"
-  Delete "$INSTDIR\resources\auxiliary\system_model_colors.xml"
-  Delete "$INSTDIR\resources\auxiliary\display-names.xml"
-  Delete "$INSTDIR\resources\auxiliary\Levels.xml"
-  Delete "$INSTDIR\resources\auxiliary\Levels91.xml"
-  Delete "$INSTDIR\resources\auxiliary\Shapes.xml"
-  Delete "$INSTDIR\resources\auxiliary\Example-shapes.xml"
-  Delete "$INSTDIR\resources\auxiliary\SystemInfo.xml"
-  Delete "$INSTDIR\docs\Building the System Model.doc"
-  Delete "$INSTDIR\docs\Customising the System Model Presentation.doc"
-  Delete "$INSTDIR\docs\distribution.policy"
-  Delete "$INSTDIR\docs\dep.css"
-  Delete "$INSTDIR\docs\guide.css"
-  Delete "$INSTDIR\docs\sample_drawsvg.ini"
-  Delete "$INSTDIR\docs\SystemModelToolkitInstaller_main.jpg"
-  Delete "$INSTDIR\docs\user_guide_system_model_toolkit.html"
+  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\src\old\resources\auxiliary\display-names.xml"
+  Delete "$INSTDIR\src\old\resources\auxiliary\Example-shapes.xml"
+  Delete "$INSTDIR\src\old\resources\auxiliary\Levels.xml"
+  Delete "$INSTDIR\src\old\resources\auxiliary\Levels91.xml"
+  Delete "$INSTDIR\src\old\resources\auxiliary\Shapes.xml"
+  Delete "$INSTDIR\src\old\resources\auxiliary\system_model_colors.xml"
+  Delete "$INSTDIR\src\old\resources\auxiliary\SystemInfo.xml"
+  Delete "$INSTDIR\src\old\resources\xsd\Border-shapes.xsd"
+  Delete "$INSTDIR\src\old\resources\xsd\Border-styles.xsd"
+  Delete "$INSTDIR\src\old\resources\xsd\Colours.xsd"
+  Delete "$INSTDIR\src\old\resources\xsd\Levels.xsd"
+  Delete "$INSTDIR\src\old\resources\xsd\Localisation.xsd"
+  Delete "$INSTDIR\src\old\resources\xsd\Patterns.xsd"
+  Delete "$INSTDIR\src\old\resources\xsd\Shapes.xsd"
+  Delete "$INSTDIR\src\old\svg\Draw.xsl"
+  Delete "$INSTDIR\src\old\svg\DrawSvg.pl"
+  Delete "$INSTDIR\src\old\svg\DrawSvg.pm"
+  Delete "$INSTDIR\src\old\svg\Legend.xsl"
+  Delete "$INSTDIR\src\old\svg\Model.xsl"
+  Delete "$INSTDIR\src\old\svg\ModelTemplate.mid.xml"
+  Delete "$INSTDIR\src\old\svg\ModelTemplate.older.xml"
+  Delete "$INSTDIR\src\old\svg\ModelTemplate.xml"
+  Delete "$INSTDIR\src\old\svg\output-csv.xsl"
+  Delete "$INSTDIR\src\old\svg\output-sysdef.xsl"
+  Delete "$INSTDIR\src\old\svg\Overlay.xsl"
+  Delete "$INSTDIR\src\old\svg\Postprocess.xsl"
+  Delete "$INSTDIR\src\old\svg\Shapes.xsl"
+  Delete "$INSTDIR\src\old\svg\sysdefdowngrade.xsl"
+  Delete "$INSTDIR\src\Logger.pm"
+  Delete "$INSTDIR\src\LogItem.pm"
 
-  RMDir "$INSTDIR\svg"
+  RMDir "$INSTDIR\src\old\svg"
   RMDir "$INSTDIR\common"
-  RMDir "$INSTDIR\resources\installed\Xalan"
-  RMDir "$INSTDIR\resources\installed"
-  RMDir "$INSTDIR\resources\auxiliary"
-  RMDir "$INSTDIR\resources"
-  RMDir "$INSTDIR\docs"
+  RMDir "$INSTDIR\src\old\resources\auxiliary"
+  RMDir "$INSTDIR\src\old\resources"
+  RMDir "$INSTDIR\rsc"
   RMDir "$INSTDIR"
 
   DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"