Jonathan G Rennison
39df1c49a1
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/fileio.cpp
# src/group_gui.cpp
# src/industry.h
# src/lang/korean.txt
# src/linkgraph/linkgraphjob.cpp
# src/linkgraph/linkgraphjob.h
# src/linkgraph/linkgraphschedule.cpp
# src/linkgraph/linkgraphschedule.h
# src/openttd.cpp
# src/saveload/saveload.cpp
# src/saveload/saveload.h
# src/town_cmd.cpp
# src/vehicle_gui.cpp
# src/vehicle_gui_base.h
2021-01-30 18:27:35 +00:00
Jonathan G Rennison
cb69611248
Merge branch 'master' into jgrpp
...
# Conflicts:
# .github/changelog.sh
# cmake/PackageDeb.cmake
# src/network/network_client.cpp
# src/settings_gui.cpp
2021-01-29 18:27:36 +00:00
Patric Stout
0c3ddc5436
Fix: support non-ubuntu/debian Linux variants with LSB support ( #8408 )
...
This now generates a warning, as we would still like people to
make a Pull Request to support the target. But it does continue
with packing to a txz.
2020-12-21 21:32:29 +01:00
Patric Stout
6228dde3da
Fix: [bundle] postfix the distribution for Linux bundles
2020-12-19 18:26:29 +01:00
Patric Stout
b8217610ce
Fix: [bundle] postfix the architecture for Mac OS bundles
...
This in preparation for other architectures, like arm64.
2020-12-19 18:26:29 +01:00
Patric Stout
7cdf7c7ca0
Fix: [bundle] custom launch.sh is no longer required for Mac OS
...
Co-authored-by: Owen Rudge <owen@owenrudge.net>
2020-12-19 18:26:29 +01:00
Jonathan G Rennison
940b5e7a2f
Merge branch 'master' into jgrpp
2020-11-04 17:55:00 +00:00
Jelle van der Waa
b6615b2cd4
Fix: make reproducible by not embedding timestamps
...
By default gzip embeds a timestamps which makes building it twice
not reproducible, passing -n skips this embedding behaviour.
Motivation: https://reproducible-builds.org
2020-10-15 22:01:12 +01:00
Jonathan G Rennison
d85a529f87
Merge branch 'master' into jgrpp
2020-10-14 17:38:23 +01:00
Charles Pigott
348c231e12
Codechange: Make codestyle for CMake files consistent for 'control' statements
2020-09-25 14:43:13 +01:00
Jonathan G Rennison
737ced9f50
Merge branch 'master' into jgrpp
2020-07-07 17:28:19 +01:00
glx22
97592c4093
Add: [CMake] Allow renaming of openttd binary
2020-07-02 21:18:14 +02:00
glx22
53de5b5c55
Fix: [CMake] Restore man file compression
2020-07-02 21:18:14 +02:00
Jonathan G Rennison
15d32bcd19
CMake: Disable stripping in bundle
2020-07-01 21:52:21 +01:00
Jonathan G Rennison
efaf935cbf
CMake: Remove reference to empty bin/data dir
2020-07-01 00:36:10 +01:00
TechGeekNZ
cf8ea74733
Update: Merge branch 'jgrpp_master_cmake' into jgrpp_cmake
2020-06-28 21:56:43 +01:00
Dan Church
506598a80a
Fix: [CMake] Fix install paths using GNUInstallDirs
2020-06-18 21:18:53 +01:00
glx22
8ef3d8f584
Revert f51e66f6: creating zip bundle fails for MacOS
2020-06-10 21:10:00 +02:00
glx22
3d76677594
Fix: Generate windows installer only for stable releases
2020-06-08 09:49:26 +01:00
glx22
f51e66f697
Fix: Restore zip bundle for MacOS
2020-06-08 09:49:26 +01:00
Patric Stout
b7643b1d36
Add: create bundles via CPack
...
CPack works closely together with CMake to do the right thing in
terms of bundling (called 'package'). This generates all the
packaging we need, and some more.
2020-06-05 19:36:05 +02:00
