Update Windows python to 3.6

update deps fix install process
opensvc · Oct 22, 2018 · 142935d · 142935d
1 parent f143dfb
commit 142935d
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/bin/pkg/winbuilder/Makefile b/bin/pkg/winbuilder/Makefile
@@ -13,7 +13,7 @@ the environment. OSVCMAKEVERSION and OSVCMAKERELEASE have to be defined.
 !endif
 
 # App Info
-PRJMANUFACTURER=OpenSVC SARL
+PRJMANUFACTURER=OpenSVC
 PRJBUILDER=Arnaud Veron
 PRJNAME=OpenSVC
 PRJFWRULE1NAME=OpenSVC Listener
@@ -45,7 +45,7 @@ TEMPO=C:\windows\temp\ExcludeList.txt
 
 OUTDIR=$(OSVCBUILD)\wix
 WXSDIR=$(OSVCBUILD)\wxs
-VCREDISTX86=$(OSVCBUILD)\kits\vcredist
+VCREDISTX64=$(OSVCBUILD)\kits\vcredist
 PYTHON=$(OSVCBUILD)\kits\winpython\python
 
 XSLFILE=$(WXSDIR)\opensvc.transform.xsl
@@ -73,8 +73,8 @@ copy:
 		@copy  "$(EXCLUDEFILE)" $(TEMPO)
 		@echo =^> Copying OpenSVC sources to build directory
 		@xcopy "$(OSVCROOT)" "$(OSVCPKGROOT)" /s /i /q /exclude:$(TEMPO)
-		@echo =^> Copying Visual C++ 2008 Redist installer to build directory
-        @xcopy "$(VCREDISTX86)" "$(OSVCNSIS)\tmp" /s /i /q
+		@echo =^> Copying Microsoft Visual C++ 2015 Redistributable installer to build directory
+        @xcopy "$(VCREDISTX64)" "$(OSVCNSIS)\tmp" /s /i /q
 		@echo =^> Copying Python distribution to build directory
 		@xcopy "$(PYTHON)" "$(OSVCPKGROOT)\python" /s /i /q
 		@del /s /q "$(OSVCPKGROOT)\python\*.pyc" 2>nul

diff --git a/...ts/vcredist/mu_visual_cpp_redistributable_for_visual_studio_2015_update_1_x64_7277229.exe b/...ts/vcredist/mu_visual_cpp_redistributable_for_visual_studio_2015_update_1_x64_7277229.exe
diff --git a/bin/pkg/winbuilder/kits/vcredist/vcredist_x86.exe b/bin/pkg/winbuilder/kits/vcredist/vcredist_x86.exe
diff --git a/bin/pkg/winbuilder/nsis/opensvc.nsi b/bin/pkg/winbuilder/nsis/opensvc.nsi
@@ -95,11 +95,11 @@ Section "Visual C++ 2008 Runtime" SEC02
            ${LogText} "[SEC02] VCRedist is not installed"
            SetOverwrite on
            #run runtime installation tool
-           DetailPrint "Installing Microsoft Visual C++ 2008 SP1 Redistributable Package (x86)"
-           ${LogText} "[SEC02] Will trigger vcredist_x86.exe installation"
-           ExecWait '"$INSTDIR\tmp\vcredist_x86.exe" /q /norestart' $0
+           DetailPrint "Installing Microsoft Visual C++ 2015 Redistributable Package (x64)"
+           ${LogText} "[SEC02] Will trigger Visual C++ 2015 Redistributable Package installation"
+           ExecWait '"$INSTDIR\tmp\mu_visual_cpp_redistributable_for_visual_studio_2015_update_1_x64_7277229.exe" /q /norestart' $0
            Call CheckReturnCode
-           ${LogText} "[SEC02] vcredist_x86.exe installation done"
+           ${LogText} "[SEC02] Visual C++ 2015 Redistributable Package installation done"
            DetailPrint "Done"
        ${EndIf}
   ${LogText} "[SEC02] End"

diff --git a/bin/pkg/winbuilder/wxs/opensvc.transform.xsl b/bin/pkg/winbuilder/wxs/opensvc.transform.xsl
@@ -12,16 +12,16 @@
   </xsl:template>
 
   <xsl:output method="xml" indent="yes" />
-  <!-- PythonService.exe Search Python Service Executable -->
-  <xsl:key name="pythonservice" match="wix:Component[contains(wix:File/@Source, 'PythonService.exe')]" use="@Id" />
+  <!-- Search Python Service Executable -->
+  <xsl:key name="pythonservice" match="wix:Component[contains(wix:File/@Source, 'pythonservice.exe')]" use="@Id" />
 
-  <!-- PythonService.exe Search Python Service Executable -->
+  <!-- Search postinstall script -->
   <xsl:key name="vIdToReplace" match="wix:File[contains(@Source, '\bin\postinstall.cmd')]" use="@Id" />
 
-  <!-- PythonService.exe Remove file component -->
+  <!-- Remove file component -->
   <xsl:template match="wix:Component[key('pythonservice', @Id)]" />
 
-  <!-- PythonService.exe  Remove componentsrefs referencing components -->
+  <!-- Remove componentsrefs referencing components -->
   <xsl:template match="wix:ComponentRef[key('pythonservice', @Id)]" />  
 
   <xsl:template match="node()[key('vIdToReplace', @Id)]">