Commit Graph

837 Commits

Author SHA1 Message Date
4899cbc634 更新 'build_appimage.sh' 2022-12-21 21:11:44 +08:00
Florent Rougon
d8a16058bf download_and_compile.sh: remove some unnecessary quoting
Only in a few "crowded" places where this improves readability. Note
that in these cases, the quote removal does *not* prevent the parameter
values from containing spaces, tabs or newlines.
2022-12-15 23:10:13 +01:00
Florent Rougon
5e6276bd30 download_and_compile.sh: improve the --help output
Reorder options (most basic and important options first; related options
together; experimental or deprecated options last). Explain a bit more
in some cases. Use the https protocol in the URL of the FlightGear wiki.
2022-12-15 22:27:01 +01:00
Florent Rougon
fe33acae74 download_and_compile.sh: add option --override-repo
This option allows one to override the repository from which a given
component is to be cloned (it doesn't do anything when the repository
for a component is simply updated).

Example that downloads OSG 3.4.2 from James' repository (it has
FlightGear-specific patches applied):

  download_and_compile.sh -j$(nproc) -s --cleanup \
    --override-repo OSG=GitHub:github.com/zakalawe/osg.git \
    --component-branch OSG=fgfs-342-1 SIMGEAR FGFS DATA OSG
2022-12-15 22:18:12 +01:00
Florent Rougon
aa17379ae0 download_and_compile.sh: simplify the definition of _usage() 2022-12-15 22:17:42 +01:00
Florent Rougon
5e71ae60fe download_and_compile.sh: minor change to the --help output
Amend wording to avoid confusion (some people interpret "latest release"
as meaning "development branch"; use "latest stable release" to avoid
this confusion).
2022-12-05 18:23:07 +01:00
Florent Rougon
7469b39cad download_and_compile.sh: changes to the generated scripts
The first goal of this commit was to ensure that the LD_LIBRARY_PATH
setting performed in some of the generated scripts uses absolute paths,
otherwise if a process (such as ctest) changes the current directory
before starting an executable that needs our LD_LIBRARY_PATH setting, we
can have problems (thanks to Patrick Callahan for the report).

Some refactoring of the automated script generation plus a few other
fixes concerning these scripts were done along the way (use here
documents for better readability; don't use 'echo' with options as this
is non-portable; etc.).
2022-11-30 22:13:25 +01:00
Florent Rougon
1e65f0e144 download_and_compile.sh: little optimization 2022-11-25 09:56:14 +01:00
Florent Rougon
14e27756b1 download_and_compile.sh: new generated wrapper script named 'run'
This new script is created by download_and_compile.sh in the same way as
run_fgfs.sh and friends. It changes the current directory to $d/install,
where $d is the directory containing the 'run' script. Then it sets
LD_LIBRARY_PATH in the same way as run_fgfs.sh. Finally, it runs the
command formed of all arguments passed to it.

This can be used for instance to run SimGear tests with the proper
LD_LIBRARY_PATH setting: assuming SimGear has been built by
download_and_compile.sh and you are in the directory from which
download_and_compile.sh was run, you can do:

  cd build/simgear
  ../../run ctest --output-on-failure
2022-11-25 09:03:50 +01:00
Florent Rougon
11949b1e8e download_and_compile.sh: add core file support to run_fgfs_debug.sh
Usage of run_fgfs_debug.sh is slightly changed: you now need to put a
'--' argument before all arguments that you want to pass to fgfs. For
instance:

  ./run_fgfs_debug.sh -- --aircraft=ufo --airport=PMDY

There is also a new option: -c, alias --core-file. This option allows
one to start gdb from an existing fgfs core dump, with appropriate
LD_LIBRARY_PATH setting and --directory options; in this case, don't
specify any fgfs argument (the fgfs arguments used when the core file
was produced have been recorded therein). Example:

  ./run_fgfs_debug.sh -c /path/to/core

