Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ZIPI_REPO ?= git@github.com:udem-dlteam/zipi
ZIPI_BRANCH ?=
ZIPI_BRANCH ?= codeboot
ZIPI_FOR_CODEBOOT = zipi-for-codeboot
PYTHON38 ?= $(ZIPI_FOR_CODEBOOT)/venv/bin/python

Expand All @@ -8,10 +8,8 @@ all: bundle
$(ZIPI_FOR_CODEBOOT):
rm -rf ./$(ZIPI_FOR_CODEBOOT)
@if test "$(ZIPI_BRANCH)" != "" || echo $(ZIPI_REPO) | grep "^\(http://\|https://\|git@\)" > /dev/null; then \
echo "git clone $(ZIPI_REPO) ./$(ZIPI_FOR_CODEBOOT)"; \
git clone $(ZIPI_REPO) ./$(ZIPI_FOR_CODEBOOT); \
echo "cd ./$(ZIPI_FOR_CODEBOOT) && git checkout $(if $(ZIPI_BRANCH),$(ZIPI_BRANCH),master)"; \
cd ./$(ZIPI_FOR_CODEBOOT) && git checkout $(if $(ZIPI_BRANCH),$(ZIPI_BRANCH),master); \
echo "git clone --branch=codeboot $(ZIPI_REPO) ./$(ZIPI_FOR_CODEBOOT)"; \
git clone --branch=$(ZIPI_BRANCH) $(ZIPI_REPO) ./$(ZIPI_FOR_CODEBOOT); \
else \
echo "cp -r $(ZIPI_REPO) ./$(ZIPI_FOR_CODEBOOT)"; \
cp -r $(ZIPI_REPO) ./$(ZIPI_FOR_CODEBOOT); \
Expand Down Expand Up @@ -80,5 +78,6 @@ codeboot.bundle.js: include/jquery-3.2.1.min.js include/jquery.clippy.min.js inc
echo >> $@; \
done


clean:
rm -rf ./$(ZIPI_FOR_CODEBOOT) codeboot.bundle.js codeboot.bundle.css