aboutsummaryrefslogtreecommitdiff
path: root/project/Win32BuildSetup
diff options
context:
space:
mode:
authorPär Björklund <per@ohmy.nu>2016-07-10 22:13:08 +0200
committerPär Björklund <per@ohmy.nu>2016-07-17 15:19:31 +0200
commite49c7ec6b4f8dfbe0917df801035872992784438 (patch)
treec5feec903e9b9a7174dd3db00767564832b11356 /project/Win32BuildSetup
parent2ab7fb1ca2eb72611842c48276b15e4ed0bd225b (diff)
Cleanup work that started with running as Win10 app
UWP(project centennial) does not allow AddDllDirectory which we don't really need anyway but it's use made the folder structure pretty. Since we run perfectly fine without it both native and as UWP I decided to drop it completely. To make the build, installer and debugging experience easier this led to plenty of changes to packages and build scripts to output all dlls into /system/ instead of different folders. While moving stuff around some dependencies got updated, it's possible that we can use java menus in bluray movies now, not tested. EasyHook just got repackaged to fit the new folder structure. The rebuilding of dependencies led to us being able to drop old vcredist files which also simplifies installer and packaging, especially for UWP. Some minor cleanup along the way as well
Diffstat (limited to 'project/Win32BuildSetup')
-rw-r--r--project/Win32BuildSetup/AppxManifest.xml.in1
-rw-r--r--project/Win32BuildSetup/genNsisInstaller.nsi24
-rw-r--r--project/Win32BuildSetup/getdeploydependencies.bat11
3 files changed, 2 insertions, 34 deletions
diff --git a/project/Win32BuildSetup/AppxManifest.xml.in b/project/Win32BuildSetup/AppxManifest.xml.in
index 62f1385db5..94fefb6a8f 100644
--- a/project/Win32BuildSetup/AppxManifest.xml.in
+++ b/project/Win32BuildSetup/AppxManifest.xml.in
@@ -12,7 +12,6 @@
</Resources>
<Dependencies>
<TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.14342.0" MaxVersionTested="10.0.14379.0" />
- <PackageDependency Name="Microsoft.VCLibs.120.00.UWPDesktop" MinVersion="12.0.40653.0" Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" />
<PackageDependency Name="Microsoft.VCLibs.140.00.UWPDesktop" MinVersion="14.0.24217.0" Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" />
</Dependencies>
<Capabilities>
diff --git a/project/Win32BuildSetup/genNsisInstaller.nsi b/project/Win32BuildSetup/genNsisInstaller.nsi
index e8f48e79fe..ee9647f4b3 100644
--- a/project/Win32BuildSetup/genNsisInstaller.nsi
+++ b/project/Win32BuildSetup/genNsisInstaller.nsi
@@ -233,6 +233,7 @@ Section "${APP_NAME}" SecAPP
;Start copying files
SetOutPath "$INSTDIR"
File "${app_root}\application\*.*"
+ File "${app_root}\application\system\*.dll"
SetOutPath "$INSTDIR\addons"
File /r "${app_root}\application\addons\*.*"
File /nonfatal /r "${app_root}\addons\peripheral.*"
@@ -378,28 +379,7 @@ SectionEnd
;vs redist installer Section
SectionGroup "Microsoft Visual C++ packages" SEC_VCREDIST
-Section "VS2010 C++ re-distributable Package (x86)" SEC_VCREDIST2
- DetailPrint "Running VS2010 re-distributable setup..."
- SectionIn 1 2 #section is in install type Full
- SetOutPath "$TEMP\vc2010"
- File "${app_root}\..\dependencies\vcredist\2010\vcredist_x86.exe"
- ExecWait '"$TEMP\vc2010\vcredist_x86.exe" /q /norestart' $VSRedistSetupError
- RMDir /r "$TEMP\vc2010"
- DetailPrint "Finished VS2010 re-distributable setup"
-SectionEnd
-
-Section "VS2013 C++ re-distributable Package (x86)" SEC_VCREDIST3
-DetailPrint "Running VS2013 re-distributable setup..."
- SectionIn 1 2 #section is in install type Full
- SetOutPath "$TEMP\vc2013"
- File "${app_root}\..\dependencies\vcredist\2013\vcredist_x86.exe"
- ExecWait '"$TEMP\vc2013\vcredist_x86.exe" /install /quiet /norestart' $VSRedistSetupError
- RMDir /r "$TEMP\vc2013"
- DetailPrint "Finished VS2013 re-distributable setup"
- SetOutPath "$INSTDIR"
-SectionEnd
-
-Section "VS2015 C++ re-distributable Package (x86)" SEC_VCREDIST4
+Section "VS2015 C++ re-distributable Package (x86)" SEC_VCREDIST1
DetailPrint "Running VS2015 re-distributable setup..."
SectionIn 1 2 #section is in install type Full
SetOutPath "$TEMP\vc2015"
diff --git a/project/Win32BuildSetup/getdeploydependencies.bat b/project/Win32BuildSetup/getdeploydependencies.bat
index 06fb7459bd..5daa93ca8f 100644
--- a/project/Win32BuildSetup/getdeploydependencies.bat
+++ b/project/Win32BuildSetup/getdeploydependencies.bat
@@ -8,19 +8,8 @@ echo Downloading from mirror %KODI_MIRROR%
:: Following commands expect this script's parent directory to be the current directory, so make sure that's so
PUSHD %~dp0
-if not exist dependencies\vcredist\2010 mkdir dependencies\vcredist\2010
-if not exist dependencies\vcredist\2013 mkdir dependencies\vcredist\2013
if not exist dependencies\vcredist\2015 mkdir dependencies\vcredist\2015
-if not exist dependencies\vcredist\2010\vcredist_x86.exe (
- echo Downloading vc100 redist...
- ..\BuildDependencies\bin\wget -nv -O dependencies\vcredist\2010\vcredist_x86.exe %KODI_MIRROR%/build-deps/win32/vcredist/2010/vcredist_x86.exe
-)
-if not exist dependencies\vcredist\2013\vcredist_x86.exe (
- echo Downloading vc120 redist...
- ..\BuildDependencies\bin\wget -nv -O dependencies\vcredist\2013\vcredist_x86.exe %KODI_MIRROR%/build-deps/win32/vcredist/2013/vcredist_x86.exe
-)
-
if not exist dependencies\vcredist\2015\vcredist_x86.exe (
echo Downloading vc140 redist...
..\BuildDependencies\bin\wget -nv -O dependencies\vcredist\2015\vcredist_x86.exe %KODI_MIRROR%/build-deps/win32/vcredist/2015/vcredist_x86.exe