From: NeuroDebian Wizard Date: Thu, 6 Jan 2011 16:44:59 +0000 (-0500) Subject: Put icon links to extracts from DSCs (README, changelog, copyright) X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=69f6512783395438edb416c4a8b280e22683b0b8;p=neurodebian.git Put icon links to extracts from DSCs (README, changelog, copyright) --- diff --git a/Makefile b/Makefile index dd9097c..4f37cf7 100644 --- a/Makefile +++ b/Makefile @@ -32,6 +32,7 @@ source-stamp: build/db.db --db build/db.db \ --outdir build/src \ --pkgaddenum pkgs \ + --extracts /home/www/neuro.debian.net/www/debian/extracts \ commandisirrelevant rm -f html-stamp touch $@ diff --git a/neurodebian/dde.py b/neurodebian/dde.py index c93814b..4325e90 100755 --- a/neurodebian/dde.py +++ b/neurodebian/dde.py @@ -583,7 +583,8 @@ def convert_longdescr(ld): return ld -def generate_pkgpage(pkg, cfg, db, template, addenum_dir): +def generate_pkgpage(pkg, cfg, db, template, addenum_dir, extracts_dir): + print pkg # local binding for ease of use pkgdb = db[pkg] # do nothing if there is not at least the very basic stuff @@ -593,6 +594,11 @@ def generate_pkgpage(pkg, cfg, db, template, addenum_dir): underline = '*' * (len(title) + 2) title = '%s\n %s\n%s' % (underline, title, underline) + ex_dir = None + if 'sv' in pkgdb['main']: + ex_dir = os.path.join(extracts_dir, pkgdb['main']['sv'].split()[0]) + if not os.path.exists(ex_dir): + ex_dir = None page = template.render( pkg=pkg, title=title, @@ -600,7 +606,9 @@ def generate_pkgpage(pkg, cfg, db, template, addenum_dir): assure_unicode(pkgdb['main']['long_description'])), cfg=cfg, db=pkgdb, - fulldb=db) + fulldb=db, + extracts_dir=ex_dir, + op=os.path) # the following can be replaced by something like # {% include "sidebar.html" ignore missing %} # in the template whenever jinja 2.2 becomes available @@ -650,7 +658,7 @@ def write_sourceslist(jinja_env, cfg, outdir): sl.close() -def write_pkgpages(jinja_env, cfg, db, outdir, addenum_dir): +def write_pkgpages(jinja_env, cfg, db, outdir, addenum_dir, extracts_dir): create_dir(outdir) create_dir(os.path.join(outdir, 'pkgs')) @@ -675,7 +683,7 @@ def write_pkgpages(jinja_env, cfg, db, outdir, addenum_dir): # and now each individual package page pkg_template = jinja_env.get_template('pkg.rst') for p in db.keys(): - page = generate_pkgpage(p, cfg, db, pkg_template, addenum_dir) + page = generate_pkgpage(p, cfg, db, pkg_template, addenum_dir, extracts_dir) # when no page is available skip this package if page is None: continue @@ -710,6 +718,9 @@ def prepOptParser(op): op.add_option("--pkgaddenum", action="store", dest="addenum_dir", type="string", default=None, help="None") + op.add_option("--extracts", action="store", dest="extracts_dir", + type="string", default=None, help="None") + def main(): op = OptionParser(version="%prog 0.0.2") @@ -773,7 +784,7 @@ def main(): jinja_env = Environment(loader=PackageLoader('neurodebian', 'templates')) # generate package pages and TOC and write them to files - write_pkgpages(jinja_env, cfg, db, opts.outdir, opts.addenum_dir) + write_pkgpages(jinja_env, cfg, db, opts.outdir, opts.addenum_dir, opts.extracts_dir) write_sourceslist(jinja_env, cfg, opts.outdir) diff --git a/neurodebian/templates/pkg.rst b/neurodebian/templates/pkg.rst index 5290b0a..17af598 100644 --- a/neurodebian/templates/pkg.rst +++ b/neurodebian/templates/pkg.rst @@ -12,6 +12,20 @@ External links:

+ {%- if extracts_dir -%} + {%- if op.exists(op.join(extracts_dir, 'copyright')) -%} + + + {%- endif -%} + {%- if op.exists(op.join(extracts_dir, 'changelog')) -%} + + + {%- endif -%} + {%- if op.exists(op.join(extracts_dir, 'README.Debian')) -%} + + + {%- endif -%} + {%- endif -%} {%- if cfg.has_option("nitrc ids", pkg) -%} diff --git a/sphinx/_static/changelog.png b/sphinx/_static/changelog.png new file mode 100644 index 0000000..9330fe5 Binary files /dev/null and b/sphinx/_static/changelog.png differ diff --git a/sphinx/_static/debian-changelog.png b/sphinx/_static/debian-changelog.png new file mode 100644 index 0000000..f776990 Binary files /dev/null and b/sphinx/_static/debian-changelog.png differ diff --git a/sphinx/_static/info.png b/sphinx/_static/info.png new file mode 100644 index 0000000..9361915 Binary files /dev/null and b/sphinx/_static/info.png differ diff --git a/sphinx/_static/legal.png b/sphinx/_static/legal.png new file mode 100644 index 0000000..08fc8e1 Binary files /dev/null and b/sphinx/_static/legal.png differ