# HG changeset patch
# User timothy.murphy@nokia.com
# Date 1264012113 0
# Node ID df63379a03bda3b9b183cdca12697734b247b7ae
# Parent  4afe202ba8fa16508cd6dc3361d340c550339d50# Parent  a00bdef52597fe8e948e47277149a12cd70d55d8
Merge: installer stuff

diff -r 4afe202ba8fa -r df63379a03bd sbsv2/raptor/util/install-windows/raptorinstallermaker.py
--- a/sbsv2/raptor/util/install-windows/raptorinstallermaker.py	Wed Jan 20 18:22:44 2010 +0000
+++ b/sbsv2/raptor/util/install-windows/raptorinstallermaker.py	Wed Jan 20 18:28:33 2010 +0000
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+# Copyright (c) 2009-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"
@@ -33,7 +33,7 @@
 parser.add_option("-s", "--sbs-home", dest="sbshome",
                   help="Path to use as SBS_HOME environment variable. If not present the script exits.")
 parser.add_option("-w", "--win32-support", dest="win32support",
-                  help="Path to use as SBS_HOME environment variable. If not present the script exits.")
+                  help="Path to Win32 support directory. If not present the script exits.")
 
 (options, args) = parser.parse_args()
 
@@ -46,10 +46,10 @@
 	sys.exit(2)
 else:
 	# Required irectories inside the win32-support repository
-	win32supportdirs = ["bv", "cygwin", "mingw", "python252"]
+	win32supportdirs = ["bv", "cygwin", "mingw", "python264"]
 	for dir in win32supportdirs:
 		if not os.path.isdir(os.path.join(options.win32support, dir)):
-			print "ERROR: directory %s does not exist. Cannot build installer. Exiting..."
+			print "ERROR: directory %s does not exist. Cannot build installer. Exiting..." % dir
 			sys.exit(2)
 
 def parseconfig(xmlFile="raptorinstallermaker.xml"):
@@ -57,7 +57,7 @@
 
 def generateinstallerversionheader(sbshome = None):
 	shellenv = os.environ.copy()
-	shellenv["PYTHONPATH"] = os.path.join(os.environ["SBS_HOME"], "python")
+	shellenv["PYTHONPATH"] = os.path.join(sbshome, "python")
 	
 	raptorversioncommand = "python -c \"import raptor_version; print raptor_version.numericversion()\""
 	
diff -r 4afe202ba8fa -r df63379a03bd sbsv2/raptor/util/install-windows/raptorinstallerscript.nsi
--- a/sbsv2/raptor/util/install-windows/raptorinstallerscript.nsi	Wed Jan 20 18:22:44 2010 +0000
+++ b/sbsv2/raptor/util/install-windows/raptorinstallerscript.nsi	Wed Jan 20 18:28:33 2010 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+# Copyright (c) 2009-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"
@@ -120,8 +120,8 @@
     File /r /x distribution.policy.s60 /x .hg ${WIN32SUPPORT}\cygwin\*.*
     SetOutPath "$INSTDIR\win32\mingw"
     File /r /x distribution.policy.s60 /x .hg ${WIN32SUPPORT}\mingw\*.*
-    SetOutPath "$INSTDIR\win32\python252"
-    File /r /x distribution.policy.s60 /x .hg ${WIN32SUPPORT}\python252\*.*
+    SetOutPath "$INSTDIR\win32\python264"
+    File /r /x distribution.policy.s60 /x .hg ${WIN32SUPPORT}\python264\*.*
     
     SetOutPath "$INSTDIR"
     File ${RAPTOR_LOCATION}\RELEASE-NOTES.txt