makefile from 1.1.0

Makefile

@@ -22,13 +22,8 @@ RSYNC_OPTS    := $(RSYNC_EXCLUDE) -rv --no-g --delete --force
 
 VERSION  := $(shell sed -n 's/^.*"version": "\([^"]*\)",.*$$/\1/p' package.json)
 PKG_NAME := bbctrl-$(VERSION)
-PUB_PATH := root@buildbotics.com:/var/www/buildbotics.com/bbctrl
-BETA_VERSION := $(VERSION)-rc$(shell ./scripts/next-rc)
-BETA_PKG_NAME := bbctrl-$(BETA_VERSION)
 
 SUBPROJECTS := avr boot pwr jig
-WATCH := src/pug src/pug/templates src/stylus src/js src/resources Makefile
-WATCH += src/static
 
 ifndef HOST
 HOST=onefinity
@@ -38,16 +33,12 @@ ifndef PASSWORD
 PASSWORD=onefinity
 endif
 
-
 all: $(HTML) $(RESOURCES)
 	@for SUB in $(SUBPROJECTS); do $(MAKE) -C src/$$SUB; done
 
 pkg: all $(AVR_FIRMWARE) bbserial
 	./setup.py sdist
 
-beta-pkg: pkg
-	cp dist/$(PKG_NAME).tar.bz2 dist/$(BETA_PKG_NAME).tar.bz2
-
 bbserial:
 	$(MAKE) -C src/bbserial
 
@@ -58,12 +49,6 @@ $(GPLAN_TARGET): $(GPLAN_MOD)
 
 $(GPLAN_MOD): $(GPLAN_IMG)
 	./scripts/gplan-init-build.sh
-	git -C rpi-share/cbang fetch
-	git -C rpi-share/cbang reset --hard FETCH_HEAD
-	git -C rpi-share/cbang checkout 18f1e963107ef26abe750c023355a5c40dd07853
-	git -C rpi-share/camotics fetch
-	git -C rpi-share/camotics reset --hard FETCH_HEAD
-	git -C rpi-share/camotics checkout ec876c80d20fc19837133087cef0c447df5a939d
 	cp ./scripts/gplan-build.sh rpi-share/
 	chmod +x rpi-share/gplan-build.sh
 	sudo ./scripts/rpi-chroot.sh $(GPLAN_IMG) /mnt/host/gplan-build.sh
@@ -75,15 +60,6 @@ $(GPLAN_IMG):
 $(AVR_FIRMWARE):
 	$(MAKE) -C src/avr
 
-publish: pkg
-	echo -n $(VERSION) > dist/latest.txt
-	rsync $(RSYNC_OPTS) dist/$(PKG_NAME).tar.bz2 dist/latest.txt $(PUB_PATH)/
-
-publish-beta: beta-pkg
-	echo -n $(BETA_VERSION) > dist/latest-beta.txt
-	rsync $(RSYNC_OPTS) dist/$(BETA_PKG_NAME).tar.bz2 dist/latest-beta.txt \
-	  $(PUB_PATH)/
-
 update: pkg
 	http_proxy= curl -i -X PUT -H "Content-Type: multipart/form-data" \
 	  -F "firmware=@dist/$(PKG_NAME).tar.bz2" -F "password=$(PASSWORD)" \
@@ -123,34 +99,8 @@ $(TARGET_DIR)/%.html: src/pug/%.pug node_modules FORCE
 	@mkdir -p $(TARGET_DIR)
 	$(PUG) -O pug-opts.js -P $< -o $(TARGET_DIR) || (rm -f $@; exit 1)
 
-pylint:
-	pylint3 -E $(shell find src/py -name \*.py | grep -v flycheck_)
-
-jshint:
-	./node_modules/jshint/bin/jshint --config jshint.json src/js/*.js
-
-lint: pylint jshint
-
-watch:
-	@clear
-	$(MAKE)
-	@while sleep 1; do \
-	  inotifywait -qr -e modify -e create -e delete \
-		--exclude .*~ --exclude \#.* $(WATCH); \
-	  clear; \
-	  $(MAKE); \
-	done
-
-tidy:
-	rm -f $(shell find "$(DIR)" -name \*~)
-
-clean: tidy
-	rm -rf build html dist
-	@for SUB in $(SUBPROJECTS); do \
-	  $(MAKE) -C src/$$SUB clean; \
-	done
-
-dist-clean: clean
-	rm -rf node_modules
+clean:
+	rm -rf rpi-share
+	git clean -fxd
 
 .PHONY: all install clean tidy pkg gplan lint pylint jshint bbserial