Commit Graph
100 Commits
Author SHA1 Message Date
James Turner 00d4c6ec93 Re-enable Ibiblio in update-catalogs.sh 2020-10-22 12:59:24 +00:00
James Turner b86121be85 Add catalog update script
Ensure this doesn't get lost, it's nothing magic but helps
to document+capture what the server is doing, in case
someone needs to replicate it.
2020-09-21 10:16:09 +00:00
James Turner c5032d816b Fix output path for 2020 stable catalog 2020-09-21 08:33:55 +00:00
James Turner 4e28b88c22 Windows: fixes for compositor builds 2020-05-03 19:02:26 +01:00
James Turner 819074136a Re-enable ‘full-fat’ nightlies for macOS
May need to tweak the bundle IDs for notarization, let’s see.
2020-05-01 12:00:59 +01:00
James Turner 03ac46120c Windows: remove erroneous space breaking build
This was causing to pick the second prefix path as the source dir,
which doesn’t work so well.
2020-05-01 08:46:49 +01:00
James Turner cc76052038 Trunk FGAddon hangar: support 2020.* versions 2020-04-29 14:58:14 +01:00
James Turner 1c7dcaf5d5 macOS: package libSentry 2020-04-29 08:32:15 +01:00
James Turner dbdfc52a00 Adjust release script 2020-04-27 09:31:38 +01:00
James Turner d4489091e2 track submodule changes for release 2020-04-27 09:30:09 +01:00
James Turner 6fa2edf9d5 new version: 2020.2.0 2020-04-27 09:30:08 +01:00
James Turner 6e608907b4 new version: 2020.1.1 2020-04-27 09:30:08 +01:00
James Turner a02dc9aad6 Window: update installer script for Sentry
Replace CrashRpt DLL and uploader with the corresponding ones for the
Sentry-native API.
2020-04-18 19:54:00 +01:00
James Turner aa7770911b Revert "macOS: remove use of Ninja for now"
This reverts commit b954ad8cd7.
2020-04-11 16:38:43 +01:00
James Turner b954ad8cd7 macOS: remove use of Ninja for now
For some reason the slave doesn’t like Ninja, let’s disable it until
I figure out why.
2020-04-10 12:07:04 +01:00
James Turner 9158b1688e Update macoS/Win build scripts for symbol uploading 2020-04-08 16:14:38 +01:00
James Turner 9effd91f62 macOS: Use different bundle identifiers for nightly builds
Also switch so nightly builds are always ‘lite’ (not full) to save
bandwidth / computational load on Jenkins
2020-04-02 22:21:20 +01:00
James Turner 0ddf75b382 Copy Swift libraries on macOS 2020-03-30 13:32:57 +01:00
James Turner 14ee759409 Fix Python3 compatability 2020-03-24 14:27:27 +00:00
James Turner aff1ac0f69 Add more catalog tags based on what’s used 2020-03-24 14:24:29 +00:00
James Turner 9453e085b3 Add Mespieler aircraft mirror 2020-03-21 18:41:45 +00:00
James Turner da4cf552cb Bugfix, missed $ on global variable 2020-03-18 12:41:42 +00:00
James Turner 91e0f86a0b macOS: code-signing changes 2020-03-17 16:33:27 +00:00
James Turner aae488794e Notarization support in macOS packaging scripts 2020-03-13 16:59:14 +00:00
James Turner 09cc52296d Put compositor back off for now
Need to figure out a way to handle it as another binary build, since
there is no runtime configuration option.
2019-05-24 13:55:59 +01:00
James Turner abc616b548 Enable Swift in nightly builds 2019-05-24 09:31:51 +01:00
James Turner c3b9b9a524 Enable compositor in nightly builds 2019-05-23 12:38:02 +01:00
James Turner 2277ba38c7 Fix a typo in DBus installer spec 2019-05-23 11:02:10 +01:00
James Turner ed88c630ea Add the git-mirror script uses on Jenkins
This is run on one of Jenkins Linux machines to mirror all the
SF repos for faster cloning and builds when SF is offline.
2019-01-14 13:19:01 +00:00
James Turner bd7ccccda6 Catalog configs from UKmirror 2018-10-23 12:01:58 +00:00
James Turner f0f047e6c5 Fix mirror URLs 2018-10-18 12:42:17 +00:00
James Turner 271f103ae3 Update catalogs config after discussion
Legacy catalog keeps the existing ID and URL, to avoid any problems
with older client versions
2018-10-18 13:37:17 +01:00
James Turner 99b893368b Catalogs: multiple download URLs (mirrors) supported 2018-10-17 14:16:40 +01:00
James Turner e4007bae99 Remove MD5 sum files from Git 2018-10-17 13:00:10 +00:00
James Turner 6e8b4c3ee7 Sharing logic tweaks 2018-10-17 13:00:10 +00:00
James Turner ccb35c7707 Catalog spec tweaks 2018-10-17 13:00:10 +00:00
James Turner 391ceaea11 Update-catalog.py: —quiet option 2018-10-17 11:04:11 +01:00
James Turner feae4a2d56 Tweaked catalog definitions 2018-10-17 09:26:08 +00:00
James Turner 70dfd6b8d4 Use LXML everywhere 2018-10-17 09:19:10 +00:00
James Turner a1f8e52ae8 Add three catalog setups, for UK mirror
The fgaddon-catalog was duplicated to avoid disturbing Curt’s config
he runs locally, until the new setup is working.
2018-10-15 11:39:56 +01:00
James Turner 2c41742b99 Add Russian to the language list
Fix provided by Michael Danilov
2018-10-11 13:26:58 +01:00
James Turner 77384be44a Include the OSG .DDS loader plugin in Mac builds 2018-10-05 13:12:29 +01:00
James Turner 5be72a84d3 Check-aircraft helper script
Tool to validate aircraft meta-data - basic for now, will expand
to be smarter over time.
2018-07-25 13:42:13 +01:00
James Turner 0b46052259 Catalog generation enhancements 2018-07-25 11:38:52 +01:00
James Turner 3cf24d18e7 Silence some noice in mac packaging script 2018-07-17 09:54:59 +01:00
James Turner 24db98b5e1 Also archive symbols for Windows builds 2018-07-02 11:39:08 +01:00
James Turner 68dee3f3a4 Catalog support for multiple author tags
This will enable richer author meta-data in aircraft, and hence
nicer GUI presentation of author information. Client-side support
still to be added before this can be used
2018-04-25 21:07:57 +01:00
James Turner 4588c2f1e8 Switch to relative submodule URLs
This will enable the Git mirror on Jenkins to work (and also
resolve some issues with SSH vs Git vs HTTP protocols)
2018-03-16 10:29:57 +00:00
James Turner bc4bd61de6 Mac: better macdeployqt fix 2018-02-01 09:31:09 +00:00
James Turner 38426b8a64 Mac: fix invocation of macdeployqt 2018-02-01 08:28:53 +00:00
James Turner f2cbb733a0 Add 'clean uninstall' option to the Windows uninstaller 2018-01-17 21:48:21 +00:00
James Turner 195f123c05 Set LD_LIBRARY_PATH in the linux build script 2017-12-25 17:04:47 +00:00
James Turner 3408da4f40 Fix a typo in Mac packaging script. 2017-12-24 21:20:24 +00:00
James Turner ab34ede1ea QML deployment for Mac release/nightlies 2017-12-23 17:01:54 +00:00
James Turner dddf9dcb83 Fix for windows-nightly. 2017-12-23 11:21:07 +00:00
James Turner f6cbce7324 Windows installer: fix QML deployment 2017-12-23 08:26:30 +00:00
James Turner 6034143788 Catalogs:-set.xml files cam exclude themselves
Re-add the old feature, that -set.xml files can explicitly opt-out of
being included in the catalog. Useful for some development and helper /
included files in some aircraft.
2017-11-27 17:59:37 +00:00
James Turner 7ad60c4471 Catalogs: skip set files with missing description
This occurs for at least the A320 copilot, for example. We also log a
warning in the catalog creation script
2017-11-27 17:53:46 +00:00
James Turner 4f5fd4bea6 Don’t wipe dist when building, since we need it
OpenSceneGraph is copied into dist, don’t blank it.
2017-11-17 14:26:33 +00:00
James Turner f1e8e8b4a2 Change MSVC runtime deployment
Rely on CMake install (in FlightGear) to copy all the required libs
to bin, so we simply grab them as part of that, instead of taking
them from the redist folder.

