widelands-dev team mailing list archive

[Toni Förster <toni.foerster@xxxxxxxxx>]

Toni Förster has proposed merging lp:~widelands-dev/widelands/bug-1825925-mac-dylib-fix into lp:widelands.

Commit message:
macOS: fix ids for dylib

Requested reviews:
  SirVer (sirver)
Related bugs:
  Bug #1825925 in widelands: "Mac OS builds for >= 10.9 have no sound playing"
  https://bugs.launchpad.net/widelands/+bug/1825925

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1825925-mac-dylib-fix/+merge/366417
-- 
Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1825925-mac-dylib-fix.

=== added file 'WL_RELEASE'
--- WL_RELEASE	1970-01-01 00:00:00 +0000
+++ WL_RELEASE	2019-04-23 20:16:24 +0000
@@ -0,0 +1,1 @@
+build-20-rc1

=== modified file 'appveyor.yml'
--- appveyor.yml	2019-04-18 17:05:00 +0000
+++ appveyor.yml	2019-04-23 20:16:24 +0000
@@ -38,16 +38,15 @@
   - cmd: cd %APPVEYOR_BUILD_FOLDER%
   - cmd: md build
   - cmd: cd build
-  - cmd: echo %APPVEYOR_BUILD_VERSION%_%CONFIGURATION%_%PLATFORM% > %APPVEYOR_BUILD_FOLDER%\WL_RELEASE
   - cmd: "IF \"%PLATFORM%\" == \"x86\" (cmake -G \"Ninja\" -DCMAKE_BUILD_TYPE=%CONFIGURATION% -DOPTION_USE_GLBINDING=OFF -DOPTION_BUILD_WEBSITE_TOOLS=OFF -DOPTION_ASAN=OFF -DCMAKE_JOB_POOLS=\"linking=1\" -DCMAKE_JOB_POOL_LINK=linking %APPVEYOR_BUILD_FOLDER%) ELSE (cmake -G \"Ninja\" -DCMAKE_BUILD_TYPE=%CONFIGURATION% -DOPTION_USE_GLBINDING=ON -DOPTION_BUILD_WEBSITE_TOOLS=OFF -DOPTION_ASAN=OFF -DCMAKE_JOB_POOLS=\"linking=1\" -DCMAKE_JOB_POOL_LINK=linking %APPVEYOR_BUILD_FOLDER%)"
   - cmd: "cmake --build ."
 on_success:
   - cmd: strip -sv %APPVEYOR_BUILD_FOLDER%\build\src\widelands.exe
-  - cmd: ISCC /q /o%APPVEYOR_BUILD_FOLDER% /fWidelands-%APPVEYOR_BUILD_VERSION%-%CONFIGURATION%-%PLATFORM% c:\projects\widelands\utils\win32\innosetup\Widelands.iss
-  - appveyor PushArtifact %APPVEYOR_BUILD_FOLDER%\Widelands-%APPVEYOR_BUILD_VERSION%-%CONFIGURATION%-%PLATFORM%.exe
+  - cmd: ISCC /q /o%APPVEYOR_BUILD_FOLDER% /fWidelands-build20-rc1-%PLATFORM% c:\projects\widelands\utils\win32\innosetup\Widelands.iss
+  - appveyor PushArtifact %APPVEYOR_BUILD_FOLDER%\Widelands-build20-rc1-%PLATFORM%.exe
 
 artifacts:
-  - path: Widelands-$(APPVEYOR_BUILD_VERSION)-$(CONFIGURATION)-$(PLATFORM).exe
+  - path: Widelands-build20-rc1-$(PLATFORM).exe
     name: Widelands Setup
 
 platform:

=== modified file 'utils/macos/fix_dependencies.py'
--- utils/macos/fix_dependencies.py	2018-12-13 07:24:01 +0000
+++ utils/macos/fix_dependencies.py	2019-04-23 20:16:24 +0000
@@ -93,7 +93,8 @@
         print('Fixing binary: %s' % binary)
         for (dep_name, dep_path) in all_dependencies.items():
             subprocess.check_call(['/usr/bin/install_name_tool', '-change',
-                                   dep_name, '@executable_path/' + p.basename(dep_path), binary])
+                                   dep_name, '@executable_path/' + p.basename(dep_path),
+                                   '-id', '@executable_path/' + p.basename(dep_path), binary])
 
 
 if __name__ == '__main__':

=== modified file 'utils/win32/innosetup/Widelands.iss'
--- utils/win32/innosetup/Widelands.iss	2019-04-23 07:47:25 +0000
+++ utils/win32/innosetup/Widelands.iss	2019-04-23 20:16:24 +0000
@@ -37,7 +37,7 @@
 ;Appveyor environment
 #define BuildFolder GetEnv("APPVEYOR_BUILD_FOLDER")
 #define DLLFolder GetEnv("MINGWPATH")
-#define Version GetEnv("APPVEYOR_BUILD_VERSION") + GetEnv("CONFIGURATION") + GetEnv("PLATFORM")
+#define Version "Build20-rc1-" + GetEnv("PLATFORM")
 
 [Setup]
 AppName={#Name}