3 Commits 1f0ab2d88b ... 7f31e6de7f

Tác giả SHA1 Thông báo Ngày
  digital 7f31e6de7f --amend 7 năm trước cách đây
  digital ba7cb60797 restructured the folder tree, now there are src,config and samples directories. other directories such as build,dist and log are generated automatically. 7 năm trước cách đây
  digital 92b1959bd7 fixed typos in free_software.rst 7 năm trước cách đây

+ 2 - 2
Makefile

@@ -22,8 +22,8 @@
 SPHINXOPTS    =
 SPHINXBUILD   = sphinx-build
 SPHINXPROJ    = BeeWatch
-SOURCEDIR     = docs/src/
-BUILDDIR      = docs/
+SOURCEDIR     = src/docs/
+BUILDDIR      = build/docs/
 
 # Put it first so that "make" without argument is like "make help".
 help:

+ 0 - 0
build_response


+ 3 - 0
sample/gui.py

@@ -30,6 +30,9 @@ import sys
 import time
 import traceback
 import yaml
+
+# add the source dir to the path, python finds the beewatch module.
+sys.path.insert(0,"src")
 # My Libraries
 import beewatch
 import beewatch.gui

+ 2 - 0
sample/server.py

@@ -35,6 +35,8 @@ import yaml
 import blinker
 import curio
 
+# add the source dir to the path, python finds the beewatch module.
+sys.path.insert(0,"src")
 import beewatch
 # import beewatch
 import beewatch.server

+ 3 - 0
setup.py

@@ -31,6 +31,9 @@ setup_kwargs = {
         'beewatch.pinapi',
         'beewatch.server',
     ],
+    'package_dir':{
+        'beewatch':'src/beewatch'
+    },
 }
 
 setup(**setup_kwargs)

+ 0 - 0
beewatch/__init__.py → src/beewatch/__init__.py


+ 0 - 0
beewatch/config_/__init__.py → src/beewatch/config_/__init__.py


+ 0 - 0
beewatch/gui/__init__.py → src/beewatch/gui/__init__.py


+ 0 - 0
beewatch/pinapi/__init__.py → src/beewatch/pinapi/__init__.py


+ 0 - 0
beewatch/server/__init__.py → src/beewatch/server/__init__.py


+ 0 - 0
docs/src/beewatch/gui/index.rst → src/docs/beewatch/gui/index.rst


+ 0 - 0
docs/src/beewatch/index.rst → src/docs/beewatch/index.rst


+ 0 - 0
docs/src/beewatch/pinapi/index.rst → src/docs/beewatch/pinapi/index.rst


+ 0 - 0
docs/src/beewatch/server/index.rst → src/docs/beewatch/server/index.rst


+ 0 - 0
docs/src/conf.py → src/docs/conf.py


+ 0 - 0
docs/src/configure.rst → src/docs/configure.rst


+ 0 - 0
docs/src/design.rst → src/docs/design.rst


+ 0 - 0
docs/src/getting_started.rst → src/docs/getting_started.rst


+ 1 - 1
docs/src/includes/free_software.rst → src/docs/includes/free_software.rst

@@ -20,7 +20,7 @@
 
 Fee Software
 ------------
-My goal is to produce free software. 'Free' as in freedom or libre. That means I and the software I write respect your privacy and rights. Sounds great but what does that mean? Let's take a look at the definition of free software by `gnu.org - free software`_ :
+My goal is to produce free software. 'Free' as in freedom or libre. That means the software I write respects your privacy and rights. Sounds great, but what does that mean? Let's take a look at the definition of free software by `gnu.org - free software`_ :
 
     A program is free software if the program's users have the four essential freedoms:
 

+ 0 - 0
docs/src/includes/indicestables.rst → src/docs/includes/indicestables.rst


+ 0 - 0
docs/src/includes/links.rst → src/docs/includes/links.rst


+ 0 - 0
docs/src/includes/tellme.rst → src/docs/includes/tellme.rst


+ 0 - 0
docs/src/index.rst → src/docs/index.rst


+ 0 - 0
docs/src/inspiration.rst → src/docs/inspiration.rst


+ 1 - 1
docs/src/install.rst → src/docs/install.rst

@@ -34,7 +34,7 @@ To install BeeWatch run ``./setup.py install`` in BeeWatch-X.X. For more options
 
 Build the documentation
 -----------------------
-This project uses Sphinx for documentation generation. Sphinx can create the documentation in a variety of formats, eg html, pdf, epub an more. Run ``make help`` to get a list of supported file formats. Let's say you chose html, so you run ``make html``. This creates the documentation in `docs/html`. The entry point for reading it is `docs/html/index.html`.
+This project uses Sphinx for documentation generation. Sphinx can create the documentation in a variety of formats, eg html, pdf, epub an more. Run ``make help`` to get a list of supported file formats. Let's say you chose html, so you run ``make html``. This creates the documentation inside 'build/docs/<format>'. The entry point for reading the html version of the docs is `build/docs/html/index.html`.
 
 
 

+ 1 - 0
src/docs/static/.notemptydir

@@ -0,0 +1 @@
+# this file only exits so the static folder doesn't get ignored. empty directories get apparently ignored.

+ 0 - 0
docs/src/templates/index.rst → src/docs/templates/index.rst