From f148654af01f0004dd5c1b929488b558c6374538 Mon Sep 17 00:00:00 2001 From: _yui Date: Sun, 21 Jun 2020 00:04:08 +0300 Subject: [PATCH 01/10] Version bump --- .travis.yml | 10 +++++----- README.md | 2 +- cpack/cpack.cmake | 2 +- src/common/XMBuild_info.h | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5729ee689..f3aac6a9c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,11 +29,11 @@ deploy: api_key: secure: "XjHXrtaq9VSLL/zA1BKnrFNHrDuz4WUtn9JJs0EnngUt6zjw1q4Z2suVIw4iXWXkblWLIuA+HHXbM0RsiKHvc8FLFuZWpVkV/hz/AXLEZ40Yn+hW3b3z1zaNXFotXiKC+gmJcOgVo3/BQst1dG3gmUv2IM3JhYa4I3jzR9q5AqSqWbH8B1UdpB46St7D27kGdqt6tJAHZtKmyYRP7GfgeIVrCoOrhvgpFgzrj4p2yKy5voQWulXpyRyooaGOfXMzkcFzsiZLbJhLm3BaiFUOyRINufijjeDlyX5Df05a5x6uVxTZfjLFOyfzxTPpI/fMqNoYlRqvheoMVjGAu3s+e3KvllMM4hxD2M0J6WFV6beyzJqIwgR7Z3wgac5E2RJfQYo3S4V2SlKUAxqx4KXdQAiJ3VqdlE8V6p4eyoPIQFrJpsUfUye4d5rKj/U3SOD9OP9PDqNUEzzdwxYh4V0qexHJnegw4BOHIqIS+yr/fv2thJ27/mghG6a4rqxwbhANL7B3ZUVkFh6X+lW9lqsI+HQViJj7KbrFZNsg3rN6vwtfJsEPJctdvC26Dl8+A8vJWTQwPkiMJJSqliakR2P3XPuRRvHc28Q1tqytuVEJAJvF2/yGnGWauFLtI1D1yWlfMCNHnWftFUA3pXwr3DQoc7agKiBQjS+LU+Z58gGYB7o=" file: - - 'xmoto-0.6.0.deb' - - 'xmoto-0.6.0.rpm' - - 'xmoto-0.6.0.dmg' - - 'xmoto-0.6.0-setup.exe' - - 'xmoto-0.6.0-win32.zip' + - 'xmoto-0.6.1.deb' + - 'xmoto-0.6.1.rpm' + - 'xmoto-0.6.1.dmg' + - 'xmoto-0.6.1-setup.exe' + - 'xmoto-0.6.1-win32.zip' skip_cleanup: true on: branch: "release" diff --git a/README.md b/README.md index 10afb2501..9a9aeece5 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# X-Moto 0.6.0 [![Build Status](https://travis-ci.org/xmoto/xmoto.svg?branch=master)](https://travis-ci.org/xmoto/xmoto) +# X-Moto 0.6.1 [![Build Status](https://travis-ci.org/xmoto/xmoto.svg?branch=master)](https://travis-ci.org/xmoto/xmoto) Copyright (C) 2005-2020 # Introduction diff --git a/cpack/cpack.cmake b/cpack/cpack.cmake index 77e1239c8..cbe671abb 100644 --- a/cpack/cpack.cmake +++ b/cpack/cpack.cmake @@ -2,7 +2,7 @@ set(CPACK_PACKAGE_NAME "xmoto") set(CPACK_SOURCE_GENERATOR STGZ) set(CPACK_PACKAGE_VERSION_MAJOR 0) set(CPACK_PACKAGE_VERSION_MINOR 6) -set(CPACK_PACKAGE_VERSION_PATCH 0) +set(CPACK_PACKAGE_VERSION_PATCH 1) set(CPACK_PACKAGE_FILE_NAME "xmoto-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}") set(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/COPYING") set(CPACK_RESOURCE_FILE_README "${PROJECT_SOURCE_DIR}/README.md") diff --git a/src/common/XMBuild_info.h b/src/common/XMBuild_info.h index 89e1515f8..82216f06e 100644 --- a/src/common/XMBuild_info.h +++ b/src/common/XMBuild_info.h @@ -15,6 +15,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #define BUILD_MAJORVERSION 0 #define BUILD_VERSION 6 -#define BUILD_MINORVERSION 0 +#define BUILD_MINORVERSION 1 #define BUILD_EXTRAINFO "" #define BUILD_COPYRIGHT "(C) Copyright 2005-2020" From a881ba7f7428f684106e1d3caa5ad7d18a62794f Mon Sep 17 00:00:00 2001 From: _yui Date: Sun, 21 Jun 2020 00:10:02 +0300 Subject: [PATCH 02/10] Update ChangeLog for 0.6.1 --- ChangeLog | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/ChangeLog b/ChangeLog index 070cb7385..ae5f5b197 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +X-Moto 0.6.1 2020-06-20 +-------------------------------- + * macOS and FreeBSD support is back! + * Automated release builds for Linux/macOS/Windows + * Added support for macOS Bundles + * Improved level load times + * Improved Russian translation + * Bug fixes: + * Fixed a locale bug where the game would crash with + locales using comma (,) as the decimal separator + * No more crashing on non-existent db entries + when migrating from an old version + + X-Moto 0.6.0 2020-05-03 -------------------------------- * Build system: From 4ffd048515ecb671f7e07a7f52b9994fafd67347 Mon Sep 17 00:00:00 2001 From: _yui Date: Sun, 21 Jun 2020 03:13:06 +0300 Subject: [PATCH 03/10] CMake: Install man page --- CMakeLists.txt | 1 + doc/CMakeLists.txt | 4 ++++ xmoto.6 => doc/xmoto.6 | 0 3 files changed, 5 insertions(+) create mode 100644 doc/CMakeLists.txt rename xmoto.6 => doc/xmoto.6 (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index f2c8563a5..4f18312c3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,5 +14,6 @@ include(cpack/cpack.cmake) include(CPack) add_subdirectory(bin) +add_subdirectory(doc) add_subdirectory(extra) #add_subdirectory(po) diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt new file mode 100644 index 000000000..a23c87b0e --- /dev/null +++ b/doc/CMakeLists.txt @@ -0,0 +1,4 @@ +if(${CMAKE_SYSTEM_NAME} MATCHES "Linux|FreeBSD|Darwin" AND NOT BUILD_MACOS_BUNDLE) + install(FILES xmoto.6 DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man6 COMPONENT doc) +endif() + diff --git a/xmoto.6 b/doc/xmoto.6 similarity index 100% rename from xmoto.6 rename to doc/xmoto.6 From 016cf52254b04772b39f052f307b0f32aa5d06fa Mon Sep 17 00:00:00 2001 From: _yui Date: Sun, 21 Jun 2020 03:15:13 +0300 Subject: [PATCH 04/10] Travis: glob artifacts --- .travis.yml | 8 ++------ .travis/linux-mxe/build.sh | 3 +++ .travis/linux/build.sh | 4 ++++ .travis/macos/build.sh | 3 +++ 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index f3aac6a9c..64629d788 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,12 +28,8 @@ deploy: provider: releases api_key: secure: "XjHXrtaq9VSLL/zA1BKnrFNHrDuz4WUtn9JJs0EnngUt6zjw1q4Z2suVIw4iXWXkblWLIuA+HHXbM0RsiKHvc8FLFuZWpVkV/hz/AXLEZ40Yn+hW3b3z1zaNXFotXiKC+gmJcOgVo3/BQst1dG3gmUv2IM3JhYa4I3jzR9q5AqSqWbH8B1UdpB46St7D27kGdqt6tJAHZtKmyYRP7GfgeIVrCoOrhvgpFgzrj4p2yKy5voQWulXpyRyooaGOfXMzkcFzsiZLbJhLm3BaiFUOyRINufijjeDlyX5Df05a5x6uVxTZfjLFOyfzxTPpI/fMqNoYlRqvheoMVjGAu3s+e3KvllMM4hxD2M0J6WFV6beyzJqIwgR7Z3wgac5E2RJfQYo3S4V2SlKUAxqx4KXdQAiJ3VqdlE8V6p4eyoPIQFrJpsUfUye4d5rKj/U3SOD9OP9PDqNUEzzdwxYh4V0qexHJnegw4BOHIqIS+yr/fv2thJ27/mghG6a4rqxwbhANL7B3ZUVkFh6X+lW9lqsI+HQViJj7KbrFZNsg3rN6vwtfJsEPJctdvC26Dl8+A8vJWTQwPkiMJJSqliakR2P3XPuRRvHc28Q1tqytuVEJAJvF2/yGnGWauFLtI1D1yWlfMCNHnWftFUA3pXwr3DQoc7agKiBQjS+LU+Z58gGYB7o=" - file: - - 'xmoto-0.6.1.deb' - - 'xmoto-0.6.1.rpm' - - 'xmoto-0.6.1.dmg' - - 'xmoto-0.6.1-setup.exe' - - 'xmoto-0.6.1-win32.zip' + file_glob: true + file: "artifacts/*" skip_cleanup: true on: branch: "release" diff --git a/.travis/linux-mxe/build.sh b/.travis/linux-mxe/build.sh index 2dc851413..49acb6bf5 100755 --- a/.travis/linux-mxe/build.sh +++ b/.travis/linux-mxe/build.sh @@ -85,4 +85,7 @@ fix_pkg_name() { for pkg in xmoto-*.zip; do fix_pkg_name "$pkg" "win32"; done for pkg in xmoto-*.exe; do fix_pkg_name "$pkg" "setup"; done +mkdir artifacts +mv xmoto-*.exe artifacts/ +mv xmoto-*.zip artifacts/ diff --git a/.travis/linux/build.sh b/.travis/linux/build.sh index 5613dad73..6911ac77f 100755 --- a/.travis/linux/build.sh +++ b/.travis/linux/build.sh @@ -13,3 +13,7 @@ ninja install cpack -G "DEB" cpack -G "RPM" +mkdir artifacts +mv xmoto-*.deb artifacts/ +mv xmoto-*.rpm artifacts/ + diff --git a/.travis/macos/build.sh b/.travis/macos/build.sh index a9308b37e..52b929201 100755 --- a/.travis/macos/build.sh +++ b/.travis/macos/build.sh @@ -12,3 +12,6 @@ ninja sudo \ cpack -G DragNDrop +mkdir artifacts +mv xmoto-*.dmg artifacts/ + From aa8cc8c2dde8e735390e54b1051787a535cd64cc Mon Sep 17 00:00:00 2001 From: _yui Date: Sun, 21 Jun 2020 16:34:00 +0300 Subject: [PATCH 05/10] Wrestle with travis --- .travis.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 64629d788..c9f0c295b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,6 +7,9 @@ matrix: dist: bionic install: ".travis/linux/deps.sh" script: ".travis/linux/build.sh" + before_deploy: + - echo $TRAVIS_BUILD_DIR/build + - ls $TRAVIS_BUILD_DIR - os: osx osx_image: xcode10.1 # =10.13/high sierra @@ -29,9 +32,9 @@ deploy: api_key: secure: "XjHXrtaq9VSLL/zA1BKnrFNHrDuz4WUtn9JJs0EnngUt6zjw1q4Z2suVIw4iXWXkblWLIuA+HHXbM0RsiKHvc8FLFuZWpVkV/hz/AXLEZ40Yn+hW3b3z1zaNXFotXiKC+gmJcOgVo3/BQst1dG3gmUv2IM3JhYa4I3jzR9q5AqSqWbH8B1UdpB46St7D27kGdqt6tJAHZtKmyYRP7GfgeIVrCoOrhvgpFgzrj4p2yKy5voQWulXpyRyooaGOfXMzkcFzsiZLbJhLm3BaiFUOyRINufijjeDlyX5Df05a5x6uVxTZfjLFOyfzxTPpI/fMqNoYlRqvheoMVjGAu3s+e3KvllMM4hxD2M0J6WFV6beyzJqIwgR7Z3wgac5E2RJfQYo3S4V2SlKUAxqx4KXdQAiJ3VqdlE8V6p4eyoPIQFrJpsUfUye4d5rKj/U3SOD9OP9PDqNUEzzdwxYh4V0qexHJnegw4BOHIqIS+yr/fv2thJ27/mghG6a4rqxwbhANL7B3ZUVkFh6X+lW9lqsI+HQViJj7KbrFZNsg3rN6vwtfJsEPJctdvC26Dl8+A8vJWTQwPkiMJJSqliakR2P3XPuRRvHc28Q1tqytuVEJAJvF2/yGnGWauFLtI1D1yWlfMCNHnWftFUA3pXwr3DQoc7agKiBQjS+LU+Z58gGYB7o=" file_glob: true - file: "artifacts/*" + file: "build/artifacts/*" skip_cleanup: true on: - branch: "release" + branch: "staging" tags: true From 2cd593b73153aa9ec85dce90f4afa62ba89e49bf Mon Sep 17 00:00:00 2001 From: _yui Date: Sun, 21 Jun 2020 19:10:03 +0300 Subject: [PATCH 06/10] Change win32 installer suffix to -win32-setup --- .travis/linux-mxe/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis/linux-mxe/build.sh b/.travis/linux-mxe/build.sh index 49acb6bf5..b3ac2da5d 100755 --- a/.travis/linux-mxe/build.sh +++ b/.travis/linux-mxe/build.sh @@ -81,9 +81,9 @@ fix_pkg_name() { mv "$file" "${file%.$ext}-$2${ext:+.${ext}}" } -# add -win32 to .zip files, and -setup to .exe files +# add -win32 to .zip files, and -win32-setup to .exe files for pkg in xmoto-*.zip; do fix_pkg_name "$pkg" "win32"; done -for pkg in xmoto-*.exe; do fix_pkg_name "$pkg" "setup"; done +for pkg in xmoto-*.exe; do fix_pkg_name "$pkg" "win32-setup"; done mkdir artifacts mv xmoto-*.exe artifacts/ From 333abe273ae75da82ad24bc0e20efc404b55ccfd Mon Sep 17 00:00:00 2001 From: _yui Date: Sun, 21 Jun 2020 21:03:02 +0300 Subject: [PATCH 07/10] CMake: Fix regression with NSIS installer icons Commit 4bfa697 introduced a regression that would cause the NSIS installer to not add icons properly, and to not create desktop icons/start menu entries --- cpack/win32.cmake | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/cpack/win32.cmake b/cpack/win32.cmake index 7fec0115a..a17ad886d 100644 --- a/cpack/win32.cmake +++ b/cpack/win32.cmake @@ -1,18 +1,16 @@ if(WIN32) - #set(CPACK_GENERATOR "ZIP;NSIS") + set(CPACK_NSIS_MUI_ICON "${CMAKE_SOURCE_DIR}/extra/xmoto_icone.ico") + set(CPACK_NSIS_MUI_UNIICON "${CPACK_NSIS_MUI_ICON}") + set(CPACK_NSIS_EXECUTABLES_DIRECTORY "") + set(CPACK_INCLUDE_TOPLEVEL_DIRECTORY FALSE) - if(CPACK_GENERATOR MATCHES "NSIS") - set(CPACK_NSIS_MUI_ICON "${CMAKE_SOURCE_DIR}/extra/xmoto_icone.ico") - set(CPACK_NSIS_MUI_UNIICON "${CPACK_NSIS_MUI_ICON}") - set(CPACK_NSIS_EXECUTABLES_DIRECTORY "") - set(CPACK_INCLUDE_TOPLEVEL_DIRECTORY FALSE) + set(CPACK_NSIS_CREATE_ICONS_EXTRA + "CreateShortCut \\\"$DESKTOP\\\\X-Moto.lnk\\\" \\\"$INSTDIR\\\\xmoto.exe\\\"" + "CreateShortCut \\\"$STARTMENU_FOLDER\\\\X-Moto.lnk\\\" \\\"$INSTDIR\\\\xmoto.exe\\\"" + ) - set(CPACK_NSIS_CREATE_ICONS_EXTRA - "CreateShortCut \\\"$DESKTOP\\\\X-Moto.lnk\\\" \\\"$INSTDIR\\\\xmoto.exe\\\"" - "CreateShortCut \\\"$STARTMENU_FOLDER\\\\X-Moto.lnk\\\" \\\"$INSTDIR\\\\xmoto.exe\\\"" - ) - else() - set(CPACK_INCLUDE_TOPLEVEL_DIRECTORY TRUE) - endif() + # cpack will complain if this is set for the NSIS generator, + # but there doesn't seem to be any way to conditionally set it... + set(CPACK_INCLUDE_TOPLEVEL_DIRECTORY TRUE) endif() From c4928f1aaf13359cd41227c7fe7c68fb925dc0a1 Mon Sep 17 00:00:00 2001 From: _yui Date: Sun, 21 Jun 2020 21:42:36 +0300 Subject: [PATCH 08/10] Travis: Remove unnecessary fields --- .travis.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index c9f0c295b..934bafe3c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,9 +7,6 @@ matrix: dist: bionic install: ".travis/linux/deps.sh" script: ".travis/linux/build.sh" - before_deploy: - - echo $TRAVIS_BUILD_DIR/build - - ls $TRAVIS_BUILD_DIR - os: osx osx_image: xcode10.1 # =10.13/high sierra From f64fdfff362d2c2fe0d27cd6ef5157ac4adfbe8c Mon Sep 17 00:00:00 2001 From: _yui Date: Sun, 21 Jun 2020 21:50:40 +0300 Subject: [PATCH 09/10] Travis: Change conditional deployment branch back to "release" --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 934bafe3c..8acc0d5cc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,6 +32,6 @@ deploy: file: "build/artifacts/*" skip_cleanup: true on: - branch: "staging" + branch: "release" tags: true From ab46a9f168938b46927bfbe2eee9e346089a0fd7 Mon Sep 17 00:00:00 2001 From: _yui Date: Sun, 21 Jun 2020 22:03:10 +0300 Subject: [PATCH 10/10] Travis: Add both release and staging branches to deployment --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 8acc0d5cc..5e1eb297a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,6 +32,8 @@ deploy: file: "build/artifacts/*" skip_cleanup: true on: - branch: "release" + branch: + - "release" + - "staging" tags: true