aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Tilloy <olivier@tilloy.net>2010-03-22 16:03:06 +0100
committerOlivier Tilloy <olivier@tilloy.net>2010-03-22 16:03:06 +0100
commit8e82a1af17524cd8de06aa10878825836b96f043 (patch)
treeb1aa02080f2e5cd2a16c01514005f38069359bab
parent545c50f22b1e221778109b36d9a55501c44b5906 (diff)
downloadpyexiv2-8e82a1af17524cd8de06aa10878825836b96f043.tar.gz
Search python installed for the current user only.
Abort and quit if python not found.
-rw-r--r--win32-installer.nsi29
1 files changed, 16 insertions, 13 deletions
diff --git a/win32-installer.nsi b/win32-installer.nsi
index e5421f9..751e0d7 100644
--- a/win32-installer.nsi
+++ b/win32-installer.nsi
@@ -3,7 +3,7 @@
Name "pyexiv2 0.2"
OutFile "pyexiv2-0.2-setup.exe"
-!insertmacro MUI_PAGE_WELCOME
+;!insertmacro MUI_PAGE_WELCOME
!insertmacro MUI_PAGE_LICENSE "COPYING"
; Need for a custom page here to choose wether to install for all users or only
; for the current user.
@@ -15,17 +15,20 @@ Var python_install_path
Section "pyexiv2"
ReadRegStr $python_install_path HKLM Software\Python\PythonCore\2.6\InstallPath ""
- ;DetailPrint "Python is installed at: $python_install_path"
- ; FIXME: if python was installed for the current user only, its installation
- ; path will be found at HKEY_CURRENT_USER\SOFTWARE\Python\PythonCore\2.6\InstallPath
- SetOutPath $python_install_path\Lib\site-packages
- File build\libexiv2python.pyd
- SetOutPath $python_install_path\Lib\site-packages\pyexiv2
- File src\pyexiv2\__init__.py
- File src\pyexiv2\metadata.py
- File src\pyexiv2\exif.py
- File src\pyexiv2\iptc.py
- File src\pyexiv2\xmp.py
- File src\pyexiv2\utils.py
+ StrCmp $python_install_path "" 0 Install
+ ReadRegStr $python_install_path HKCU Software\Python\PythonCore\2.6\InstallPath ""
+ StrCmp $python_install_path "" 0 Install
+ MessageBox MB_OK|MB_ICONSTOP "Unable to locate Python 2.6."
+ Quit
+ Install:
+ SetOutPath $python_install_path\Lib\site-packages
+ File build\libexiv2python.pyd
+ SetOutPath $python_install_path\Lib\site-packages\pyexiv2
+ File src\pyexiv2\__init__.py
+ File src\pyexiv2\metadata.py
+ File src\pyexiv2\exif.py
+ File src\pyexiv2\iptc.py
+ File src\pyexiv2\xmp.py
+ File src\pyexiv2\utils.py
SectionEnd