This relies on a corresponding FLightgear change.
2017-10-02 12:36:40 +01:00
James Turner 89948603de Catalog support for minimum-fg-version
Extend test coverage with a minimal aircraft to exercise more
code paths for this.
2017-07-30 10:38:04 -07:00
James Turner 70eb74bc09 Better, stronger, faster linking on Windows.
Assume the builds are against a version of OSG with the <fstream>
declspec(export) fix applied, and hence we can use normal linking,
not the /FORCE:MULTIPLE thing which slows down and complains.
2017-06-21 23:04:02 +01:00
James Turner 3e3b63181b Fixing line-endings 2017-06-21 23:00:53 +01:00
James Turner aeaf259c59 Upload PDB files to CrashFix 2017-04-18 08:57:35 +01:00
James Turner 257ba0f733 More tags based on suggestions. 2017-04-13 11:18:29 +01:00
James Turner 7eb3a8886f Improving catalog generation
Support multiple primary aircraft in a package, which has several
aircraft developers have requested. This adjusts the handling of
the variant-of and primary-set tags.

Additionally, this adds partial unit-test coverage for -set.xml
scanning and catalog XML generation. 

Run ./test_catalog to run unit-tests of the catalog generation.
2017-04-12 16:38:58 +01:00
James Turner f23197f811 Fix a typo. 2017-03-27 13:06:20 +01:00
James Turner 3f85e1911e Catalog script thumbnails, primary-set fixes.
- extract per-variant thumbnails from -set.xml files
- handle multiple primary aircraft in a directory (this will
  need client-side changes too, eventually)
