Commit Graph

800 Commits

Author SHA1 Message Date
James Turner
3bf94f7b61 AppImage: use stable 7 version of LinuxDeployQt 2021-05-24 15:46:43 +01:00
James Turner
32cb401c79 Windows: add osgdb_osgterrain loader to installer
Needed for WS3 testing
2021-05-21 09:17:28 +01:00
James Turner
4db42544d2 Fix for 64-bit only Windows build
Remove reference to OSG32 which is now empty
2021-05-20 14:00:09 +01:00
James Turner
9eafe4e274 AppImage: more tweaks to Linux build
Use RelWithDebInfo, switch to ninja, and fix the OSG-36 lib path
2021-05-20 09:31:45 +01:00
James Turner
178cdbe216 AppImage: switch to OSG 3.6.5 2021-05-19 10:16:01 +01:00
Automatic Release Builder
04587d3a39 Remove more files from the base package 2021-05-19 10:13:45 +01:00
Florent Rougon
aaf52f0628 download_and_compile.sh: accept qtchooser as an alternative to qt5-default
This should be more user-friendly, as qt5-default isn't part of recent
Debian/Ubuntu distros.

List discussion: https://sourceforge.net/p/flightgear/mailman/message/37281536/
2021-05-13 14:29:49 +02:00
Stuart Buchanan
bd01aad8e6 WS30 - Scenery features from OSM 2021-05-03 15:59:30 +01:00
Automatic Release Builder
8be5b2fc52 Update post-upload to support more file suffixes 2021-03-22 11:06:24 +00:00
Automatic Release Builder
6eae0403c1 Add this script so it doesn’t get lost 2021-03-22 11:04:05 +00:00
Automatic Release Builder
3d47c15feb Fix LibLZMA path 2021-03-18 15:50:00 +00:00
Florent Rougon
26c859fcbd git-date.py: minor changes
- Special-case Windows for the default config file location (this should
  allow the program to run even if HOME is unset).

- Improve the help text, in particular by reordering some of the
  options.
2021-03-11 21:01:37 +01:00
Florent Rougon
538e89be54 git-date.py: fix test for "no repository was specified"
Also perform miscellaneous minor formatting fixes.
2021-03-10 20:44:13 +01:00
Florent Rougon
b68dc80cb6 git-date.py: minor fix to the help text 2021-03-10 20:14:06 +01:00
Florent Rougon
d817865575 git-date.py: clarify the usage help text 2021-03-10 17:47:06 +01:00
Florent Rougon
d0f4f363d2 Add script git-date.py in directory 'dev-utils'
This script allows one to easily find commits in several Git
repositories around a given date (in any date format accepted by Git).
The repositories may be given labels for easier identification and can
be defined via a configuration file and/or the command-line arguments.

Option --checkout tells git-date.py to automatically perform a
'git checkout' in each of the repositories at the commits that were
found. Options --show-commits and --show-commits-option instruct it to
run 'git show' for each commit found with the options of your choice
(all options can also be set via a configuration file).

This script can be useful to find when a given regression happened in
FlightGear---or any project that makes use of several Git repositories.
For more details, run 'git-date.py --help'.
2021-03-10 17:12:47 +01:00
Automatic Release Builder
53a0c9cc2e Don't wipe all of output/, only data TXZs
Otherwise we wipe source tarballs created by the build script.
2021-02-17 11:04:57 +00:00
Automatic Release Builder
27475c599f Alternate syntax for older Git on Jenkins 2021-02-17 10:35:25 +00:00
Automatic Release Builder
b8bc8301f9 Fix Windows installer to add libLZMA.dll 2021-02-12 22:29:09 +00:00
Automatic Release Builder
411823a24d Add script to create base package and update TXZ 2021-02-12 22:28:52 +00:00
Slawek Mikula
799633854b - build_release_windows.bat - fix for creating InstallConfig.iss file 2021-02-11 21:24:05 +00:00
Slawek Mikula
2b0b734160 - #2524 - fix of FlightGear-files.iss include (after defines) 2021-02-11 15:22:46 +00:00
Slawek Mikula
1b2b8da12f - setupimg.bmp - new last page screen 2021-02-10 14:32:23 +00:00
Slawek Mikula
4e1d247ce3 - info-before-en.txt, info-before-pl.txt - EN/PL information before installation - unstable
- FlightGear-files.iss - removed commented-out files
- FlightGear.iss - add InfoBeforeFile for EN/PL languages
2021-02-10 14:32:23 +00:00
Slawek Mikula
136ef74759 - #2524 - removed unused script (don't know where it comes from :)) 2021-02-10 14:32:23 +00:00
Slawek Mikula
bfe6b6b925 - #2524 - ported changes from release installer to next branch (
split section of ISS installer, additional translated string,
files from flightgear source, removed antivirus message)
2021-02-10 14:32:23 +00:00
Slawek Mikula
7deb727a90 - #2244 - german translations 2021-02-10 14:32:23 +00:00
Slawek Mikula
68f0c9ee74 - #2244 - added spanish & dutch translations 2021-02-10 14:32:23 +00:00
Slawek Mikula
01a6208fa7 - #2244 - added some info about uninstall procedure inside fgfs.exe
(cherry picked from commit af8e8ffb800f8ac02f43bfeb517721f6c2038e80)
2021-02-10 14:25:07 +00:00
Slawek Mikula
fd93c81fbb - #2244 - i18n for windows installer
- build_release_windows.bat - add code to parse FGVersion and provide FGVersionGroup (major.minor) text
 - FlightGear.iss - extend docs, use FGHarnessDir to exclude direct drive mapping, use FGVersionGroup for installer marking, add i18n (en/pl) with custom messages, use %USERPROFILE instead of {userdocs} for additional folders

