Skip to content

Commit

Permalink
Bring build process in line with CNERG
Browse files Browse the repository at this point in the history
  • Loading branch information
Paul P.H. Wilson committed Sep 3, 2013
1 parent 1df654b commit 1fa9528
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ help:
@echo "Please use \`make <target>' where <target> is one of"
@echo " gh-preview to build HTML in directory $BUILDDIR for testing"
@echo " gh-revert to cleanup HTML build in directory $BUILDDIR after testing"
@echo " gh-pages final build and push from source branch to master branch"
@echo " gh-publish final build and push from source branch to master branch"
@echo " html to make standalone HTML files"
@echo " dirhtml to make HTML files named index.html in directories"
@echo " singlehtml to make a single large HTML file"
Expand Down Expand Up @@ -59,10 +59,12 @@ gh-publish:
git checkout $(GH_PUBLISH_BRANCH)
git checkout $(GH_SOURCE_BRANCH) -- $(GH_SOURCE_DIR)
git reset HEAD
make clean
make html
rsync -a $(BUILDDIR)/* .
rsync -a $(BUILDDIR)/.* .
git add `(cd $(BUILDDIR); find . -type f; cd ..)`
rm -rf $(GH_SOURCE_DIR) $(BUILDDIR)
git add -A
git commit -m "Generated $(GH_PUBLISH_BRANCH) for `git log $(GH_SOURCE_BRANCH) -1 --pretty=short --abbrev-commit`" && git push $(GH_UPSTREAM_REPO) $(GH_PUBLISH_BRANCH)
git checkout $(GH_SOURCE_BRANCH)

Expand Down

0 comments on commit 1fa9528

Please sign in to comment.