Commit Graph
487 Commits
Author SHA1 Message Date
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
Stuart Buchanan e86954cc7f Add additional manufacturers and eras.
Note on eras:  I've added every decade since flight started for
consistency and completeness.  For example, the Bell X-1 is from
the 1940s but is post-WW2.
2017-04-02 21:04:01 +01:00
James Turner f23197f811 Fix a typo. 2017-03-27 13:06:20 +01:00
Stuart Buchanan f28db85017 Add aerobatic, avro, ultralight and sort lines 2017-03-23 22:50:26 +00: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
Automatic Release Builder 493ad2c306 use git:// for fgdata submodule remote to keep jenkins happy 2017-02-22 18:09:42 +01: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
Automatic Release Builder 0dd0bf3043 set submodule head for fgdata 2017-02-20 19:30:10 +01:00
Automatic Release Builder b0594ed4ef track submodule changes for release 2017-02-20 18:52:19 +01:00
Automatic Release Builder f2e86108d4 new version: 2017.2.0 2017-02-20 18:52:19 +01:00
Automatic Release Builder 8462f3217a new version: 2017.1.1 2017-02-20 18:52:19 +01:00
Automatic Release Builder 735f5160e4 some tweaks to the release_branch builder scripts version/2017.1.1 version/2017.2.0 2017-02-20 18:51:44 +01:00
Curtis L. Olson a5949431b1 A couple cleanups .... 2017-02-12 09:44:02 -06:00
Curtis L. Olson 0622410e4a Create the preview directory if it doesn't already exist. 2017-02-12 09:14:05 -06: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
Torsten Dreyer 93b71e29e6 looks like sf doesnt like git protocol anymore.
Use anonymous https instead
2017-02-09 17:46:55 +01:00
Torsten Dreyer fcf5087da9 use release instead of -rc suffix 2017-02-09 17:46:09 +01:00
James Turner 2c7e8318db OpenAL-soft doesn’t need oalinst
Simplifies our install, nice.
2017-02-08 11:49:02 +00:00
Rebecca N. Palmer 157ce05c69 d&c.sh security: use https to prevent MITM attacks
(SourceForge now allows anonymous https fetching)
2017-01-28 17:17:44 +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
Torsten Dreyer c9f7483fc4 Merge /u/chrisblues/flightgearMeta/ branch next into next
https://sourceforge.net/p/flightgear/fgmeta/merge-requests/19/
2017-01-13 14:29:06 +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
chris_blues 37ff25cfe4 Add Nasa2FGEarthview
a converter script (bash) to download sattelite images from NASA or a mirror
and convert them to usable FGearthview format. Supports different
resolutions.
See:
https://github.com/chris-blues/Nasa2FGearthview
2017-01-12 10:44:40 +01: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
Florent Rougon ef36d50d9b Add directory changes-in-dat-files/apt.dat with two patches for apt.dat
000-general-modify-header.patch:
  indicate that apt.dat has been modified by the FlightGear team

001-CCC5-fix-missing-Unicom-frequency.patch:
  add missing Unicom frequency for CCC5 (Havelock), thanks to wkitty42

The patch files have LF line endings (otherwise this is a mess: some
lines ending with LF and others with CRLF inside the same file). In
order to obtain this, apt.dat has been recoded to LF line endings (Unix
and MacOS X), then the changes have been made, the diff commands run,
and finally the resulting file has been recoded with CRLF line endings
(Windows) before being gzipped and written to FGData. This was done so
in order to preserve compatibility with software that could not handle a
change in $FG_ROOT/Airports/apt.dat.gz's line ending style.
2016-12-08 19:20:06 +01: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
Torsten Dreyer 6cb7d12ec1 Remove locale folder from install
After removal of fgrun, this folder does not exist anymore
2016-11-18 11:06:36 +01:00
Automatic Release Builder 16a42dfc6b Add the scripts to automize the release process 2016-11-17 15:38:09 +01:00
Automatic Release Builder 9d6ce08430 track submodule changes for release 2016-11-17 13:43:40 +01:00
Automatic Release Builder 95b7ef534b new version: 2017.1.0 version/2017.1.0 2016-11-17 13:43:39 +01:00
Automatic Release Builder b03d12313a new version: 2016.4.1 version/2016.4.1 2016-11-17 13:43:39 +01:00
James Turner 13137727b0 Remove FGRun from Windows packaging. 2016-11-14 22:29:04 +01:00
Rebecca N. Palmer 7e30b2f87a d&c.sh: make setting build type work, default to RelWithDebInfo
Partly based on work by waldo kitty <wkitty42>
2016-10-30 22:01:36 +00:00
Rebecca N. Palmer 6a356f7e18 download_and_compile: use our previously compiled cmake if it exists 2016-10-29 22:15:32 +01:00