[Widelands-dev] [Merge] lp:~widelands-dev/widelands/fix_osx_nightlies into lp:widelands

2018-08-22 Thread noreply 
The proposal to merge lp:~widelands-dev/widelands/fix_osx_nightlies into 
lp:widelands has been updated.

Status: Needs review => Merged

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/fix_osx_nightlies/+merge/353456
-- 
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/fix_osx_nightlies.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/fix_osx_nightlies into lp:widelands

2018-08-21 Thread SirVer 
Review: Approve

@stonerl: There is no reason to apologize - I am super excited that you picked 
up, undusted and improved the Mac OS X build experience and untested things 
break with change. I am sorry to partially undo your modernizations efforts, 
but I do not have time to do more major changes to the nightlies build process 
:(

@Gun: Thanks for fixing the Linux problem.

@bunnybot merge
-- 
https://code.launchpad.net/~widelands-dev/widelands/fix_osx_nightlies/+merge/353456
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/fix_osx_nightlies.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/fix_osx_nightlies into lp:widelands

2018-08-21 Thread bunnybot 
Continuous integration builds have changed state:

Travis build 3825. State: passed. Details: 
https://travis-ci.org/widelands/widelands/builds/418587526.
Appveyor build 3624. State: failed. Details: 
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_fix_osx_nightlies-3624.
-- 
https://code.launchpad.net/~widelands-dev/widelands/fix_osx_nightlies/+merge/353456
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/fix_osx_nightlies.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/fix_osx_nightlies into lp:widelands

2018-08-21 Thread Toni Förster 
Review: Approve

> I have now pushed a fix for Linux. Does it still work for the OSX nightlies?

It does for me.
-- 
https://code.launchpad.net/~widelands-dev/widelands/fix_osx_nightlies/+merge/353456
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/fix_osx_nightlies.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/fix_osx_nightlies into lp:widelands

2018-08-21 Thread GunChleoc 
I have now pushed a fix for Linux. Does it still work for the OSX nightlies?
-- 
https://code.launchpad.net/~widelands-dev/widelands/fix_osx_nightlies/+merge/353456
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/fix_osx_nightlies into lp:widelands.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/fix_osx_nightlies into lp:widelands

2018-08-21 Thread GunChleoc 
This has broken all the Linux builds on Travis:

-- Found ICU: /usr/lib/x86_64-linux-gnu/libicuuc.so (found version "52.1.0")
CMake Error at CMakeLists.txt:84 (if):
  if given arguments:
"APPLE" "AND" "GREATER" "11"
  Unknown arguments specified
-- Configuring incomplete, errors occurred!

-- 
https://code.launchpad.net/~widelands-dev/widelands/fix_osx_nightlies/+merge/353456
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/fix_osx_nightlies into lp:widelands.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/fix_osx_nightlies into lp:widelands

2018-08-20 Thread Toni Förster 
@SirVer, sorry for breaking your workflow.
-- 
https://code.launchpad.net/~widelands-dev/widelands/fix_osx_nightlies/+merge/353456
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/fix_osx_nightlies into lp:widelands.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/fix_osx_nightlies into lp:widelands

2018-08-20 Thread SirVer 
SirVer has proposed merging lp:~widelands-dev/widelands/fix_osx_nightlies into 
lp:widelands.

Commit message:
Unbreak nightly builds by un-modernizing some of the recent changes to the OS X 
toolchain.

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #1788031 in widelands: "Recent changes broke the Mac OS X nighly builds"
  https://bugs.launchpad.net/widelands/+bug/1788031

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/fix_osx_nightlies/+merge/353456
-- 
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/fix_osx_nightlies into lp:widelands.
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2018-08-15 01:38:47 +
+++ CMakeLists.txt	2018-08-20 21:23:22 +
@@ -79,8 +79,9 @@
   endif()
 endif()
 
-# Disable no symbols warning on macOS
-if (APPLE)
+# Disable no symbols warning on macOS, but only on versions where this is
+# supported. It is not supported on OS X 10.7 (DARWIN_MAJOR_VERSION == 11).
+if (APPLE AND ${DARWIN_MAJOR_VERSION} GREATER 11)
 SET(CMAKE_C_ARCHIVE_CREATE   " Scr   ")
 SET(CMAKE_CXX_ARCHIVE_CREATE " Scr   ")
 SET(CMAKE_C_ARCHIVE_FINISH   " -no_warning_for_no_symbols -c ")

=== modified file 'utils/macos/build_app.sh'
--- utils/macos/build_app.sh	2018-08-15 18:33:25 +
+++ utils/macos/build_app.sh	2018-08-20 21:23:22 +
@@ -2,7 +2,7 @@
 
 set -e
 
-USAGE="Usage: $0   "
+USAGE="Usage: $0   "
 USE_ASAN="OFF"
 
 if [ ! -z "$3" ]; then
@@ -37,6 +37,12 @@
   CXX_COMPILER="g++-7"
   COMPILER=$(gcc-7 --version | grep "GCC")
   ;;
+   gcc6)
+  # Used for the nightly builds.
+  C_COMPILER="gcc-6"
+  CXX_COMPILER="g++-6"
+  COMPILER=$(gcc-6 --version | grep -i "GCC")
+  ;;
*)
   echo $USAGE
   exit 1
@@ -173,9 +179,11 @@
export SDL2TTFDIR="$(brew --prefix sdl2_ttf)"
export BOOST_ROOT="$(brew --prefix boost)"

-   # Not needed for CMake 3.12 or above
-   # see cmake --help-policy CMP0074
-   #export ICU_ROOT="$(brew --prefix icu4c)"
+   # Not needed for CMake 3.12 or above, see cmake --help-policy CMP0074.
+   # However Mac OS X nighlies cannot upgrade to a newer cmake version than
+   # 3.9.4 since nothing newer compiles on Mac OS X 10.7 which is used to build
+   # the nightlies.
+   export ICU_ROOT="$(brew --prefix icu4c)"
 
cmake $SOURCE_DIR -G Ninja \
   -DCMAKE_C_COMPILER:FILEPATH="$C_COMPILER" \

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp