Commit Graph

56 Commits

Author SHA1 Message Date
Roland Winklmeier
e8235a0f53 Don't abort installation if vcredist returns non zero return code
In case, vcredist returns a non zero return code, don't automatically
abort the installation, but tell the user the error code, the consequences
and continue.

ref T344
2018-09-17 18:28:21 +02:00
Roland Winklmeier
06656c8c5c Remove the workaround to create MacOS disk images
BitRock meanwhile fixed the issue, so use that option again instead of
the manual process.
2018-09-08 15:36:23 +02:00
Roland Winklmeier
9de30b587b installbuilder style fixes 2018-09-08 15:36:23 +02:00
Roland Winklmeier
65a8fdf251 Remember the last installation path
ref T305
2018-09-08 15:36:23 +02:00
Roland Winklmeier
f31b43ffcf Comment option to launch browser from final installer page
ref T305
2018-09-08 15:36:19 +02:00
Roland Winklmeier
f6f198af13 Replace installer icons with transparent bird
ref T305
2018-09-08 15:36:19 +02:00
Roland Winklmeier
ebc1e9a33e Rename the menu shortcut names and comments
ref T305
2018-09-08 15:36:15 +02:00
Roland Winklmeier
741202a70f Add platform name to installer directory and menu shortcuts
ref T305
2018-09-08 15:34:07 +02:00
Roland Winklmeier
f3024d15cb Add 7z binaries to installer 2018-08-16 14:33:56 +02:00
Roland Winklmeier
9fccc6c70a Fix the MSVC 2017 redist version
MSVC 2017 was updated to v15.7 in Jenkins CI and with it also the redist
version numbers. However, the new version was never updated in the installer
and packaging project.
2018-08-09 01:39:23 +02:00
Roland Winklmeier
990035dd6a Update externals
* vatlib 0.9.8 (without opus codec)
2018-06-13 13:59:40 +02:00
Roland Winklmeier
b952c60f04 Adjust artifacts filenames to schema type-os-version.extension 2017-12-08 12:36:12 +01:00
Roland Winklmeier
f53ec46d20 Change the operating system name from OSX to MacOS everywhere
Summary:
- Changed the name in all build artifacts
- Everywhere in C++

Reviewers: #swift_pilot_client, kbasan

Reviewed By: #swift_pilot_client, kbasan

Subscribers: jenkins

Maniphest Tasks: T205

Differential Revision: https://dev.swift-project.org/D69
2017-12-06 22:50:19 +01:00
Roland Winklmeier
d8c156a762 Fix building a bitrock installer with MinGW binaries
Summary:
This simply fixes the errors, one will see if an installer is created after
a MinGW build. This does not change the fact that a MinGW installer is
not supported and not necessary. The installed software will not be able
to run due to missing dependencies. But the installer can be created and
executed for testing.

Reviewers: #swift_pilot_client, kbasan

Reviewed By: #swift_pilot_client, kbasan

Subscribers: jenkins

Differential Revision: https://dev.swift-project.org/D67
2017-12-01 08:09:58 +01:00
Roland Winklmeier
4001fad023 fixup! Upgrade to MSVC 2017 2017-11-17 16:06:32 +01:00
Roland Winklmeier
a23ccb5ac7 [MacOS] Comment out osascript for the time being
osascript tries to talk to Finder, which is not possible when running
the Mac OS slave over ssh.
2017-11-03 15:50:25 +01:00
Roland Winklmeier
be321a3fa5 Replace more installer dummy icons with swift icons
Summary:
There were still many TODO's in installbuilder project file. This change replaces them with path to swift icons.

Depends on D58

Reviewers: #swift_pilot_client, msutcliffe

Reviewed By: #swift_pilot_client, msutcliffe

Subscribers: jenkins

Differential Revision: https://dev.swift-project.org/D59
2017-11-03 12:10:00 +01:00
Roland Winklmeier
8ee73d18e9 [MacOS] Create installer disk image manually to workaround broken hdiutil
Summary:
Apple broke the hdiutil on MacOS 10.13. If one passes multiple -srcfolder
arguments, it dead locks with 100 % CPU forever. Since there is no way to
tell Bitrock to use only one -srcfolder argument, we have to go the
advanced way and create the disk image file manually. This also allows
us to customize it more in the future.

Reviewers: #swift_pilot_client, msutcliffe

