# HG changeset patch # User Daniel Jacobs # Date 1263994263 0 # Node ID 26f2f0b4002b9c5c8a953f1dc988f5fab836e8e4 # Parent befd82d9c937eecda49d3af4213ab9f4029e0287 Update Windows installation script to put Python 2.6.4 into the Windows installer. diff -r befd82d9c937 -r 26f2f0b4002b sbsv2/raptor/util/install-windows/raptorinstallermaker.py --- a/sbsv2/raptor/util/install-windows/raptorinstallermaker.py Mon Jan 18 20:59:13 2010 +0000 +++ b/sbsv2/raptor/util/install-windows/raptorinstallermaker.py Wed Jan 20 13:31:03 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" @@ -46,7 +46,7 @@ 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..." diff -r befd82d9c937 -r 26f2f0b4002b sbsv2/raptor/util/install-windows/raptorinstallerscript.nsi --- a/sbsv2/raptor/util/install-windows/raptorinstallerscript.nsi Mon Jan 18 20:59:13 2010 +0000 +++ b/sbsv2/raptor/util/install-windows/raptorinstallerscript.nsi Wed Jan 20 13:31:03 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