Minor cleanup.

[joypy/Thun.git] / Makefile

diff --git a/Makefile b/Makefile
index 90c3f7f..6387f17 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,10 @@
 # My make-fu style is old and tired.  I just want to have a few helper commands.
 
 TESTDIR = ./test00
-VERSION = 0.2.0
+VERSION = 0.4.0
+WEBSERVER = sforman@shell.osdn.net
 
-.PHONY: clean sdist test docs
+.PHONY: clean sdist test docs upload-docs
 
 
 clean:
@@ -11,7 +12,8 @@ clean:
        find . -name '*.pyc' | xargs $(RM)
 
 sdist:
-       python ./setup.py sdist
+       python ./setup.py sdist bdist_wheel
+
 
 # In order to support testing the code as installed
 # create a virtualenv and install the source dist zip there.
@@ -24,9 +26,8 @@ test: sdist
 
 
 docs:
-       cd ./docs && python -m nbconvert --to html *.ipynb
-       cd ./docs && python -m nbconvert --to markdown *.ipynb
-       cd ./docs && python -m nbconvert --to rst *.ipynb
-
+       cd ./docs && make && make mov && cd ./sphinx_docs && make html
 
-%.md : %.ipynb ; 
+upload-docs: docs
+       ssh $(WEBSERVER) /home/users/s/sf/sforman/backup-and-remove-htdocs
+       rsync -rv --progress ./docs/sphinx_docs/_build/html/ $(WEBSERVER):/home/groups/j/jo/joypy/htdocs/