Merge lp:~widelands-dev/widelands/bug-1806901_use_compile_sh_in_update_sh into lp:widelands

[kaputtnik]

Use compile.sh when running update.sh

Call compile.sh from update.sh to prevent maintaining two compile logics.

Here it runs fine, but has to be tested on mac.

[GunChleoc (gunchleoc)]

LGTM :)

@bunnybot merge

review: Approve

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 4324. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/467357427.
Appveyor build 4119. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1806901_use_compile_sh_in_update_sh-4119.

[bunnybot (widelandsofficial)]

Refusing to merge, since Travis is not green. Use @bunnybot merge force for merging anyways.

Travis build 4324. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/467357427.

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 4355. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/470910004.
Appveyor build 4149. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1806901_use_compile_sh_in_update_sh-4149.

[kaputtnik (franku)]

lets force the merge

@bunnybot merge force

=== modified file 'compile.sh'
--- compile.sh	2018-11-09 06:43:43 +0000
+++ compile.sh	2018-12-21 09:26:46 +0000
@@ -75,6 +75,8 @@
   }
 
 
+## Get command and options to use in update.sh
+COMMANDLINE="$0 $@"
 
 ## Options to control the build.
 BUILD_WEBSITE="ON"
@@ -294,13 +296,7 @@
 fi
 
 bzr pull
-cd build
-$buildtool
-rm  ../VERSION || true
-rm  ../widelands || true
-cp VERSION ../VERSION
-mv src/widelands ../widelands
-cd ..
+$COMMANDLINE
 
 echo " "
 echo "################################################"