flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-08-04 16:22:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Installbuilder Windows fixes

Browse Source 
refs #615
This commit is contained in:
Roland Winklmeier
2016-04-02 18:45:29 +02:00
parent 7b5e306bab
commit 4ed4771271
7 changed files with 21 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
install.pri
View File

@@ -163,6 +163,7 @@ win32:!isEmpty(bitrock_customize_bin):!isEmpty(bitrock_builder_bin) {
QMAKE_EXTRA_TARGETS += create_updater
create_installer.depends = create_updater
create_installer.commands = $${bitrock_builder_bin} build $${bitrock_project} windows --setvars project.outputDirectory=$${PREFIX}/..
create_installer.commands = $${bitrock_builder_bin} build $${bitrock_project} windows \
--setvars project.outputDirectory=$$shell_path($${PREFIX}/..)
QMAKE_EXTRA_TARGETS += create_installer
}

4
installer/installbuilder/autoupdater.xml
View File

@@ -6,14 +6,16 @@
<show>0</show>
<folderList>
<folder>
<description>Auto Updater</description>
<destination>${installdir}</destination>
<name>autoupdaterwin</name>
<platforms>windows</platforms>
<distributionFileList>
<distributionFile origin="../../dist/autoupdate-windows.exe"/>
</distributionFileList>
</distributionFileList>
</folder>
<folder>
<description>Auto Updater</description>
<destination>${installdir}</destination>
<name>autoupdaterlinux</name>
<platforms>linux</platforms>

10
installer/installbuilder/project.xml
View File

@@ -7,7 +7,6 @@
<leftImage>../images/leftimage.png</leftImage>
<logoImage>../images/logo.png</logoImage>
<splashImage>../images/splashscreen.png</splashImage>
<outputDirectory>.</outputDirectory>
<componentList>
<include>
<file>swift.xml</file>
@@ -51,6 +50,7 @@ check_for_updates = 1
<!-- <osxApplicationBundleIcon>TODO</osxApplicationBundleIcon>
<wmImage>TODO</wmImage> -->
<osxApplicationBundleIdentifier>org.swift-project.macinstaller</osxApplicationBundleIdentifier>
<outputDirectory>.</outputDirectory>
<productDisplayIcon>../images/icon.ico</productDisplayIcon>
<saveRelativePaths>1</saveRelativePaths>
<vendor>swift Project</vendor>
@@ -62,10 +62,10 @@ check_for_updates = 1
<windowsSigningTimestampServer>http://timestamp.digicert.com</windowsSigningTimestampServer>
<customLanguageFileList>
<!-- <language>
<code>en</code>
<encoding>utf-8</encoding>
<file>${build_project_directory}/lang/alf-en.po</file>
</language> -->
<code>en</code>
<encoding>utf-8</encoding>
<file>${build_project_directory}/lang/alf-en.po</file>
</language> -->
</customLanguageFileList>
<finalPageActionList>
<runProgram>

15
installer/installbuilder/qt5-binaries.xml
View File

@@ -12,9 +12,6 @@
<name>bin_windows</name>
<platforms>windows</platforms>
<distributionFileList>
<distributionFile>
<origin>../../dist/bin/icuuc54.dll</origin>
</distributionFile>
<distributionFile>
<allowWildcards>1</allowWildcards>
<origin>../../dist/bin/Qt5Core*.dll</origin>
@@ -54,20 +51,12 @@
<distributionFile>
<origin>../../dist/bin/dbus-daemon.exe</origin>
</distributionFile>
<distributionFile>
<origin>../../dist/bin/icudt54.dll</origin>
</distributionFile>
<distributionFile>
<origin>../../dist/bin/icuin54.dll</origin>
</distributionFile>
<distributionFile>
<origin>../../dist/bin/icuuc54.dll</origin>
</distributionFile>
<distributionDirectory>
<origin>../../dist/bin/platforms</origin>
</distributionDirectory>
<distributionFile>
<origin>../../dist/bin/expat.dll</origin>
<allowWildcards>1</allowWildcards>
<origin>../../dist/bin/expat.dll*</origin>
</distributionFile>
<distributionFile>
<origin>../../dist/bin/libeay32.dll</origin>

6
installer/installbuilder/swift-externals.xml
View File

@@ -21,7 +21,8 @@
<origin>../../dist/bin/vatlib.dll</origin>
</distributionFile>
<distributionFile>
<origin>../../dist/bin/portaudio.dll</origin>
<allowWildcards>1</allowWildcards>
<origin>../../dist/bin/*portaudio*.dll</origin>
</distributionFile>
<distributionFile>
<origin>../../dist/bin/SimConnect.dll</origin>
@@ -33,7 +34,8 @@
<origin>../../dist/bin/speexdsp.dll</origin>
</distributionFile>
<distributionFile>
<origin>../../dist/bin/opus.dll</origin>
<allowWildcards>1</allowWildcards>
<origin>../../dist/bin/*opus*.dll</origin>
</distributionFile>
</distributionFileList>
</folder>

17
installer/installbuilder/swift-pilotclient.xml
View File

@@ -72,16 +72,7 @@ This installs the binaries to run all swift applications.</detailedDescription>
<origin>../../dist/data</origin>
</distributionDirectory>
<distributionDirectory>
<origin>../../dist/local.env.template</origin>
</distributionDirectory>
<distributionDirectory>
<origin>../../dist/qss</origin>
</distributionDirectory>
<distributionDirectory>
<origin>../../dist/shared</origin>
</distributionDirectory>
<distributionDirectory>
<origin>../../dist/sounds</origin>
<origin>../../dist/share</origin>
</distributionDirectory>
</distributionFileList>
</folder>
@@ -89,7 +80,7 @@ This installs the binaries to run all swift applications.</detailedDescription>
<startMenuShortcutList>
<startMenuShortcut>
<comment></comment>
<name>swift gui</name>
<name>swiftgui</name>
<runAsAdmin>0</runAsAdmin>
<runInTerminal>0</runInTerminal>
<windowsExec>${installdir}/bin/swiftguistd.exe</windowsExec>
@@ -99,7 +90,7 @@ This installs the binaries to run all swift applications.</detailedDescription>
</startMenuShortcut>
<startMenuShortcut>
<comment></comment>
<name>swift core</name>
<name>swiftcore</name>
<runAsAdmin>0</runAsAdmin>
<runInTerminal>0</runInTerminal>
<windowsExec>${installdir}/bin/swiftcore.exe</windowsExec>
@@ -109,7 +100,7 @@ This installs the binaries to run all swift applications.</detailedDescription>
</startMenuShortcut>
<startMenuShortcut>
<comment></comment>
<name>swift data</name>
<name>swiftdata</name>
<runAsAdmin>0</runAsAdmin>
<runInTerminal>0</runInTerminal>
<windowsExec>${installdir}/bin/swiftdata.exe</windowsExec>

2
installer/installbuilder/vcredist.xml
View File

@@ -1,6 +1,6 @@
<component>
<name>vcruntime</name>
<description>Visual Studio 2013 Redistributables</description>
<description>Visual Studio 2015 Redistributables</description>
<canBeEdited>0</canBeEdited>
<selected>1</selected>
<show>1</show>