Merge pull request #88 from xmoto/staging

Staging - more prep for 0.6.1

.travis.yml

@@ -28,14 +28,12 @@ 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.0.deb'
-    - 'xmoto-0.6.0.rpm'
-    - 'xmoto-0.6.0.dmg'
-    - 'xmoto-0.6.0-setup.exe'
-    - 'xmoto-0.6.0-win32.zip'
+  file_glob: true
+  file: "build/artifacts/*"
   skip_cleanup: true
   on:
-    branch: "release"
+    branch:
+      - "release"
+      - "staging"
     tags: true
 

.travis/linux-mxe/build.sh

@@ -81,8 +81,11 @@ 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/
+mv xmoto-*.zip artifacts/
 

.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/
+

.travis/macos/build.sh

@@ -12,3 +12,6 @@ ninja
 sudo \
   cpack -G DragNDrop
 
+mkdir artifacts
+mv xmoto-*.dmg artifacts/
+

CMakeLists.txt

@@ -14,5 +14,6 @@ include(cpack/cpack.cmake)
 include(CPack)
 
 add_subdirectory(bin)
+add_subdirectory(doc)
 add_subdirectory(extra)
 #add_subdirectory(po)

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:

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

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")

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()
 

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()
+

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"