Use bibble from pip instead of submodule.

master
Max Willsey 7 years ago
parent af1415ef7c
commit 6a5856fc7c

3
.gitmodules vendored

@ -1,3 +0,0 @@
[submodule "bibble"]
path = bibble
url = https://github.com/sampsyo/bibble.git

@ -1,5 +1,3 @@
PYTHON=python2.7
# targets that aren't filenames # targets that aren't filenames
.PHONY: all clean deploy .PHONY: all clean deploy
@ -9,9 +7,11 @@ BUILDARGS :=
_site/index.html _site/wacas14/index.html: _site/index.html _site/wacas14/index.html:
jekyll build $(BUILDARGS) jekyll build $(BUILDARGS)
BIBBLE=bibble
_includes/pubs.html: bib/pubs.bib bib/publications.tmpl _includes/pubs.html: bib/pubs.bib bib/publications.tmpl
mkdir -p _includes mkdir -p _includes
$(PYTHON) bibble/bibble.py $+ > $@ $(BIBBLE) $+ > $@
_site/index.html: $(wildcard *.html) _includes/pubs.html _config.yml \ _site/index.html: $(wildcard *.html) _includes/pubs.html _config.yml \
_layouts/default.html _layouts/default.html

@ -31,9 +31,9 @@ Features
Setup Setup
----- -----
1. Install the dependencies. You will need [Python][], [Pybtex][] (`pip install pybtex`), and [Jekyll][] (`gem install jekyll`). 1. Install the dependencies. You will need [Python][], [bibble][] (`pip install bibble`), and [Jekyll][] (`gem install jekyll`).
2. [Fork][] this repository on GitHub. 2. [Fork][] this repository on GitHub.
3. Clone the fork (along with its submodules) to your own machine: `git clone --recursive git@github.com:yourgroup/research-group-web.git`. 3. Clone the fork to your own machine: `git clone git@github.com:yourgroup/research-group-web.git`.
4. Add an "upstream" remote for the original repository so you can stay abreast of bugfixes: `git remote add upstream git://github.com/uwsampa/research-group-web.git`. 4. Add an "upstream" remote for the original repository so you can stay abreast of bugfixes: `git remote add upstream git://github.com/uwsampa/research-group-web.git`.
5. Customize. Start with the `_config.yml` file, where you enter the name of the site and its URL. 5. Customize. Start with the `_config.yml` file, where you enter the name of the site and its URL.
6. Type `make` to build the site and then run `jekyll serve -w` to view your site. 6. Type `make` to build the site and then run `jekyll serve -w` to view your site.
@ -88,10 +88,7 @@ Building
The requirements for building the site are: The requirements for building the site are:
* [Jekyll][]: run `gem install jekyll` * [Jekyll][]: run `gem install jekyll`
* [Pybtex][]: run `pip install pybtex` * [bibble][]: available on `pip`
* [bibble][]: included as a submodule. Because git is cruel, you need to use
`git clone --recursive URL` or issue the commands `git submodule init ; git
submodule update` to check out the dependency.
* ssh and rsync, only if you want to deploy directly. * ssh and rsync, only if you want to deploy directly.
`make` compiles the bibliography and the website content to the `_site` `make` compiles the bibliography and the website content to the `_site`
@ -108,4 +105,3 @@ To upload a new version of the site via rsync over ssh, type `make deploy`. A we
[Jekyll]: http://jekyllrb.com/ [Jekyll]: http://jekyllrb.com/
[bibble]: https://github.com/sampsyo/bibble/ [bibble]: https://github.com/sampsyo/bibble/
[pybtex]: http://pybtex.sourceforge.net

@ -1 +0,0 @@
Subproject commit f459839d1697a73f907133ac73c2cc9ea007f5d5
Loading…
Cancel
Save