github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-05-15 05:37:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2189 from weaveworks/2188-make-clean

Browse Source 
don't attempt to make 'make clean' work on old checkouts

Fixes #2188.
This commit is contained in:
Matthias Radestock
2017-02-03 22:16:32 +00:00
committed by GitHub
parent 43cb7548d8 4aa73bf7f0
commit 4bc6a6c128
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile
View File

@@ -174,12 +174,9 @@ ui-build-pkg:
clean:
$(GO) clean ./...
# build-external was accidentially created as owned by root in earlier versions. This is fixed now,
# but we need to fix up old checkouts, since git doesn't track ownership.
if [ "$$(stat -c %%U client/build-external)" == "root" ]; then sudo chown "$$USER:$$USER" client/build-external; fi
# Don't actually rmi the build images - rm'ing the .uptodate files is enough to ensure
# we rebuild the images, and rmi'ing the images causes us to have to redownload a lot of stuff.
# $(SUDO) docker rmi $(SCOPE_UI_BUILD_IMAGE) $(SCOPE_BACKEND_BUILD_IMAGE) >/dev/null 2>&1 || true
# Don't actually rmi the build images - rm'ing the .uptodate files is enough to ensure
# we rebuild the images, and rmi'ing the images causes us to have to redownload a lot of stuff.
# $(SUDO) docker rmi $(SCOPE_UI_BUILD_IMAGE) $(SCOPE_BACKEND_BUILD_IMAGE) >/dev/null 2>&1 || true
rm -rf $(SCOPE_EXPORT) $(SCOPE_UI_BUILD_UPTODATE) $(SCOPE_BACKEND_BUILD_UPTODATE) \
$(SCOPE_EXE) $(RUNSVINIT) prog/staticui/staticui.go prog/externalui/externalui.go client/build/*.js client/build-external/*.js docker/weave .pkg \
$(CODECGEN_TARGETS) $(CODECGEN_DIR)/bin