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

Align installer files with 0.6.1 release binaries

Browse Source
This commit is contained in:
Roland Winklmeier
2015-11-25 01:27:31 +01:00
parent ffea4e1433
commit c78e69e05e
8 changed files with 46 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
install.pri
View File

@@ -27,6 +27,8 @@ qt5_target.files *= $$[QT_INSTALL_BINS]/Qt5Widgets$${DLL_DEBUG_SUFFIX}.$${QMAKE_
qt5_target.files *= $$[QT_INSTALL_BINS]/icudt54.$${QMAKE_EXTENSION_SHLIB}
qt5_target.files *= $$[QT_INSTALL_BINS]/icuin54.$${QMAKE_EXTENSION_SHLIB}
qt5_target.files *= $$[QT_INSTALL_BINS]/icuuc54.$${QMAKE_EXTENSION_SHLIB}
qt5_target.files *= $$[QT_INSTALL_BINS]/libeay32.$${QMAKE_EXTENSION_SHLIB}
qt5_target.files *= $$[QT_INSTALL_BINS]/ssleay32.$${QMAKE_EXTENSION_SHLIB}
INSTALLS += qt5_target
@@ -101,7 +103,7 @@ win32-g++ {
############### Install externals ##############
externals_target.path = $${PREFIX}/bin
!win32-g++: externals_target.files *= $${EXTERNALLIBS}/*.$${QMAKE_EXTENSION_SHLIB}
!win32-g++: externals_target.files *= $${EXTERNALSDIR}/*.$${QMAKE_EXTENSION_SHLIB}
INSTALLS += externals_target
# win32-g++ needs a workaround since copy does not accept a filepath with '+' in it
@@ -110,7 +112,7 @@ INSTALLS += externals_target
win32-g++ {
vc_runtime_target.depends += copy_externals
copy_externals.target = copy_externals
source_path = $${EXTERNALLIBS}//*.dll
source_path = $${EXTERNALSDIR}//*.dll
dest_path = $${externals_target.path}
copy_externals.commands += xcopy /Y $$shell_path($$source_path) $$shell_path($$dest_path) $$escape_expand(\n\t)
QMAKE_EXTRA_TARGETS += copy_externals

2
installer/installbuilder/project.xml
View File

@@ -69,7 +69,7 @@ check_for_updates = 1
</customLanguageFileList>
<finalPageActionList>
<runProgram>
<program>${installdir}/bin/swiftguistd.exe</program>
<program>${installdir}/bin/swiftlauncher.exe</program>
<programArguments></programArguments>
<progressText>Run swift launcher</progressText>
</runProgram>

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

@@ -69,6 +69,12 @@
<distributionFile>
<origin>../../dist/bin/expat.dll</origin>
</distributionFile>
<distributionFile>
<origin>../../dist/bin/libeay32.dll</origin>
</distributionFile>
<distributionFile>
<origin>../../dist/bin/ssleay32.dll</origin>
</distributionFile>
</distributionFileList>
</folder>
<folder>

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

@@ -18,7 +18,7 @@
<platforms>windows</platforms>
<distributionFileList>
<distributionFile>
<origin>../../dist/bin/vatlib2.dll</origin>
<origin>../../dist/bin/vatlib.dll</origin>
</distributionFile>
<distributionFile>
<origin>../../dist/bin/portaudio.dll</origin>
@@ -32,6 +32,9 @@
<distributionFile>
<origin>../../dist/bin/speexdsp.dll</origin>
</distributionFile>
<distributionFile>
<origin>../../dist/bin/opus.dll</origin>
</distributionFile>
</distributionFileList>
</folder>
</folderList>

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

@@ -22,6 +22,9 @@ This installs the binaries to run all swift applications.</detailedDescription>
<distributionFile>
<origin>../../dist/bin/swiftguistd</origin>
</distributionFile>
<distributionFile>
<origin>../../dist/bin/swiftlauncher</origin>
</distributionFile>
</distributionFileList>
</folder>
<folder>
@@ -39,6 +42,9 @@ This installs the binaries to run all swift applications.</detailedDescription>
<distributionFile>
<origin>../../dist/bin/swiftguistd.exe</origin>
</distributionFile>
<distributionFile>
<origin>../../dist/bin/swiftlauncher.exe</origin>
</distributionFile>
<distributionFile>
<origin>../../dist/bin/blacksound.dll</origin>
</distributionFile>
@@ -62,9 +68,6 @@ This installs the binaries to run all swift applications.</detailedDescription>
<name>root</name>
<platforms>all</platforms>
<distributionFileList>
<distributionDirectory>
<origin>../../dist/bootstrap</origin>
</distributionDirectory>
<distributionDirectory>
<origin>../../dist/data</origin>
</distributionDirectory>
@@ -75,10 +78,10 @@ This installs the binaries to run all swift applications.</detailedDescription>
<origin>../../dist/qss</origin>
</distributionDirectory>
<distributionDirectory>
<origin>../../dist/sounds</origin>
<origin>../../dist/shared</origin>
</distributionDirectory>
<distributionDirectory>
<origin>../../dist/swiftDB</origin>
<origin>../../dist/sounds</origin>
</distributionDirectory>
</distributionFileList>
</folder>
@@ -114,6 +117,16 @@ This installs the binaries to run all swift applications.</detailedDescription>
<windowsIcon></windowsIcon>
<windowsPath></windowsPath>
</startMenuShortcut>
<startMenuShortcut>
<comment></comment>
<name>swift launcher</name>
<runAsAdmin>0</runAsAdmin>
<runInTerminal>0</runInTerminal>
<windowsExec>${installdir}/bin/swiftlauncher.exe</windowsExec>
<windowsExecArgs></windowsExecArgs>
<windowsIcon></windowsIcon>
<windowsPath></windowsPath>
</startMenuShortcut>
<startMenuShortcut>
<comment></comment>
<name>Uninstall swift</name>

12
installer/installbuilder/swift-plugin-simulators.xml
View File

@@ -20,7 +20,7 @@
<platforms>windows</platforms>
<distributionFileList>
<distributionFile>
<origin>../../dist/bin/plugins/simulator/simulator_fs9.dll</origin>
<origin>../../dist/bin/plugins/simulator/simulatorfs9.dll</origin>
</distributionFile>
</distributionFileList>
</folder>
@@ -42,7 +42,10 @@ This plugin acts as the interface between swift and FSX.</detailedDescription>
<platforms>windows</platforms>
<distributionFileList>
<distributionFile>
<origin>../../dist/bin/plugins/simulator/simulator_fsx.dll</origin>
<origin>../../dist/bin/plugins/simulator/simulatorfsx.dll</origin>
</distributionFile>
<distributionFile>
<origin>../../dist/bin/plugins/simulator/simulatorfsxconfig.dll</origin>
</distributionFile>
</distributionFileList>
</folder>
@@ -64,7 +67,10 @@ This plugin acts as the interface between swift and X-Plane</detailedDescription
<platforms>all</platforms>
<distributionFileList>
<distributionFile>
<origin>../../dist/bin/plugins/simulator/simulator_xplane.dll</origin>
<origin>../../dist/bin/plugins/simulator/simulatorxplane.dll</origin>
</distributionFile>
<distributionFile>
<origin>../../dist/bin/plugins/simulator/simulatorxplaneconfig.dll</origin>
</distributionFile>
</distributionFileList>
</folder>

2
installer/installbuilder/swift-samples.xml
View File

@@ -14,7 +14,7 @@
<distributionFileList>
<distributionFile>
<allowWildcards>1</allowWildcards>
<origin>../../dist/bin/sample_*.exe</origin>
<origin>../../dist/bin/sample*.exe</origin>
</distributionFile>
</distributionFileList>
</folder>

3
src/swiftlauncher/swiftlauncher.pro
View File

@@ -40,4 +40,7 @@ DISTFILES += swift.rc
DESTDIR = $$DestRoot/bin
target.path = $$PREFIX/bin
INSTALLS += target
load(common_post)