diff options
| author | Mike Latimer <mlatimer@suse.com> | 2020-03-24 04:13:36 +0100 |
|---|---|---|
| committer | Lucian Petrut <lpetrut@cloudbasesolutions.com> | 2020-12-09 19:01:02 +0100 |
| commit | ae812dce44eb1b4d03ba9edfa3549c446208a87a (patch) | |
| tree | 28783f5c6cad16150d1e52d10d0ad939e2554f30 /win32_build.sh | |
| parent | win32*.sh: isolate network operations when building win32 dependencies (diff) | |
| download | ceph-ae812dce44eb1b4d03ba9edfa3549c446208a87a.tar.xz ceph-ae812dce44eb1b4d03ba9edfa3549c446208a87a.zip | |
win32*.sh: improve win32 dependency check
At the moment, we assume that the dependencies have been successfully
built if the "build.deps" directory exists.
For convenience reasons, this change will use a file instead,
signaling that we've finished building the dependencies. This will
allow the build process to be resumed when interrupted.
Signed-off-by: Mike Latimer <mlatimer@suse.com>
Signed-off-by: Lucian Petrut <lpetrut@cloudbasesolutions.com>
Diffstat (limited to 'win32_build.sh')
| -rwxr-xr-x | win32_build.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/win32_build.sh b/win32_build.sh index afe5745e356..2c11b1dfc11 100755 --- a/win32_build.sh +++ b/win32_build.sh @@ -65,9 +65,10 @@ curlInclude="${curlDir}/include" if [[ -n $CLEAN_BUILD ]]; then echo "Cleaning up build dir: $BUILD_DIR" rm -rf $BUILD_DIR + rm -rf $DEPS_DIR fi -if [[ ! -d $DEPS_DIR ]]; then +if [[ ! -f ${depsToolsetDir}/completed ]]; then echo "Preparing dependencies: $DEPS_DIR" NUM_WORKERS=$NUM_WORKERS DEPS_DIR=$DEPS_DIR \ "$SCRIPT_DIR/win32_deps_build.sh" |