FGFS-4.1/fgmeta
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
561 Commits 31 Branches 50 Tags
69e2ca5ce6f5c0c41dd4e02b8a7965ce760d5359
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
James Turner d930779381 Packaging updates 2016-01-13 19:47:13 -06:00
James Turner 141be1410a Fix adding of variants to catalog property-list 2016-01-03 19:49:54 -06:00
James Turner 5b1b01bb0f Don’t need MAKEOPTIONS 
- we already set official MAKEFLAGs on the Jenkins slave.
 2015-12-08 18:55:37 +00:00
James Turner 0c36cc3eef Use make instead of xcodebuild to compile Mac. 
Xcode seems to be overriding the setting of min-macos-version,
which is causing 10.7 and 10.8 support to fail. See if using
make resolves this.
 2015-12-08 18:40:02 +00:00
James Turner 3aacabdfd0 Catalog tag changes 
- fix spelling of ‘Embraer’
- add airship feature type
 2015-12-08 18:28:49 +00:00
James Turner 9d00aec7dd Tweak Qt-path setting for Mac nightly. 2015-11-15 00:11:25 +00:00
James Turner 6f54db6d76 Fix zip-name specification in packages 2015-09-27 23:15:44 -05:00
James Turner b11fae7f37 Fix paths inside created zips 2015-09-24 20:39:03 -05:00
James Turner 8823d89f42 Add ‘force’ option to update every package 2015-09-24 20:38:54 -05:00
James Turner c19096b0af Fixes to package generation tooling 2015-09-24 19:45:42 -05:00
James Turner d943076183 Adjust package IDs, use primary -set.xml 
- previously directory name was used, but this caused problems
for aircraft with certain combinations of dir/-set.xml name
 2015-09-20 09:20:43 -05:00
James Turner 955fa86000 Archive windows PDB files. 2015-09-04 08:34:05 +01:00
James Turner c67f750862 Archive PDB files inside the build script. 2015-09-02 11:41:49 +01:00
James Turner 5d112a90d4 Whoops, don’t block on user input. 
/Q to rmdir avoids an ‘are you sure’ prompt
 2015-09-02 11:38:50 +01:00
James Turner b75295f647 Fix nightly build uploads. 2015-09-02 11:35:06 +01:00
James Turner 4ac12095a6 Fix data destination on Windows 
- ensures default path logic works.
 2015-09-02 11:27:50 +01:00
James Turner deeeddbfbb Additional debug output from post_upload.py 2015-09-02 11:26:39 +01:00
James Turner e0504be7cf Mac release builds tweaks 2015-08-31 23:29:35 +01:00
James Turner 3c0683185f Post-upload tweaks to support RC builds. 2015-08-31 23:29:20 +01:00
James Turner 2d119001c6 Fix creation of nodes with existing index. 2015-08-03 17:59:41 -05:00
James Turner 479a175587 Support a global exclude file for zip creation. 2015-07-30 12:04:17 -05:00
James Turner f61ceb1293 Support a per-aircraft exclude file. 
- needed to make the P51D not be crazy large.
 2015-07-29 15:09:01 -05:00
James Turner d2cb130135 Fix existing catalog 2015-07-29 11:54:45 -07:00
James Turner bd453e4a3e Drive scan from SCM repos. 
- reduces repetition in the config XML.
 2015-07-28 15:26:00 -05:00
James Turner 80f7a7f2d3 Mirror URLs written correctly. 2015-07-27 22:39:32 -05:00
James Turner 78de3e4243 More control over updating SCM repos. 2015-07-27 21:45:55 -05:00
James Turner 565feadfa6 Support for multiple upload targets 
- also option to update the SCM repo
 2015-07-27 21:40:00 -05:00
James Turner 242c0f9172 Move PackageData to its own file. 2015-07-25 22:45:01 -05:00
James Turner 651482a0df Maintain catalog: argument parsing 2015-07-22 23:35:57 -04:00
James Turner f0fff6d16e Catalog creation work 
- XML scanning works
- thumbnail extraction progressing
 2015-07-18 15:30:20 -05:00
James Turner 8d1e9abcc9 Catalogs: Thumbnail extraction works. 2015-07-14 21:37:39 -05:00
James Turner 5944ad64d9 Improved bool parsing 2015-07-11 22:23:14 +01:00
James Turner cf1afee705 maintain catalog: Mirror URLs generated 2015-07-11 22:23:05 +01:00
James Turner 548de8bd2d OS-X: Adapt package script for @rpath 
Since the Mac build sets @rpath correctly now, no longer
need to fix install names during package creation.
 2015-07-11 21:48:24 +01:00
James Turner f390d16625 Ignore .pyc files 2015-07-11 21:47:38 +01:00
James Turner fbda7475f0 Maintain catalog script starting to work. 2015-07-11 21:47:13 +01:00
James Turner 287380d98d Work on catalog creation. 2015-06-04 22:09:46 +01:00
James Turner 0c3bf73b01 Refresh superbuild 
- remove FGRun
- remove Windows-3rd-party-dep download
- disable OpenRTI for now
- Pull OSG from Git
- Don't build Boost on Mac
 2015-05-06 21:38:07 +01:00
James Turner d4890af978 Missed add of submodule dir 
- thanks to Alessandro Menti for catching
 2015-04-06 09:32:39 +01:00
James Turner c2ef0ba2dc Add windows 3rd party repo as a submodule 2015-04-03 10:52:29 +01:00
James Turner fae026da99 Post-upload script for Mac & Win 
Runs on download.flightgear.org, as part of the SFTP upload step of
the Jenkins jobs, to deal with changing version, creation of symlinks
and mirroring to SourceForge.
 2015-03-23 11:36:39 -05:00
James Turner e80520c9ac Initial hacking on a post-upload script. 
- this will live on download.flightgear.org, but adding
here so it can be maintained visibly.
 2015-03-11 17:48:33 +00:00
James Turner 1758cee3f3 Remove old data rsync code. 2015-03-09 16:35:18 +00:00
James Turner 444d6be8ad Mac nightly creates full and lite DMGs. 2015-03-08 01:01:03 +00:00
James Turner e3d55cf136 Fix nightly build rsync source. 
Rsync can’t rename the root folder, so moved things on Sphere into
a subdirectory.
 2015-02-28 11:42:36 +00:00
James Turner e57f5f761c Use correct FGData branch for nightlies. 2015-02-24 12:56:22 +00:00