Commit 720a11a6 authored by Andreas Traczyk's avatar Andreas Traczyk

packaging: fix qtwebengine component paths and clean vs build

- moves qtwebengine resource components into subdirectories
  specified qt.conf
- sets an intermediate build path so heat can be run to harvest
  build artifacts into Component.xws for the Wix installer

Change-Id: Ic25abf2f5aed5f8c6edd7e2a700b82cad33deb10
parent 87848319
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -25,7 +25,7 @@ write-host "using lrcDir: " $lrcDir -ForegroundColor Magenta
write-host "using QtDir: " $QtDir -ForegroundColor Magenta
write-host "********************************************************************************" -ForegroundColor Magenta
# dependency bin files
# dependency bin files and misc
$FilesToCopy = @(
"$daemonDir\contrib\build\ffmpeg\Build\win32\x64\bin\avcodec-58.dll",
"$daemonDir\contrib\build\ffmpeg\Build\win32\x64\bin\avutil-56.dll",
......@@ -36,7 +36,7 @@ $FilesToCopy = @(
"$daemonDir\contrib\build\ffmpeg\Build\win32\x64\bin\avfilter-7.dll",
"$daemonDir\contrib\build\restbed\dependency\openssl\out32dll\libeay32.dll",
"$daemonDir\contrib\build\restbed\dependency\openssl\out32dll\ssleay32.dll",
"$ClientDir\ring.nsi",
"$ClientDir\qt.conf",
"$ClientDir\images\jami.ico"
"$ClientDir\License.rtf"
)
......@@ -74,15 +74,37 @@ $FilesToCopy = @(
"$QtDir\bin\libEGL.dll",
"$QtDir\bin\libGLESv2.dll",
"$QtDir\bin\d3dcompiler_47.dll",
"$QtDir\bin\QtWebEngineProcess.exe",
"$QtDir\bin\QtWebEngineProcess.exe"
)
foreach ($i in $FilesToCopy) {
write-host "copying: " $i " => " $OutDir -ForegroundColor Cyan
Copy-Item -Path $i -Destination $OutDir -Force
}
# qt resources
$FilesToCopy = @(
"$QtDir\resources\qtwebengine_resources.pak",
"$QtDir\resources\qtwebengine_resources_100p.pak",
"$QtDir\resources\qtwebengine_resources_200p.pak",
"$QtDir\resources\qtwebengine_devtools_resources.pak",
"$QtDir\resources\icudtl.dat"
)
$CopyDir = $OutDir + "\resources"
If(!(test-path $CopyDir)) { New-Item -ItemType directory -Path $CopyDir -Force }
foreach ($i in $FilesToCopy) {
write-host "copying: " $i " => " $OutDir -ForegroundColor Cyan
Copy-Item -Path $i -Destination $OutDir -Force
write-host "copying: " $i " => " $CopyDir -ForegroundColor Cyan
Copy-Item -Path $i -Destination $CopyDir -Force
}
# qt qtwebengine_locales
$FilesToCopy = @(
"$QtDir\translations\qtwebengine_locales\en-US.pak"
)
$CopyDir = $OutDir + "\translations\qtwebengine_locales"
If(!(test-path $CopyDir)) { New-Item -ItemType directory -Path $CopyDir -Force }
foreach ($i in $FilesToCopy) {
write-host "copying: " $i " => " $CopyDir -ForegroundColor Cyan
Copy-Item -Path $i -Destination $CopyDir -Force
}
# qt imageformats
......
[Paths]
Prefix=./
Resources=./resources
Translations=./translations
\ No newline at end of file
......@@ -56,7 +56,7 @@
<PropertyGroup>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseCompile|x64'">$(Platform)\$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">obj\$(Platform)\$(Configuration)\</IntDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseCompile|x64'">$(Platform)\$(Configuration)\</IntDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Jami</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseCompile|x64'">Jami</TargetName>
......@@ -78,7 +78,7 @@
<AssemblerListingLocation>release\</AssemblerListingLocation>
<BrowseInformation>false</BrowseInformation>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<DisableSpecificWarnings>4068;4099;4189;4267;4577;4467;4715;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<DisableSpecificWarnings>4068;4099;4189;4267;4577;4467;4715;4828;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<ExceptionHandling>Sync</ExceptionHandling>
<ObjectFileName>$(IntDir)</ObjectFileName>
<Optimization>MaxSpeed</Optimization>
......@@ -109,6 +109,7 @@
<SuppressStartupBanner>true</SuppressStartupBanner>
<Version>2.0</Version>
<ForceFileOutput>MultiplyDefinedSymbolOnly</ForceFileOutput>
<ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile>
</Link>
<Midl>
<DefaultCharType>Unsigned</DefaultCharType>
......@@ -146,6 +147,11 @@
<PreBuildEvent>
<Command>call touch_res.bat</Command>
</PreBuildEvent>
<PostBuildEvent>
<Command>@echo off
del /s /q $(OutDir)\Jami.lib
del /s /q $(OutDir)\Jami.exp</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseCompile|x64'">
<ClCompile>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment