widelands-dev team mailing list archive

[kaputtnik <somal@xxxxxxxx>]

kaputtnik has proposed merging lp:~widelands-dev/widelands/bug-1806901_use_compile_sh_in_update_sh into lp:widelands.

Commit message:
Use compile.sh when running update.sh

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #1806901 in widelands: "update.sh deletes files when there is no new version"
  https://bugs.launchpad.net/widelands/+bug/1806901

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1806901_use_compile_sh_in_update_sh/+merge/360494

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

Here it runs fine, but has to be tested on mac.
-- 
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1806901_use_compile_sh_in_update_sh into lp:widelands.

=== modified file 'compile.sh'
--- compile.sh	2018-11-09 06:43:43 +0000
+++ compile.sh	2018-12-10 16:40:02 +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 "################################################"