team4alfanous team mailing list archive
-
team4alfanous team
-
Mailing list archive
-
Message #00174
[Branch ~team4alfanous/alfanous/alfanous-git] Rev 360: Merge github.com:Alfanous-team/alfanous
Merge authors:
Assem Chelli (عاصم شلي) (assem-ch)
------------------------------------------------------------
revno: 360 [merge]
committer: Assem Chelli <assem.ch@xxxxxxxxx>
timestamp: Thu 2012-10-04 20:19:20 +0100
message:
Merge github.com:Alfanous-team/alfanous
modified:
Makefile
src/alfanous/README.rst
--
lp:alfanous
https://code.launchpad.net/~team4alfanous/alfanous/alfanous-git
Your team Alfanous team is subscribed to branch lp:alfanous.
To unsubscribe from this branch go to https://code.launchpad.net/~team4alfanous/alfanous/alfanous-git/+edit-subscription
=== modified file 'Makefile'
--- Makefile 2012-10-02 14:48:30 +0000
+++ Makefile 2012-10-04 18:36:46 +0000
@@ -254,7 +254,8 @@
mkdir -p output/$(VERSION);cd $(API_PATH); epydoc --html -v --graph all --no-sourcecode --show-imports -n alfanous -u alfanous.org . ; zip -9 alfanous-epydoc.zip ./html/* ; mv -f alfanous-epydoc.zip ../output/$(VERSION)/ ; rm -r ./html
help_sphinx:
- mkdir -p output/$(VERSION);cd ./docs ; make dirhtml; zip -9 alfanous-sphinx-doc.zip ./_build/dirhtml/* ; mv -f alfanous-sphinx-doc.zip ../output/$(VERSION)/ ; rm -r ./_build/dirhtml
+ @echo "TODO"
+ # mkdir -p output/$(VERSION);cd ./docs ; make dirhtml; zip -9 alfanous-sphinx-doc.zip ./_build/dirhtml/* ; mv -f alfanous-sphinx-doc.zip ../output/$(VERSION)/ ; rm -r ./_build/dirhtml
## Qt resources compilation, PyQt is needed: apt-get install pyqt4-dev-tools pyqt-tools
# 1. qrc files, see qt_rcc
=== modified file 'src/alfanous/README.rst'
--- src/alfanous/README.rst 2012-10-04 14:39:26 +0000
+++ src/alfanous/README.rst 2012-10-04 18:00:16 +0000
@@ -6,14 +6,16 @@
-----
The API uses many critical resources that must be downloaded and/or prepared to be used. To do that, just run this command in the root path of the project
-#. Install all building dependencies: `pyparsing <http://aminenacer.blogspot.com/2012/10/mon-voyage-akfadou-deuxieme-partie.html>`_, `pyqt4-dev-tools <http://www.riverbankcomputing.co.uk/software/pyqt/download>`_.
-
+#. Install all building dependencies: `pyparsing <http://aminenacer.blogspot.com/2012/10/mon-voyage-akfadou-deuxieme-partie.html>`_, `pyqt4-dev-tools <http://www.riverbankcomputing.co.uk/software/pyqt/download>`_, `epydoc <http://epydoc.sourceforge.net/>`_,
+ `sphinx <http://sphinx.pocoo.org/>`_.
+
* (ubuntu 12.04):
.. code-block:: sh
- $ sudo apt-get install python-qt4 qt4-dev-tools python-qt4-dev pyqt4-dev-tools python-distutils
- $ sudo easy_install pyparsing
+ $ sudo apt-get install python-qt4 qt4-dev-tools python-qt4-dev pyqt4-dev-tools
+ $ sudo apt-get install python-distutils-extra
+ $ sudo easy_install pyparsing epydoc sphinx