简化代码

mofenqi · Jul 24, 2017 · 3a8f152 · 3a8f152
1 parent d7e8caf
commit 3a8f152
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -18,9 +18,8 @@ install:
   - sudo $TLMGR update --self --all -repository http://ctan.sharelatex.com/tex-archive/systems/texlive/tlnet/
 
 script:
-  - make html
-  - make latexpdf
-  - make pre-deploy
+  # build html and PDF
+  - make build
 
 deploy:
   provider: pages

diff --git a/Makefile b/Makefile
@@ -26,12 +26,7 @@ figures:
 	@echo "Update all figures..."
 	make -C source/scripts
 
-pre-deploy: html latexpdf
+build: html latexpdf
 	@echo "Deploy HTML, ZIP and PDF"
-	cd $(BUILDDIR) && cp -r html $(DOCNAME) && zip -r html/$(DOCNAME).zip $(DOCNAME) && \
+	cd $(BUILDDIR) && cp -r html $(DOCNAME) && zip -rm html/$(DOCNAME).zip $(DOCNAME) && \
 	cp latex/$(DOCNAME).pdf html && cd ..
-
-release: html latexpdf
-	cd $(BUILDDIR) && mv html $(DOCNAME) && zip -r ../$(DOCNAME).zip $(DOCNAME)/
-	mv $(BUILDDIR)/latex/$(DOCNAME).pdf .
-	rm -rf $(BUILDDIR)/*