Reviewed By: #swift_pilot_client, msutcliffe

Subscribers: jenkins

Maniphest Tasks: T181

Differential Revision: https://dev.swift-project.org/D58
2017-11-03 12:05:16 +01:00
Roland Winklmeier
8c62cf80a2 Make sure that all linux externals are packaged into installer
Summary:
Those libraries are in externals since a while, but were not yet packaged
into the Linux installer.

ref T46

Reviewers: #swift_pilot_client, msutcliffe

Reviewed By: #swift_pilot_client, msutcliffe

Subscribers: jenkins

Maniphest Tasks: T46

Differential Revision: https://dev.swift-project.org/D55
2017-10-23 12:02:51 +02:00
Roland Winklmeier
ab1a200e78 Remove the DBus LaunchAgent when uninstalling
ref T174
2017-10-18 22:58:20 +02:00
Roland Winklmeier
e2f7ea87a3 [MacOS] Write dbus session launchd script during installation
DBus session needs to be started from a central place. On Mac OS, the
recommended solution is launchd service since all dbus clients will query
launchd for the session address first. All other solutions would be hacky.
With this script, launchd will start dbus-daemon on demand and provide
the enviromental variable DBUS_LAUNCHD_SESSION_BUS_SOCKET.
We put this into the user launch agents folder to make it a user session.

ref T170
2017-10-13 17:01:08 +02:00
Roland Winklmeier
79dcbd98a2 Remove the required installation by a privileged user
This was required by a wrong owner ship configuration on Mac OS slave.

ref T170
2017-10-13 17:01:07 +02:00
Roland Winklmeier
0b40450f7b Remove xswiftbus from installer
Summary:
xswiftbus is now a downloadable standalone X-Plane fat plugin and should
no longer be packaged into the installer.

Reviewers: #swift_pilot_client, msutcliffe

Reviewed By: #swift_pilot_client, msutcliffe

Subscribers: jenkins

Maniphest Tasks: T123

Differential Revision: https://dev.swift-project.org/D49
2017-09-24 19:53:32 +01:00
Roland Winklmeier
d505f7b9a4 Disable installing of Bitrock auto updater
Summary:
Disabling happens in two steps. The binary was created as dependent target
of 'make create_installer'. This step is now skipped.
The second step is to remove it from the installbuilder project
configuration.
Disabling only so far to easily get it back if needed.

ref T124

Reviewers: #swift_pilot_client, msutcliffe

Reviewed By: #swift_pilot_client, msutcliffe

Subscribers: jenkins

Maniphest Tasks: T124

Differential Revision: https://dev.swift-project.org/D46
2017-09-24 19:52:34 +01:00
Mathew Sutcliffe
50b8fbe8fe [bug][Windows][Installer][DBus] Install session.conf in the correct location where dbus-daemon will look for it.
Summary:
On Windows, libdbus will spawn dbus-daemon when swift tries to connect to the session bus.

The daemon looks for session.conf in the share directory.
This patch ensures session.conf is installed in that directory.

Fixes T79.

Reviewers: rwinklmeier

Reviewed By: rwinklmeier

Subscribers: jenkins

Tags: #swift_pilot_client

Maniphest Tasks: T79

Differential Revision: https://dev.swift-project.org/D22
2017-05-14 17:21:37 +01:00
Roland Winklmeier
64b52f7026 [Installer] Run swift in background after installation
Summary:
After installation, swiftlauncher is executed in wizard mode. However, installer
kept running in the background until the launcher was closed. Instead,
run swift in background which allows the installer to quit.

Reviewers: kbasan, msutcliffe

Reviewed By: msutcliffe

Differential Revision: https://dev.swift-project.org/D19
2017-05-05 23:08:42 +01:00
Roland Winklmeier
f952775665 Use dbus-uuidgen to create dbus machine id after installation
Summary:
The file machine-id was missing on target machines and needs
to be created during installation.

Reviewers: kbasan, msutcliffe

Reviewed By: msutcliffe

Subscribers: jenkins

Tags: #swift_pilot_client

Differential Revision: https://dev.swift-project.org/D17
2017-05-05 23:08:37 +01:00
Mathew Sutcliffe
4a4dea8d4d Rename xbus to xswiftbus
Summary:
I wanted to rename xbus because its relation to //swift// is not immediately clear from the name.

xswiftbus seems reasonable.

