Move build task definition into the runestone package

Author: bnmnetp

runestone/__init__.py

@@ -29,5 +29,52 @@ def runestone_extensions():
     basedir = os.path.dirname(__file__)
     module_paths = [ x for x in os.listdir(basedir) if os.path.isdir(os.path.join(basedir,x))]
     modules = [ 'runestone.{}'.format(x) for x in module_paths if os.path.exists('{}/__init__.py'.format(os.path.join(basedir,x)))]
-    print("MODULES = ", modules)
     return modules
+
+from paver.easy import task, cmdopts, sh
+from sphinxcontrib import paverutils
+
+@task
+@cmdopts([
+    ('all','a','rebuild everything'),
+    ('outputdir=', 'o', 'output static files here'),
+    ('masterurl=', 'u', 'override the default master url'),
+    ('masterapp=', 'p', 'override the default master app')
+])
+def build(options):
+    if 'all' in options.build:
+      options['force_all'] = True
+      options['freshenv'] = True
+
+    try:
+        bi = sh('git describe --long',capture=True)[:-1]
+        bi = bi.split('-')[0]
+        options.build.template_args["build_info"] = bi
+    except:
+        options.build.template_args["build_info"] = 'unknown'
+
+    if 'outputdir' in options.build:
+        options.build.outdir = options.build.outputdir
+
+    if 'masterurl' in options.build:
+        options.build.template_args['course_url'] = options.build.masterurl
+
+    if 'masterapp' in options.build:
+        options.build.template_args['appname'] = options.build.masterapp
+
+    print('Building into ', options.build.outdir)
+    rc = paverutils.run_sphinx(options,'build')
+
+
+    try:
+        from chapternames import populateChapterInfo
+        populateChapterInfo(options.build.project_name, "%s/index.rst" % options.build.sourcedir)
+        print('Creating Chapter Information')
+    except ImportError:
+        print('Chapter information database population skipped, This is OK for a standalone build.')
+
+    if rc == 0:
+        print("Done, {} build successful".format(options.build.project_name))
+    else:
+        print("Error in building {}".format(options.build.project_name) )
+

runestone/common/project_template/pavement.tmpl

@@ -21,6 +21,7 @@ options(
         sourcedir="_sources",
         outdir="%(build_dir)s/%(project_name)s",
         confdir=".",
+        project_name = "%(project_name)s",
         template_args={'course_id': '%(project_name)s',
                        'login_required':'%(login_req)s',
                        'appname':master_app,
@@ -32,32 +33,5 @@ options(
     )
 )
 
-
-@task
-@cmdopts([
-    ('all','a','rebuild everything'),
-    ('outputdir=', 'o', 'output static files here'),
-    ('masterurl=', 'u', 'override the default master url'),
-    ('masterapp=', 'p', 'override the default master app'),
-])
-def build(options):
-    if 'all' in options.build:
-      options['force_all'] = True
-      options['freshenv'] = True
-
-    # bi = sh('git describe --long',capture=True)[:-1]
-    # bi = bi.split('-')[0]
-    # options.build.template_args["build_info"] = bi
-
-    if 'outputdir' in options.build:
-        options.build.outdir = options.build.outputdir
-
-    if 'masterurl' in options.build:
-        options.build.template_args['course_url'] = options.build.masterurl
-
-    if 'masterapp' in options.build:
-        options.build.template_args['appname'] = options.build.masterapp
-
-    print('Building into ', options.build.outdir)    
-    paverutils.run_sphinx(options,'build')
+from runestone import build  # build is called implicitly by the paver driver.