All this is documented with './run_fgfs_debug.sh --help'.
2022-11-25 00:38:21 +01:00
Florent Rougon
0ee880c5dc download_and_compile.sh: install libqt5quick5 if available
This should solve a bug where some launcher icons aren't displayed
properly. So far, we had an optional dependency on qml-module-qtquick2,
which depends on libqt5quick5 or libqt5quick5-gles, however only the
former ensures a proper display in the built-in launcher (when
libqt5quick5-gles is installed instead of libqt5quick5, users see black
squares instead of the icons on the left).
2022-10-23 10:08:13 +02:00
Stuart Buchanan
50fd23d72c Include more railway features, don't add tunnels
From mespieler.

8333805787116b9d5cbc91b67f2a6b9bac4922b1
2022-09-25 18:32:25 +01:00
James Hogan
8966dcd737
Windows: Install openxr_loader.dll
Add openxr_loader.dll to the list of 3rd party DLLs that need
installing. The OpenXR loader is now included in windows-3rd-party,
allowing VR support to be enabled, which requires this file.
2022-08-19 23:42:28 +01:00
Stuart Buchanan
382747c2d1 WS30: Improved gencoastlines
Use Overpass API more effectively in 1x1 degree blocks,
using same technique as genroads.py
2022-05-28 20:42:43 +01:00
Automatic Release Builder
5b12f55c3f Add libevent to packaging list 2022-04-20 10:26:52 +01:00
Automatic Release Builder
d043edf9c5 macOS: update for correct libEvent version 2022-04-19 13:48:56 +01:00
Automatic Release Builder
969c2f9788 Add helper script to fix macOS libEvent packaging 2022-03-08 15:14:17 +00:00
Automatic Release Builder
c346526e1b Windows installer: don't copy compiler runtime 2022-02-08 10:30:27 +00:00
Florent Rougon
7bcff8eaf4 i18n.py: declare plural forms for the Turkish language
I'm not quite sure, but it seems to me that Qt Linguist treats the
Turkish language as having one "universal form". We need plural forms
for Turkish since FGData commit c0bb8d8a8d64e1 in branch
'release/2020.3' added a 'tr' translation.
2022-02-03 15:30:46 +01:00
Fahim Imaduddin Dalvi
4730d57d40 WS30: Updated Dockerfile with python scripts
The Dockerfile has been updated to include Python, ws30 line data
generation scripts and their dependencies.
2022-01-22 17:18:23 +03:00
Fahim Imaduddin Dalvi
f672e8451b WS30: Added python dependency requirements file for scripts 2022-01-22 16:25:06 +03:00
Automatic Release Builder
65f2c2e041 Tweak macOS OpenAL packaging 2022-01-07 11:12:56 +00:00
Automatic Release Builder
b1dd31e255 Mac: include OpenAL-soft in the bundle 2022-01-06 14:19:11 +00:00
Automatic Release Builder
9fa81a6ab8 Tweak Mac Jenkins script to optionally use OpenAL-soft 2022-01-06 14:15:51 +00:00
Julian Smith
52c0efedb7 download_and_compile.sh: also install ffmpeg libraries for video encoding support. 2021-12-27 10:31:47 +00:00
Stuart Buchanan
d7abbaa10f WS30: Improved road generation 2021-12-05 20:38:19 +00:00
Fahim Imaduddin Dalvi
f46f25dbaf Updated Dockerfile for more efficient builds.
We now use multi-stage builds so that the build-time dependencies and
code are not included in the final image. Also updated the README with
information about Docker hub, and added a LICENSE file.
2021-11-17 21:39:38 +03:00
Fahim Imaduddin Dalvi
54e68e949f Added Dockerfile for VPB terrain generator
Added a Dockerfile that can be used to build a docker/podman image with
the required environment for VPB terrain generator. A sample generation
script is also included.
2021-11-15 20:23:44 +03:00
Brendan Black
1be19e5f12 Account for differences between test vm & build vm
my test vm has some extra *.so library symlinks so some patchelf commands were failing on the jenkins build vm - this changes the patchelf command to catch all the possible copied libraries
2021-09-25 09:02:16 +02:00
Brendan Black
f135bd8f61 build_appimage.sh: run patchelf on libharfbuzz
run patchelf on libharfbuzz as manjaro needs it now (rolling distros...)
2021-09-24 08:50:40 +01:00
Brendan Black
e36c646caf fix for https://sourceforge.net/p/flightgear/codetickets/2651/
libfreetype 2.11 breaks compatibility with older harfbuzz that we are including to enable backwards compatibility with Ubuntu 16.04 based dists, so we now need to include libfontconfig & libpng15

