widelands

Merge lp:~widelands-dev/widelands/bug-1800814-update-script into lp:widelands

  1. bug-1800814-update-script
  2. Merge into trunk
Proposed by GunChleoc
Status: Merged
Merged at revision: 8907
Proposed branch: lp:~widelands-dev/widelands/bug-1800814-update-script
Merge into: lp:widelands
Diff against target: 20 lines (+2/-2)
1 file modified
compile.sh (+2/-2)
To merge this branch: bzr merge lp:~widelands-dev/widelands/bug-1800814-update-script
Reviewer Review Type Date Requested Status
Klaus Halfmann compile.ch / 2 x update.sh Approve
Review via email: mp+358419@code.launchpad.net

Commit message

Copy the version file instead of moving it, so that the update script can be run twice in a row.

To post a comment you must log in.
Revision history for this message
Klaus Halfmann (klaus-halfmann) wrote :

Had to manully inject code from number_of_cpus branch.

code is straight foreward.

Revision history for this message
Klaus Halfmann (klaus-halfmann) wrote :

Works as desigends, lets have it.

@bunnybot merge

review: Approve (compile.ch / 2 x update.sh)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'compile.sh'
--- compile.sh 2018-10-30 14:04:11 +0000
+++ compile.sh 2018-11-07 06:36:36 +0000
@@ -212,7 +212,7 @@
212 rm -f ../wl_map_object_info || true212 rm -f ../wl_map_object_info || true
213 rm -f ../wl_map_info || true213 rm -f ../wl_map_info || true
214214
215 mv VERSION ../VERSION215 cp VERSION ../VERSION
216 mv src/widelands ../widelands216 mv src/widelands ../widelands
217217
218 if [ $BUILD_WEBSITE = "ON" ]; then218 if [ $BUILD_WEBSITE = "ON" ]; then
@@ -249,7 +249,7 @@
249$buildtool249$buildtool
250rm ../VERSION || true250rm ../VERSION || true
251rm ../widelands || true251rm ../widelands || true
252mv VERSION ../VERSION252cp VERSION ../VERSION
253mv src/widelands ../widelands253mv src/widelands ../widelands
254cd ..254cd ..
255255

Subscribers

People subscribed via source and target branches

to status/vote changes: