From e63813864a5922115a61052b4fa469921c706e64 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Fri, 6 Oct 2017 13:37:18 +0200 Subject: [PATCH 1/2] [FIX] package: remove unwanted char from install path Purpose: When installing postgresql under windows, the '+' character is unallowed. This was creating a bug when using the windows installer the enterprise version which derivate the install path from the version number. --- setup/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup/package.py b/setup/package.py index 56805d14683..3fcb96aed92 100755 --- a/setup/package.py +++ b/setup/package.py @@ -216,7 +216,7 @@ class KVM(object): class KVMWinBuildExe(KVM): def run(self): with open(join(self.o.build_dir, 'setup/win32/Makefile.version'), 'w') as f: - f.write("VERSION=%s\n" % version.replace('~', '_')) + f.write("VERSION=%s\n" % version.replace('~', '_').replace('+', '')) with open(join(self.o.build_dir, 'setup/win32/Makefile.python'), 'w') as f: f.write("PYTHON_VERSION=%s\n" % self.o.vm_winxp_python_version.replace('.', '')) with open(join(self.o.build_dir, 'setup/win32/Makefile.servicename'), 'w') as f: From 1ca2db0a61c5d4e1b4e816df11a661ffdf0ab403 Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Fri, 6 Oct 2017 13:48:22 +0200 Subject: [PATCH 2/2] [FIX] setup win32: remove python and nssm on uninstall Purpose: When uninstalling using the windows uninstaller, python and nssm were left beyond. This fix removes the python and nssm dirs also. --- setup/win32/setup.nsi | 2 ++ 1 file changed, 2 insertions(+) diff --git a/setup/win32/setup.nsi b/setup/win32/setup.nsi index 004ea5f398e..10dbc9e52d8 100755 --- a/setup/win32/setup.nsi +++ b/setup/win32/setup.nsi @@ -312,6 +312,8 @@ Section "Uninstall" Rmdir /r "$INSTDIR\server" Rmdir /r "$INSTDIR\thirdparty" + Rmdir /r "$INSTDIR\python" + Rmdir /r "$INSTDIR\nssm" DeleteRegKey HKLM "${UNINSTALL_REGISTRY_KEY}" SectionEnd