--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sbsv2/raptor/license.txt Wed Mar 31 13:51:26 2010 +0100
@@ -0,0 +1,8 @@
+Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+All rights reserved.
+
+This component and the accompanying materials are made available
+under the terms of the License "Eclipse Public License v1.0"
+which accompanies this distribution, and is available
+at the URL "http://www.eclipse.org/legal/epl-v10.html".
+
--- a/sbsv2/raptor/util/install-windows/raptorinstallerscript.nsi Wed Mar 31 10:45:10 2010 +0100
+++ b/sbsv2/raptor/util/install-windows/raptorinstallerscript.nsi Wed Mar 31 13:51:26 2010 +0100
@@ -78,8 +78,7 @@
##################### Pages in the installer #####################
!insertmacro MUI_PAGE_WELCOME
-# Temporarily useing RELEASE-NOTES.txt as there is not license.txt
-!insertmacro MUI_PAGE_LICENSE ${RAPTOR_LOCATION}\RELEASE-NOTES.txt
+!insertmacro MUI_PAGE_LICENSE ${RAPTOR_LOCATION}\license.txt
!define MUI_PAGE_HEADER_TEXT "Installation type"
Page custom UserOrSysInstall UserOrSysInstallLeave
!define MUI_PAGE_CUSTOMFUNCTION_LEAVE DirLeave # Directory page exit function - disallow spaces in $INSTDIR
@@ -123,7 +122,9 @@
File /r /x distribution.policy.s60 /x .hg ${PYTHON_LOCATION}\*.*
SetOutPath "$INSTDIR"
- File ${RAPTOR_LOCATION}\RELEASE-NOTES.txt
+ File ${RAPTOR_LOCATION}\RELEASE-NOTES.html
+ SetOutPath "$INSTDIR\notes"
+ File /r /x distribution.policy.s60 ${RAPTOR_LOCATION}\notes\*.*
${Unless} $INSTALL_TYPE == "NO_ENV"
@@ -333,7 +334,8 @@
RmDir /r $INSTDIR\python
RmDir /r $INSTDIR\schema
RmDir /r $INSTDIR\win32
- Delete $INSTDIR\RELEASE-NOTES.txt
+ Delete $INSTDIR\RELEASE-NOTES.html
+ RmDir /r $INSTDIR\notes
Delete $INSTDIR\RaptorEnv.bat
Delete $INSTDIR\${UNINSTALLER_FILENAME}