In future for next we might  not bother with harfbuzz,fontconfig etc as we are compiling OSG with vendor neutral dispatch (libGLvnd) that the older Mesa in 16.04 doesn't support
2021-09-10 11:19:13 +01:00
Automatic Release Builder
61abd3e89e Add serializer plugins to Windows installer
This should enable WS30 support in nightly builds.
2021-09-02 13:41:19 +01:00
Jonas K
232699cb31 Add positional option "--exec-app=" to AppImage launch script
This option allows execution of any application stored in "/usr/bin" of the AppImage.
It has to be used as the first argument handed to the launch script.

Squashed commits:
- Add additional parameter checks and verify executability
- Print help when no value is passed to --exec-app
- Add all packaged executables as "additional executable" arguments to call of linuxdeployqt
  + Required dependencies of other applications will be deployed and library paths updated.
  * Update help text
  * Use find instead of ls to make file name handling robust (special chars, newlines, spaces)
- Modify find command to filter for executable files instead of using find's "-executable" option
  Previously find failed to filter for executable files only when the AppImage was executed.
  When the was AppImage mounted, "ls -al" showed that the file "usr/bin/qt.conf" was not executable.
  However, when executing "find usr/bin/ -type f -executable" the file "usr/bin/qt.conf" still showed up.
  Executing the same find command on the not-mounted source appdir did not show the file.
  The change from "-executable" to logic ands/ors of "-user", "-group" and "-perm" fixes this behaviour.
  Additionally this commit does no longer add "fgfs" to the additional executables since it is the main executable and processed anyways.
- Update find command to properly check permissions
  Read permission and executability are required.
- Minor improvements for basename calls
  * Quotes around basename argument
  - Useless "basename" call
- Fix potential security flaw when matching application name input
  The matching of "/" was erroneous and allowed execution of binaries outside the AppImage's /usr/bin directory.
2021-08-31 11:04:41 +01:00
Florent Rougon
b42f543b93 i18n.py: print the problematic 'trans-unit' id when aborting
It's much easier to locate an error in a .XLF file when one has the id
of the 'trans-unit' element that causes the problem.
2021-08-04 00:07:55 +02:00
Automatic Release Builder
acd34fda78 Linuxdeployqt: Use -qmldir to define plugins
This should copy less stuff, and hopefully fix the reported error 
loading QtQuick Controls-2
2021-06-09 10:50:28 +01:00
Automatic Release Builder
7e26d650bc AppImage: default to launch, fix osgDB plugin loading
When no arguments are pased to the AppImage, start with
the launcher for a pleasant experience.

Adjust the RPath on our copied osgDB plugins, so that dependencies
are found at the bundled lib dir.
2021-06-07 16:54:16 +01:00
Automatic Release Builder
79ee40e885 Fix Ubuntu 16 / Mint 18 support: copy HarfBuzz
Need to include HarfBuzz in the image, which comes from /lib64 on our
build machine

Thanks to Brendan Black for tracking this down

Ticket-Id: https://sourceforge.net/p/flightgear/codetickets/2590/
2021-06-04 10:04:59 +01:00
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