From c5935cbcf3d2bf79dd76b1d4f4cfe292cb540008 Mon Sep 17 00:00:00 2001 From: Michael Hanke Date: Thu, 23 Apr 2009 09:04:01 +0200 Subject: [PATCH] Moving towards a CLI. --- .gitignore | 3 ++ Makefile | 23 +++++++++++++-- reblender | 82 +++++++++++++++++++++++++++++------------------------- 3 files changed, 67 insertions(+), 41 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..b926804 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +build +cache +*.swp diff --git a/Makefile b/Makefile index 0e76bed..a903a1b 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ SPHINXBUILD = sphinx-build PAPER = # Internal variables. -SRCDIR = build/source +SRCDIR = build/src PAPEROPT_a4 = -D latex_paper_size=a4 PAPEROPT_letter = -D latex_paper_size=letter ALLSPHINXOPTS = -d build/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) $(SRCDIR) @@ -22,7 +22,7 @@ WWW_DIR = build/html prep: mkdir -p build - cp -r source build/ + cp -r source/* build/src clean: @@ -78,7 +78,24 @@ linkcheck: prep update-db: - ./reblender + rm -f build/db.db + ./reblender \ + --db build/db.db \ + --outdir build/src \ + -r http://apsy.gse.uni-magdeburg.de/debian/dists/dapper/Release \ + -r http://apsy.gse.uni-magdeburg.de/debian/dists/gutsy/Release \ + -r http://apsy.gse.uni-magdeburg.de/debian/dists/hardy/Release \ + -r http://apsy.gse.uni-magdeburg.de/debian/dists/intrepid/Release \ + -r http://apsy.gse.uni-magdeburg.de/debian/dists/etch/Release \ + -r http://apsy.gse.uni-magdeburg.de/debian/dists/lenny/Release \ + -r http://apsy.gse.uni-magdeburg.de/debian/dists/squeeze/Release \ + -r http://apsy.gse.uni-magdeburg.de/debian/dists/sid/Release \ + -t svn://svn.debian.org/blends/projects/med/trunk/debian-med/tasks/imaging \ + -t svn://svn.debian.org/blends/projects/med/trunk/debian-med/tasks/imaging-dev \ + -t svn://svn.debian.org/blends/projects/science/trunk/debian-science/tasks/neuroscience-cognitive \ + -f fsl-doc -f fslview-doc -f fsl-atlases -f fsl-possum-data \ + -f fsl-first-data -f fsl-feeds \ + -p svn://svn.debian.org/blends/projects/science/trunk/debian-science/tasks/neuroscience-cognitive upload-website: html diff --git a/reblender b/reblender index 32c840c..7176271 100755 --- a/reblender +++ b/reblender @@ -376,16 +376,20 @@ class DebianPkgArchive(SafeConfigParser): fl = open(os.path.join(outdir, 'sources_lists'), 'w') for trans, r in sorted([(transCodename(k), k) for k in self.releases.keys()]): + # need to turn 'apsy_lenny' back into 'lenny' + debneuro_r = r.split('_')[1] + f = open(os.path.join(outdir, 'static', - 'debneuro.%s.sources.list' % r), + 'debneuro.%s.sources.list' % debneuro_r), 'w') f.write("deb http://apsy.gse.uni-magdeburg.de/debian %s %s\n" \ - % (r, ' '.join(self.releases[r]))) + % (debneuro_r, ' '.join(self.releases[r]))) f.write("deb-src http://apsy.gse.uni-magdeburg.de/debian %s %s\n" \ - % (r, ' '.join(self.releases[r]))) + % (debneuro_r, ' '.join(self.releases[r]))) # XXX use :download: role from sphinx 0.6 on - fl.write('* `%s `_\n' \ - % (trans, r)) + #fl.write('* `%s `_\n' \ + fl.write('* `%s <_static/debneuro.%s.sources.list>`_\n' \ + % (trans, debneuro_r)) f.close() fl.close() @@ -694,10 +698,27 @@ def prepOptParser(op): default=None, help="Database file to read. Default: None") - op.add_option("--release-url", + op.add_option("-o", "--outdir", + action="store", type="string", dest="outdir", + default=None, + help="Target directory for ReST output. Default: None") + + op.add_option("-r", "--release-url", action="append", dest="release_urls", help="None") + op.add_option("-t", "--taskfile-url", + action="append", dest="taskfile_urls", + help="None") + + op.add_option("-f", "--featured", + action="append", dest="featured_pkgs", + help="None") + + op.add_option("-p", "--prospective", + action="append", dest="prospective_pkgs", + help="None") + def main(): op = OptionParser(version="%prog 0.0.1") @@ -705,45 +726,30 @@ def main(): (opts, args) = op.parse_args() - print opts.rurls dpa = DebianPkgArchive(init_db=opts.db) - target_dir = 'build/source' - - -# release_urls=[ -# 'http://apsy.gse.uni-magdeburg.de/debian/dists/dapper/Release', -# 'http://apsy.gse.uni-magdeburg.de/debian/dists/gutsy/Release', -# 'http://apsy.gse.uni-magdeburg.de/debian/dists/hardy/Release', -# 'http://apsy.gse.uni-magdeburg.de/debian/dists/intrepid/Release', -# 'http://apsy.gse.uni-magdeburg.de/debian/dists/etch/Release', -# 'http://apsy.gse.uni-magdeburg.de/debian/dists/lenny/Release', -# 'http://apsy.gse.uni-magdeburg.de/debian/dists/squeeze/Release', -# 'http://apsy.gse.uni-magdeburg.de/debian/dists/sid/Release', -# ] - -# taskfiles = [ -# 'svn://svn.debian.org/blends/projects/med/trunk/debian-med/tasks/imaging', -# 'svn://svn.debian.org/blends/projects/med/trunk/debian-med/tasks/imaging-dev', -# 'svn://svn.debian.org/blends/projects/science/trunk/debian-science/tasks/neuroscience-cognitive', -# ] - -# dpa.setPkgFilterFromTaskFile(taskfiles) -# dpa.pkgfilter += ['fsl-doc', 'fslview-doc', 'fsl-atlases', 'fsl-possum-data', -# 'fsl-first-data', 'fsl-feeds'] + if not opts.taskfile_urls is None: + dpa.setPkgFilterFromTaskFile(opts.taskfile_urls) -# dpa.importProspectivePkgsFromTaskFile(taskfiles[0]) + if not opts.featured_pkgs is None: + dpa.pkgfilter += opts.featured_pkgs -# for rurl in opts.release_urls: -# dpa.importRelease(rurl, force_update=False) + if not opts.prospective_pkgs is None: + for p in opts.prospective_pkgs: + dpa.importProspectivePkgsFromTaskFile(p) -# dpa.writeSourcesLists(target_dir) + if not opts.release_urls is None: + for rurl in opts.release_urls: + dpa.importRelease(rurl, force_update=False) -# writeRst(dpa, target_dir) -# writePkgsBy(dpa, 'maintainer', maintainer2email, target_dir, -# 'Packages maintained by ') + if not opts.outdir is None: + dpa.writeSourcesLists(opts.outdir) + writeRst(dpa, opts.outdir) + writePkgsBy(dpa, 'maintainer', maintainer2email, opts.outdir, + 'Packages maintained by ') -# dpa.save('build/db.db') + if not opts.db is None: + dpa.save(opts.db) if __name__ == "__main__": -- 2.39.2