Commit Graph

465 Commits

Author SHA1 Message Date
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 2016-11-17 13:43:39 +01:00
Automatic Release Builder
b03d12313a new 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
Rebecca N. Palmer
b2743b92f3 download_and_compile: add option to build CMake from source
(we may soon require a newer version than e.g. Debian stable has)
2016-10-20 22:42:18 +01:00
Rebecca N. Palmer
f57a5ed4cb fgdata_checkers: update comments 2016-10-20 22:42:01 +01:00
James Turner
249f00dd32 Reenable OpenAL installation 2016-09-28 17:11:14 -05:00
Torsten Dreyer
f581b93d9b Fix #1898: wrong order of pull and checkout 2016-09-18 15:46:33 +02:00
Automatic Release Builder
2a1b666a5e track submodule changes for release 2016-09-06 13:16:39 +02:00
Automatic Release Builder
92864a4c1a track submodule changes for release 2016-09-06 12:59:53 +02:00
Automatic Release Builder
03ef344ada new version: 2016.4.0 2016-09-06 12:51:05 +02:00
Automatic Release Builder
b81e7868e7 new version: 2016.3.1 2016-09-06 12:51:05 +02:00
Curtis L. Olson
a64e172c00 Merge branch 'next' of ssh://git.code.sf.net/p/flightgear/fgmeta into next 2016-08-19 06:31:57 -05:00
Curtis L. Olson
6927ffb67c Fix a cwd/path issue when building zip files. 2016-08-19 06:29:50 -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
Curtis L. Olson
d60b866718 Merge branch 'next' of ssh://git.code.sf.net/p/flightgear/fgmeta into next 2016-08-17 13:35:27 -05:00
Curtis L. Olson
57e20e046a Aircraft catalog update script with example catalog configuration. 2016-08-17 13:33:10 -05: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
Richard Senior
cd41e9713f Parse new NOAA METAR index page format 2016-08-08 23:49:34 +01:00
Alessandro Menti
78a51fb6e1 Make the NOAA METAR URL point to the new address 2016-08-04 21:35:11 +02:00
James Turner
5a64d51e10 Further Windows build fixes
Adjust OSG install location to match existing Jenkins setup.
2016-08-03 10:39:32 +01:00
James Turner
32738decf4 Change Windows build script for VS2015 2016-08-02 11:18:42 +01:00
Torsten Dreyer
378b261aaa Remove obsolete ENABLE_CURL flag from build scripts 2016-05-17 10:57:42 +02:00
Automatic Release Builder
20f6511228 track submodule changes for release 2016-05-17 10:12:02 +02:00
Automatic Release Builder
8f8b7b24c1 new version: 2016.3.0 2016-05-17 10:07:30 +02:00