Reviewers: #swift_pilot_client, kbasan

Reviewed By: kbasan

Subscribers: kbasan, jenkins

Tags: #swift_pilot_client

Differential Revision: https://dev.swift-project.org/D14
2017-05-05 23:07:11 +01:00
Roland Winklmeier
a3bc5c2936 Add <swiftInstall>/bin to library lookup paths
Summary:
This change adds <swiftInstall>/bin to the library lookup paths.
Without, QFactoryLoader is not able to find the Qt plugins
on Mac OS since on this platform the hard coded path defaults to
'foo.app/Contents/MacOS' for app bundles.
This change also adds the installation of QtPrintSupport framework which
is a dependency from cocoa platform plugin.

ref T48

Reviewers: kbasan, msutcliffe

Reviewed By: kbasan

Subscribers: jenkins

Maniphest Tasks: T48

Differential Revision: https://dev.swift-project.org/D15
2017-05-05 22:40:43 +01:00
Roland Winklmeier
b4878a2bc0 Change description in swift installer
refs #902
2017-04-18 00:07:15 +01:00
Roland Winklmeier
06760ed8ea Fix typo
refs #902
2017-04-18 00:07:13 +01:00
Roland Winklmeier
108336a9cc Add link to swift project webpage to installer finalPageActionList
refs #902
2017-04-17 23:59:55 +01:00
Roland Winklmeier
e9b79fbc8c Remove README file from installer
refs #902
2017-04-17 23:59:53 +01:00
Roland Winklmeier
b6fb532f3a Set installbuilder project.version dynamically from qmake
Instead of maintaining the version number in project.xml, pass it to
installbuilder from qmake project.

refs #902
2017-04-17 23:59:52 +01:00
Roland Winklmeier
452b2ce0d6 Run swiftlauncher with correct arguments after installation
refs #902
2017-04-17 23:59:48 +01:00
Roland Winklmeier
6495813102 Add Prepare3D plugin to installer
refs #902
2017-04-17 23:59:47 +01:00
Roland Winklmeier
518e612646 Installer images and icons update
- Update the installer icon to the new one
- Replace images produced by ourselves with X-Plane 10 to avoid copyright
  issues
- Remove unnecessary files

refs #902
2017-04-17 23:59:45 +01:00
Roland Winklmeier
0878a82b2c Add Qt5 bearer plugins to install target 2017-02-24 15:22:16 +00:00
Klaus Basan
bed1542fe4 Update externals
* vatlib 0.9.6
* Partially revert 3f975838b2
2017-02-24 00:08:47 +00:00
Roland Winklmeier
121e70e187 Enable installing of ICU on Linux
Since 5.6.1 is now available on Jenkins, installing of ICU can finally
be activated.
2016-09-19 16:36:17 +02:00
Roland Winklmeier
a87a4a7ef1 Install crashpad binaries
refs #490
2016-08-09 17:52:28 +02:00
Roland Winklmeier
06d858c57f Change installer directory "data" to "share"
refs #671
2016-07-15 21:06:57 +02:00
Roland Winklmeier
d6f7341b3d Install additional Qt Plugins
* audio
* iconengines
* imageformats
* mediaservice
* platforms
* platforminputcontexts
* platformthemes
* xcbglintegrations

refs #615
2016-05-20 01:42:55 +02:00
Roland Winklmeier
6fad166b44 Package MSFS simulator plugins only if they exist
There are no 64 bit MSFS simulator plugins available. Therefore don't
package them, if they were not built.

refs #615
2016-05-20 01:42:51 +02:00
Roland Winklmeier
ca80b2f3ed Fix update version info
refs #615
2016-05-20 01:41:24 +02:00
Roland Winklmeier
ab1491f085 Rename share/dbus-1 to etc/dbus-1 to not mix it up with data/shared
refs #615
2016-05-20 01:41:19 +02:00
Roland Winklmeier
c609dfb24c Include xbus in installbuilder
refs #615
2016-05-20 01:40:13 +02:00
Roland Winklmeier
88c3e585fc Include weatherdata plugins in installbuilder
refs #615
2016-05-20 01:40:12 +02:00
Roland Winklmeier
1eacf9b172 Installbuilder Mac OS X setup
refs #615
2016-05-20 01:40:10 +02:00
Roland Winklmeier
91d1a90b1b Externals
refs #615
2016-05-20 01:40:08 +02:00