From 661b512a8ad37d06b81fd8bc910fb012d409fdd9 Mon Sep 17 00:00:00 2001 From: filux Date: Fri, 18 Nov 2016 02:07:44 +0100 Subject: [PATCH] since latest release macos is not 'X' anymore --- .travis.yml | 18 +++--------------- CMakeLists.txt | 4 ++-- data/glest_game | 2 +- mk/cmake/Modules/FindOGG.cmake | 2 +- mk/linux/mg-version-synch.sh | 6 +++--- mk/{macosx => macos}/.gitignore | 0 mk/{macosx => macos}/CMakeLists.txt | 12 ++++++------ mk/{macosx => macos}/build-mg.sh | 0 .../bundle_resources/Info.plist.in | 0 .../bundle_resources/MegaGlest.icns | Bin .../bundle_resources/MegaGlest.sh | 0 mk/{macosx => macos}/glest-dev.ini | 0 mk/{macosx => macos}/glest.ini | 0 mk/{macosx => macos}/make-binary-archive.sh | 0 mk/{macosx => macos}/make-release-archives.sh | 2 +- source/glest_game/CMakeLists.txt | 12 ++++++------ source/glest_game/facilities/game_util.cpp | 2 +- 17 files changed, 24 insertions(+), 36 deletions(-) rename mk/{macosx => macos}/.gitignore (100%) rename mk/{macosx => macos}/CMakeLists.txt (81%) rename mk/{macosx => macos}/build-mg.sh (100%) rename mk/{macosx => macos}/bundle_resources/Info.plist.in (100%) rename mk/{macosx => macos}/bundle_resources/MegaGlest.icns (100%) rename mk/{macosx => macos}/bundle_resources/MegaGlest.sh (100%) rename mk/{macosx => macos}/glest-dev.ini (100%) rename mk/{macosx => macos}/glest.ini (100%) rename mk/{macosx => macos}/make-binary-archive.sh (100%) rename mk/{macosx => macos}/make-release-archives.sh (96%) diff --git a/.travis.yml b/.travis.yml index 09f79c40..315e67a8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,23 +24,11 @@ matrix: env: Tr_Compiler_Version="default" dist: trusty # broken compiler on 12.04 - os: osx - osx_image: xcode6.4 - #env: Tr_Xcode_Version="default" - env: Tr_Xcode_Version="6.4" - # https://docs.travis-ci.com/user/osx-ci-environment/#OS-X-Version - # https://github.com/Homebrew/brew/blob/master/docs/Installation.md#requirements - - os: osx - #osx_image: xcode6.4 + #osx_image: xcode6.4 # seems broken and has lower priority in queue than default one env: Tr_Xcode_Version="default" #env: Tr_Xcode_Version="6.4" # https://docs.travis-ci.com/user/osx-ci-environment/#OS-X-Version # https://github.com/Homebrew/brew/blob/master/docs/Installation.md#requirements - - os: osx - #osx_image: xcode6.4 - #env: Tr_Xcode_Version="default" - env: Tr_Xcode_Version="6.4" - # https://docs.travis-ci.com/user/osx-ci-environment/#OS-X-Version - # https://github.com/Homebrew/brew/blob/master/docs/Installation.md#requirements fast_finish: true allow_failures: #- os: osx @@ -60,7 +48,7 @@ before_install: - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew outdated cmake || brew upgrade cmake; brew outdated pkgconfig || brew upgrade pkgconfig; fi - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew link --force gettext; fi # ^ odd linking problems related with brew which is not creating links - - if [ "$TRAVIS_OS_NAME" = "osx" ] && [ "$Tr_Xcode_Version" = "6.4" ]; then brew update; brew cleanup; brew cask cleanup; brew uninstall --force brew-cask; brew update; brew install Caskroom/cask/xquartz; fi + - if [ "$TRAVIS_OS_NAME" = "osx" ] && [ "$Tr_Xcode_Version" = "6.4" ]; then brew install Caskroom/cask/xquartz; fi - if [ "$Tr_Compiler_Version" != "" ] && [ "$Tr_Compiler_Version" != "default" ] && [ "$CC" = "gcc" ]; then export CXX="g++-${Tr_Compiler_Version}" CC="gcc-${Tr_Compiler_Version}"; fi - if [ "$Tr_Compiler_Version" != "" ] && [ "$Tr_Compiler_Version" != "default" ] && [ "$CC" == "clang" ]; then export CXX="clang++-${Tr_Compiler_Version}" CC="clang-${Tr_Compiler_Version}"; fi - $CC --version @@ -70,7 +58,7 @@ before_install: script: # ALL THE BUILD COMMANDS HERE - if [ "$TRAVIS_OS_NAME" = "linux" ]; then mk/linux/build-mg.sh -c 4; fi - - if [ "$TRAVIS_OS_NAME" = "osx" ]; then mk/macosx/build-mg.sh -c 4; fi + - if [ "$TRAVIS_OS_NAME" = "osx" ]; then mk/macos/build-mg.sh -c 4; fi # https://docs.travis-ci.com/user/notifications/#IRC-notification notifications: diff --git a/CMakeLists.txt b/CMakeLists.txt index f3d3848c..2515fa31 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -97,7 +97,7 @@ ENDIF() ## Compiler flags, CPACK configuration and other Apple specific code. IF(APPLE) - include(${PROJECT_SOURCE_DIR}/mk/macosx/CMakeLists.txt) + include(${PROJECT_SOURCE_DIR}/mk/macos/CMakeLists.txt) ENDIF(APPLE) IF(CMAKE_COMPILER_IS_GNUCXX OR MINGW) @@ -339,7 +339,7 @@ OPTION(WANT_DEV_OUTPATH "Use developer friendly output paths." OFF) IF(UNIX AND "${CMAKE_SYSTEM_NAME}" STREQUAL "Linux") SET(MEGAGLEST_FRIENDLY_OUTPUT_PATH "${PROJECT_SOURCE_DIR}/mk/linux/") ELSEIF(UNIX AND APPLE) - SET(MEGAGLEST_FRIENDLY_OUTPUT_PATH "${PROJECT_SOURCE_DIR}/mk/macosx/") + SET(MEGAGLEST_FRIENDLY_OUTPUT_PATH "${PROJECT_SOURCE_DIR}/mk/macos/") ELSEIF(UNIX AND NOT APPLE) SET(MEGAGLEST_FRIENDLY_OUTPUT_PATH "${PROJECT_SOURCE_DIR}/mk/other_unix/") ELSE() diff --git a/data/glest_game b/data/glest_game index 8cbf260e..fa2a0cac 160000 --- a/data/glest_game +++ b/data/glest_game @@ -1 +1 @@ -Subproject commit 8cbf260eca0d37cb569b4421b3d4594d5cbba967 +Subproject commit fa2a0cac9e6fe0fc3434edc2cad728ecb4b8e6b1 diff --git a/mk/cmake/Modules/FindOGG.cmake b/mk/cmake/Modules/FindOGG.cmake index 7e2628ad..83d5a965 100644 --- a/mk/cmake/Modules/FindOGG.cmake +++ b/mk/cmake/Modules/FindOGG.cmake @@ -25,7 +25,7 @@ ELSE() FIND_LIBRARY(VORBIS_LIBRARY NAMES vorbis) ENDIF() -#on macosx the vorbisfile library is part of the vorbisone... +#on macos the vorbisfile library is part of the vorbisone... #IF(NOT APPLE) # comment above is full of lies diff --git a/mk/linux/mg-version-synch.sh b/mk/linux/mg-version-synch.sh index dadc7552..f352ae9a 100755 --- a/mk/linux/mg-version-synch.sh +++ b/mk/linux/mg-version-synch.sh @@ -27,11 +27,11 @@ echo echo 'Game Copyright date # before:' grep -E 'Copyright 2010-20[0-9][0-9] The MegaGlest Team' ../../source/glest_game/facilities/game_util.cpp sed -i 's/Copyright 2010-20[0-9][0-9] The MegaGlest Team/Copyright 2010-20'$CurrYear' The MegaGlest Team/' ../../source/glest_game/facilities/game_util.cpp -grep -E '© 2001-20[0-9][0-9] The MegaGlest Team' ../../mk/macosx/bundle_resources/Info.plist.in -sed -i 's/© 2001-20[0-9][0-9] The MegaGlest Team/© 2001-20'$CurrYear' The MegaGlest Team/' ../../mk/macosx/bundle_resources/Info.plist.in +grep -E '© 2001-20[0-9][0-9] The MegaGlest Team' ../../mk/macos/bundle_resources/Info.plist.in +sed -i 's/© 2001-20[0-9][0-9] The MegaGlest Team/© 2001-20'$CurrYear' The MegaGlest Team/' ../../mk/macos/bundle_resources/Info.plist.in echo 'Game Copyright date # after:' grep -E 'Copyright 2010-20[0-9][0-9] The MegaGlest Team' ../../source/glest_game/facilities/game_util.cpp -grep -E '© 2001-20[0-9][0-9] The MegaGlest Team' ../../mk/macosx/bundle_resources/Info.plist.in +grep -E '© 2001-20[0-9][0-9] The MegaGlest Team' ../../mk/macos/bundle_resources/Info.plist.in echo if [ "$modifymore" = "yes" ]; then # const string lastCompatibleSaveGameVersionString = "v3.9.0"; diff --git a/mk/macosx/.gitignore b/mk/macos/.gitignore similarity index 100% rename from mk/macosx/.gitignore rename to mk/macos/.gitignore diff --git a/mk/macosx/CMakeLists.txt b/mk/macos/CMakeLists.txt similarity index 81% rename from mk/macosx/CMakeLists.txt rename to mk/macos/CMakeLists.txt index 9b0e184b..a587c35c 100644 --- a/mk/macosx/CMakeLists.txt +++ b/mk/macos/CMakeLists.txt @@ -28,9 +28,9 @@ INCLUDE_DIRECTORIES(/usr/X11/include /opt/local/include) # This changes Info.plist from something with variables and CMakeisms to # something that can be installed on disk. -CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/mk/macosx/bundle_resources/Info.plist.in" - "${CMAKE_CURRENT_BINARY_DIR}/mk/macosx/bundle_resources/Info.plist") -SET(CPACK_BUNDLE_PLIST "${CMAKE_CURRENT_BINARY_DIR}/mk/macosx/bundle_resources/Info.plist") +CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/mk/macos/bundle_resources/Info.plist.in" + "${CMAKE_CURRENT_BINARY_DIR}/mk/macos/bundle_resources/Info.plist") +SET(CPACK_BUNDLE_PLIST "${CMAKE_CURRENT_BINARY_DIR}/mk/macos/bundle_resources/Info.plist") include (InstallRequiredSystemLibraries) @@ -38,6 +38,6 @@ include (InstallRequiredSystemLibraries) SET(CPACK_GENERATOR "Bundle") SET(CPACK_BUNDLE_NAME "MegaGlest") SET(CPACK_PACKAGE_FILE_NAME "MegaGlest-game-macos-${MEGAGLEST_VERSION}") -SET(CPACK_PACKAGE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/mk/macosx/bundle_resources/MegaGlest.icns") -SET(CPACK_BUNDLE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/mk/macosx/bundle_resources/MegaGlest.icns") -SET(CPACK_BUNDLE_STARTUP_COMMAND "${PROJECT_SOURCE_DIR}/mk/macosx/bundle_resources/MegaGlest.sh") +SET(CPACK_PACKAGE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/mk/macos/bundle_resources/MegaGlest.icns") +SET(CPACK_BUNDLE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/mk/macos/bundle_resources/MegaGlest.icns") +SET(CPACK_BUNDLE_STARTUP_COMMAND "${PROJECT_SOURCE_DIR}/mk/macos/bundle_resources/MegaGlest.sh") diff --git a/mk/macosx/build-mg.sh b/mk/macos/build-mg.sh similarity index 100% rename from mk/macosx/build-mg.sh rename to mk/macos/build-mg.sh diff --git a/mk/macosx/bundle_resources/Info.plist.in b/mk/macos/bundle_resources/Info.plist.in similarity index 100% rename from mk/macosx/bundle_resources/Info.plist.in rename to mk/macos/bundle_resources/Info.plist.in diff --git a/mk/macosx/bundle_resources/MegaGlest.icns b/mk/macos/bundle_resources/MegaGlest.icns similarity index 100% rename from mk/macosx/bundle_resources/MegaGlest.icns rename to mk/macos/bundle_resources/MegaGlest.icns diff --git a/mk/macosx/bundle_resources/MegaGlest.sh b/mk/macos/bundle_resources/MegaGlest.sh similarity index 100% rename from mk/macosx/bundle_resources/MegaGlest.sh rename to mk/macos/bundle_resources/MegaGlest.sh diff --git a/mk/macosx/glest-dev.ini b/mk/macos/glest-dev.ini similarity index 100% rename from mk/macosx/glest-dev.ini rename to mk/macos/glest-dev.ini diff --git a/mk/macosx/glest.ini b/mk/macos/glest.ini similarity index 100% rename from mk/macosx/glest.ini rename to mk/macos/glest.ini diff --git a/mk/macosx/make-binary-archive.sh b/mk/macos/make-binary-archive.sh similarity index 100% rename from mk/macosx/make-binary-archive.sh rename to mk/macos/make-binary-archive.sh diff --git a/mk/macosx/make-release-archives.sh b/mk/macos/make-release-archives.sh similarity index 96% rename from mk/macosx/make-release-archives.sh rename to mk/macos/make-release-archives.sh index 5746aaee..cbdc5c08 100755 --- a/mk/macosx/make-release-archives.sh +++ b/mk/macos/make-release-archives.sh @@ -33,7 +33,7 @@ cp -r "$BINARY_DIR/"* "$APP_GAME_DIR" cp -r "$DATA_DIR/"* "$APP_GAME_DIR"; sleep 0.5s if [ -f "$APP_GAME_DIR/MegaGlest.sh" ]; then rm -f "$APP_GAME_DIR/MegaGlest.sh"; fi -cp "$CURRENTDIR/build/mk/macosx/bundle_resources/Info.plist" "$APP_PLIST_DIR" +cp "$CURRENTDIR/build/mk/macos/bundle_resources/Info.plist" "$APP_PLIST_DIR" cp "$CURRENTDIR/bundle_resources/MegaGlest.icns" "$APP_RES_DIR" cp "$CURRENTDIR/bundle_resources/MegaGlest.sh" "$APP_BIN_DIR" mv "$APP_BIN_DIR/MegaGlest.sh" "$APP_BIN_DIR/MegaGlest" diff --git a/source/glest_game/CMakeLists.txt b/source/glest_game/CMakeLists.txt index ea51292e..d1e74977 100644 --- a/source/glest_game/CMakeLists.txt +++ b/source/glest_game/CMakeLists.txt @@ -329,16 +329,16 @@ IF(BUILD_MEGAGLEST) DESTINATION ${MEGAGLEST_DATA_INSTALL_PATH}) ELSEIF(UNIX AND APPLE) INSTALL(FILES - "${PROJECT_SOURCE_DIR}/mk/macosx/glest.ini" + "${PROJECT_SOURCE_DIR}/mk/macos/glest.ini" DESTINATION ${MEGAGLEST_DATA_INSTALL_PATH}) - IF(WANT_SINGLE_INSTALL_DIRECTORY AND EXISTS "${PROJECT_SOURCE_DIR}/mk/macosx/p7zip/") + IF(WANT_SINGLE_INSTALL_DIRECTORY AND EXISTS "${PROJECT_SOURCE_DIR}/mk/macos/p7zip/") INSTALL(DIRECTORY - "${PROJECT_SOURCE_DIR}/mk/macosx/p7zip" + "${PROJECT_SOURCE_DIR}/mk/macos/p7zip" DESTINATION ${MEGAGLEST_DATA_INSTALL_PATH}) ENDIF() - IF(WANT_SINGLE_INSTALL_DIRECTORY AND EXISTS "${PROJECT_SOURCE_DIR}/mk/macosx/lib/") + IF(WANT_SINGLE_INSTALL_DIRECTORY AND EXISTS "${PROJECT_SOURCE_DIR}/mk/macos/lib/") INSTALL(DIRECTORY - "${PROJECT_SOURCE_DIR}/mk/macosx/lib/" + "${PROJECT_SOURCE_DIR}/mk/macos/lib/" DESTINATION "${MEGAGLEST_DATA_INSTALL_PATH}/../../Frameworks/") ENDIF() ENDIF() @@ -348,7 +348,7 @@ IF(BUILD_MEGAGLEST) DESTINATION ${MEGAGLEST_DATA_INSTALL_PATH}) IF(UNIX AND APPLE AND NOT WANT_SINGLE_INSTALL_DIRECTORY) INSTALL(FILES - "${PROJECT_SOURCE_DIR}/mk/macosx/bundle_resources/MegaGlest.icns" + "${PROJECT_SOURCE_DIR}/mk/macos/bundle_resources/MegaGlest.icns" DESTINATION ${MEGAGLEST_ICON_INSTALL_PATH}) ENDIF() ENDIF() diff --git a/source/glest_game/facilities/game_util.cpp b/source/glest_game/facilities/game_util.cpp index e3a422db..0a948a72 100644 --- a/source/glest_game/facilities/game_util.cpp +++ b/source/glest_game/facilities/game_util.cpp @@ -71,7 +71,7 @@ string getPlatformTypeNameString() { platform = "OpenBSD"; #elif defined(__APPLE__) - platform = "MacOSX"; + platform = "MacOS"; #elif defined(_AIX) platform = "AIX"; #elif defined(__ANDROID__)