Anonymous avatar Anonymous committed f9d4256

Add full rendering of webapp config file basing on Sphinx's conf.py file

Comments (0)

Files changed (4)

sphinx/builders/webapp/templates/webapp.conf

 licence={{ licence }}
 
 [Repository]
-repodir=repo/doc
-reposums=reposums
+repodir={{ repodir }}
+reposums={{ reposums }}
 piddbfile={{ piddbfile }}

sphinx/builders/webapp/webapp.py

         try:
             conf_template = self.templ_env.get_template('webapp.conf')
             conf_rendered = conf_template.render(
-                                { 'piddbfile': self.config.piddbfile,
-                                  'licence': self.config.licence })
+                                { 'licence': self.config.licence,
+                                  'piddbfile': self.config.piddbfile,
+                                  'repodir': self.config.repodir,
+                                  'reposums': self.config.reposums })
             conf_dst = path.join(self.outdir, 'webapp.conf')
             w = codecs.open(conf_dst, 'w', self.encoding)
             w.write(conf_rendered)
 
         # Web application options
         xapian_db = ('xapian_db', 'webapp'),
-        piddbfile = ('piddb.pkl', 'webapp'),
+        repodir = ('repo/doc', 'webapp'),
+        reposums = ('reposums.pkl', None),
+        piddbfile = ('piddb.pkl', None),
         licence = ('BSD', 'webapp'),
     )
 

sphinx/quickstart.py

 # -- Options for WebApp --------------------------------------------------------
 # configuration options for Xapian:
 xapian_db = 'xapian_db'
+repodir = 'repo/doc'
+reposums = 'reposums.pkl'
 piddbfile = 'piddb.pkl'
 licence = 'BSD'
 '''
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.