(cherry picked from commit 5da03d6ae9412afd53452c4e04fb33ca2fe36249)
2021-02-10 14:24:53 +00:00
Automatic Release Builder
4ad749a481 Update catalog compatability versions
Ensure the stable 2020 is only used for the LTS, and
trunk is used for 2020.4 / next
2021-01-24 15:34:20 +00:00
James Turner
0cf47573fb Add LibLZMA to installers
- Windows .ISS script
- AppImage .so copy list
- manual copy on macOS DMG building
2021-01-10 12:02:40 +00:00
Florent Rougon
79642b4d29 download_and_compile.sh: add dependency liblzma-dev for SIMGEAR 2021-01-09 18:53:58 +01:00
Automatic Release Builder
273927d40a Stable 2020 catalog: remove 2020.4 support 2020-12-14 14:30:41 +00:00
Automatic Release Builder
979d8f051e macOS: include osgTerrain in packaging 2020-11-29 16:11:12 +00:00
Automatic Release Builder
c24e3c2aac Fix typo in Windows build .bat 2020-11-21 16:03:31 +00:00
Florent Rougon
fa9550e5e7 download_and_compile.sh: don't install OSG or plib packages if these are built
If the OSG component has been specified, don't attempt to install a
libopenscenegraph...-dev package from the distro. Ditto for the
libplib-dev package when the PLIB component has been specified.
2020-11-16 21:24:07 +01:00
Automatic Release Builder
b11dab8c30 Windows: remove compositor from build script 2020-11-16 18:36:31 +00:00
Florent Rougon
4a82d5e8bc download_and_compile.sh: qml-module-qtquick-controls2 for everything but --old-lts
Require qml-module-qtquick-controls2 when building 'next', or using -s,
or --lts.
2020-11-16 15:06:09 +01:00
legoboyvdlp R
444e8c0338 Add osgTerrain to the Windows install 2020-11-15 09:33:58 +00:00
Florent Rougon
c6dde7ecc5 download_and_compile.sh: make --lts use release/2020.3 and add --old-lts
For SimGear, FlightGear and FGData (i.e., the SIMGEAR, FGFS and DATA
components in download_and_compile.sh-speak), option --lts now means
release/2020.3 and the new option --old-lts means release/2018.3.
2020-11-14 19:08:15 +01:00
Brendan Black
4b45f4224e cp libfreebl* crypto libs so ubuntu 20.10 works 2020-10-28 15:11:57 +00:00
Automatic Release Builder
eea397ed85 Make set-version.sh handle new naming
Now we renamed simgear-version and flightgear-version, this
script needed to get smarter.
2020-10-26 10:09:44 +00:00
Automatic Release Builder
b8a7bf3104 Catalogs: add 2018 -> 2020 migration information 2020-10-25 18:08:44 +00:00
James Turner
00d4c6ec93 Re-enable Ibiblio in update-catalogs.sh 2020-10-22 12:59:24 +00:00
Automatic Release Builder
6435bcbf4f FGAddon trunk catalog: update version options
Mark the trunk catalog as compatible with 2020.4, and remove older
versions from the compat list.
2020-10-22 13:56:38 +01:00
Florent Rougon
c731caa23d download_and_compile.sh: rename --sg-cmake-args to --sg-cmake-arg and --fg-cmake-args to --fg-cmake-arg
This is more logical this way, since every use of such an option
specifies exactly *one* additional argument to pass to CMake.
2020-10-20 10:29:41 +02:00
Florent Rougon
2618144e24 download_and_compile.sh: add support for --sg-cmake-args and --fg-cmake-args
Each of these options may be passed multiple times. The advantage over
the previous interface (environment variables SG_CMAKEARGS and
FG_CMAKEARGS) is that the new interface allows one to pass arguments
containing spaces to CMake, for instance:

  --sg-cmake-args='-DCMAKE_CXX_FLAGS=-Wno-deprecated-declarations -Wall'

(the single quotes here would be interpreted by the user's shell, and
removed before download_and_compile.sh can see them). Setting the
environment variables SG_CMAKEARGS and FG_CMAKEARGS should still work as
before but is now deprecated.

The implementation uses Bash arrays named SG_CMAKE_ARGS and
FG_CMAKE_ARGS, but in order to avoid confusing users about the
deprecated variable names, the log file continues to print
'SG_CMAKEARGS=...' and 'FG_CMAKEARGS=...' (note the different use of
underscores in the names).
2020-10-20 01:39:27 +02:00
Automatic Release Builder
90f951a899 Update VS version for nightly Windows builds
Disable 32-bit builds for the moment.
2020-10-15 12:22:11 +01:00
Automatic Release Builder
ebaa83c483 Update version information 2020-10-13 22:46:05 +01:00