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.
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.
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
Amend wording to avoid confusion (some people interpret "latest release"
as meaning "development branch"; use "latest stable release" to avoid
this confusion).
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.).
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
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'.
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).
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.
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.
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.
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.
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
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
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.
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.
- 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.