2017-03-05 21:02:49 +02:00
James Turner b350cd9827 Adjust build scripts to set FG_BUILD_TYPE
Cmake now has a standard variable to indicate the build type we are
creating. Map the existing settings on each platform to that value
(with varying degrees of nice-ness, further clean-up possible)
2017-02-28 16:25:58 +00:00
James Turner 8e22064b71 Re-add tag validation and support to catalog.
Tags are copied to the catalog.xml again, and validated against
catalogTags.py
2017-02-27 00:32:01 +00:00
James Turner 7a64df78e3 Improve reporting on bad indices. 2017-02-27 00:16:38 +00:00
James Turner 533cec6236 Remove FGPanel special case for 64-bits.
We can build a 64-bit FGPanel now, since the issue was GLUT and freeGlut
supports a 64-bit version.

Note the shortcut icon is not disabled automatically, that needs an
additional fix.
2017-02-21 18:17:39 +00:00
James Turner acb8a7a793 Fix catalog parsing, add unit-tests
Fixes issues with conflated nodes and skipped previews in the
catalog XML.
2017-02-10 11:55:30 +00:00
James Turner 2c7e8318db OpenAL-soft doesn’t need oalinst
Simplifies our install, nice.
2017-02-08 11:49:02 +00:00
James Turner 799b0b4ad6 Fix merging of includes when parsing XML.
Incorrect use of addChild was causing overlaid properties not to be
merged correctly when performing an include.
2017-01-20 21:43:19 +00:00
James Turner 4d3a5fb528 Remove my catalog scripts in favour of Curt’s
(But preserve the catalog-tags list for future re-use)
2017-01-12 21:43:02 +00:00
James Turner e8a6c477cc Preview support. 2017-01-12 21:12:57 +00:00
James Turner 21a53b3537 Update-catalog does SGProps parsing of -set.xml
This restores the ability to use includes in -set.xml files visible
to the catalog code, and also exposes some problems / validation
issues in our -set.xml files. (Which can of course be fixed)
2017-01-12 14:39:35 +00:00
James Turner 0409f339ae Tweaks to my Mac build script. 2017-01-10 18:12:12 +00:00
James Turner 771c2a2abe Windows builds create PDBs again. 2016-12-13 11:32:33 +00:00
James Turner 224a9a0b18 Add my Mac and Linux build helpers.
This is to save new contributors some time getting a build env, since
download-and-compile produces a slightly Baroque setup for day-to-day
development.
2016-12-11 00:18:45 +00:00
James Turner 08cb5c481b Add my Windows build script for posterity.
Linux/Mac coming shortly.
2016-12-10 23:57:11 +00:00
James Turner c23ec2827f Ignore Windows build directories. 2016-12-09 14:59:57 +00:00
James Turner ba8feb7d6f Submdoule updates. 2016-12-09 14:56:33 +00:00
James Turner f1f612206f Re-enable CrashRpt in Windows installers. 2016-12-09 14:50:03 +00:00
James Turner 5b969d37ec Correct way to invoke ISCC in quiet mode! 2016-12-02 16:59:07 +00:00
James Turner 8e82d4e1fb Revert "Reduce logging level of NSIS."
This reverts commit 2dfbc989ba.
2016-12-02 16:58:15 +00:00
James Turner 2dfbc989ba Reduce logging level of NSIS. 2016-11-29 16:30:01 +00:00
James Turner 93b085f441 Fix a typo 2016-11-25 21:52:42 +00:00
James Turner 52bceabab7 Catalog includes description / authors per variant. 2016-11-25 21:51:46 +00:00
James Turner cee226183c Official catalog supports 2017.* versions. 2016-11-25 17:20:31 +00:00
James Turner 13137727b0 Remove FGRun from Windows packaging. 2016-11-14 22:29:04 +01:00
James Turner 249f00dd32 Reenable OpenAL installation 2016-09-28 17:11:14 -05:00
James Turner 6ae033aa68 Don't install osg serializers.
Current OSG build excludes serializers, so don't try to install them.
2016-08-18 11:18:08 +01:00
James Turner 914241cc79 Disable signing for now, something not correct. 2016-08-17 15:38:54 +01:00
James Turner 6e61261a52 Enable Windows code-signing. 2016-08-17 13:43:40 +01:00
James Turner 450ab705d2 Remove standalone TerraSync from Windows installer. 2016-04-15 16:16:59 +01:00
James Turner e50b26e537 Use libCurl for night / release builds. 2016-04-15 16:12:51 +01:00
James Turner 92b7ab1b09 Remove the old catalog-creation logic
- avoid confusing people by having both the old and new logic
  in the same place.
2016-01-14 10:32:57 -06:00
James Turner 99026272a1 Catalog-creation tweaks. 2016-01-14 10:30:34 -06:00