X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=Makefile-web;h=a7f92970de19664f59578a4fb6257c5eab3cb070;hp=86031c55693c6fda8a99534a65c9b63feb898f35;hb=7b56762984ce66f38728b542ca347bcb6fe3e981;hpb=7f48c102727ab008602125cf7fa5dcb42b3e5f98 diff --git a/Makefile-web b/Makefile-web index 86031c55..a7f92970 100644 --- a/Makefile-web +++ b/Makefile-web @@ -11,12 +11,11 @@ JUNKBALLS=$(JUNKDIRS:%=$(WEBDIR)/%.tar.bz2) PRETTIFY=$(WEBDIR)/prettify/src/run_prettify.js $(WEBDIR)/prettify/src/prettify.css upload: fastcheck modcheck - git push origin HEAD:master - git push github HEAD:master + git push # Check MODS list in Makefile-ccan matches modules we find. modcheck: - @FOUND=$$(echo $$(find ccan -name _info | sed 's,ccan/\(.*\)/_info,\1,' | sort) ); LISTED=$$(echo $$(echo $(MODS) | tr ' ' '\012' | sort) ); if [ "$$FOUND" = "$$LISTED" ]; then exit 0; fi; while true; do a="$${FOUND%% *}"; b="$${LISTED%% *}"; if [ "$$a" != "$$b" ]; then echo "$$a found but $$b in MOD" >&2; exit 1; fi; FOUND="$${FOUND#* }"; LISTED="$${LISTED#* }"; done + @FOUND=$$(echo $$(find ccan -name _info | sed 's,ccan/\(.*\)/_info,\1,' | sort) ); LISTED=$$(echo $$(echo $(MODS) | tr ' ' '\012' | sort) ); if [ "$$FOUND" = "$$LISTED" ]; then exit 0; fi; while true; do a="$${FOUND%% *}"; b="$${LISTED%% *}"; if [ "$$a" != "$$b" ]; then echo "'$$a' found but '$$b' in MOD" >&2; exit 1; fi; FOUND="$${FOUND#* }"; LISTED="$${LISTED#* }"; done clean-tree: [ "$(WEBDEV)" ] || ! git status --porcelain | grep . @@ -30,7 +29,7 @@ $(WEB_SUBDIRS): $(WEBDIR) mkdir -p $@ $(PRETTIFY): - svn checkout http://google-code-prettify.googlecode.com/svn/trunk/ $(WEBDIR)/prettify + git clone --depth=1 https://github.com/google/code-prettify.git $(WEBDIR)/prettify $(WEBDIR)/junkcode/%.tar.bz2: junkcode/% $(WEBDIR)/junkcode git ls-files -z $< | xargs -0 -x tar cvfj $@