Explorar o código

No ticket. Adding back in crepo sync of ext/thirdparty/js.

Aaron T. Myers %!s(int64=15) %!d(string=hai) anos
pai
achega
8ef5581ecb
Modificáronse 2 ficheiros con 12 adicións e 6 borrados
  1. 3 3
      Makefile
  2. 9 3
      tools/hudson/hudson-prod-tarball.sh

+ 3 - 3
Makefile

@@ -131,9 +131,9 @@ docs:
 
 .PHONY: crepo
 crepo: $(THIRDPARTY_JS_DIR)/manifest.json $(THIRDPARTY_JS_DIR)/*.hash
-#	@echo "--- Synchronizing external dependencies with crepo"
-#	@mkdir -p $(BLD_DIR)
-#	@cd $(THIRDPARTY_JS_DIR) && $(CREPO) sync && \
+	@echo "--- Synchronizing external dependencies with crepo"
+	@mkdir -p $(BLD_DIR)
+	@cd $(THIRDPARTY_JS_DIR) && $(CREPO) sync && \
 	  ($(CREPO) dump-refs > $(ROOT)/VERSION_DATA || true)
 # END DEV ONLY >>>>
 

+ 9 - 3
tools/hudson/hudson-prod-tarball.sh

@@ -29,9 +29,15 @@ export REPO_TRACE=1
 ##############################
 # Build prod tarball
 ##############################
-git clean -xdf
-rm -rf ext
-git reset --hard HEAD
+# Use $SKIP_CLEAN if the cleaning is done outside of this script.
+if [ -z "$SKIP_CLEAN" ]; then
+  echo "Cleaning repo."
+  git clean -xdf
+  rm -rf ext
+  git reset --hard HEAD
+else
+  echo "Skipping cleaning of repo."
+fi
 
 build_hadoop