Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

build: moving build configuration files

  • Loading branch information...
commit e403ec88fdef0e32025e45be5ed5539783e84877 1 parent 8312658
@tychoish tychoish authored
View
4 bootstrap.py
@@ -6,14 +6,14 @@
project_root = os.path.abspath(os.path.dirname(__file__))
-master_conf = os.path.join(project_root, 'bin', 'docs_meta.yaml')
+master_conf = os.path.join(project_root, 'config', 'build_conf.yaml')
with open(master_conf, 'r') as f:
conf = yaml.safe_load(f)
repo = 'git://github.com/{0}.git'.format(conf['git']['remote']['tools'])
-buildsystem = conf['build']['paths']['buildsystem']
+buildsystem = conf['paths']['buildsystem']
sys.path.append(os.path.join(buildsystem, 'bin'))
View
13 conf.py
@@ -25,9 +25,10 @@
from docs_meta import get_conf, get_versions, get_manual_path
conf = get_conf()
-conf.build.paths.projectroot = project_root
-pdfs = ingest_yaml_list(os.path.join(conf.build.paths.builddata, 'pdfs.yaml'))
-intersphinx_libs = ingest_yaml_list(os.path.join(conf.build.paths.builddata, 'intersphinx.yaml'))
+
+conf.paths.projectroot = project_root
+pdfs = ingest_yaml_list(os.path.join(conf.paths.builddata, 'pdfs.yaml'))
+intersphinx_libs = ingest_yaml_list(os.path.join(conf.paths.builddata, 'intersphinx.yaml'))
# -- General configuration ----------------------------------------------------
@@ -41,7 +42,7 @@
'directives',
]
-locale_dirs = [ conf.build.paths.locale ]
+locale_dirs = [ conf.paths.locale ]
gettext_compact = False
templates_path = ['.templates']
@@ -87,8 +88,8 @@
intersphinx_mapping = {}
for i in intersphinx_libs:
- intersphinx_mapping[i['name']] = ( i['url'], os.path.join(conf.build.paths.projectroot,
- conf.build.paths.output,
+ intersphinx_mapping[i['name']] = ( i['url'], os.path.join(conf.paths.projectroot,
+ conf.paths.output,
i['path']))
languages = [
View
24 bin/docs_meta.yaml → config/build_conf.yaml
@@ -24,9 +24,9 @@ version:
- '2.2'
stable: '2.4'
upcoming: '2.6'
-build:
- system:
- files:
+system:
+ make:
+ generated:
- 'migrations'
- 'integration'
- 'meta'
@@ -36,13 +36,13 @@ build:
- 'makefile.compatibility'
- 'makefile.clean'
- 'makefile.dtf'
- paths:
- output: 'build'
- source: 'source'
- includes: 'source/includes'
- images: 'source/images'
- tools: 'bin'
- buildsystem: 'build/docs-tools'
- builddata: 'bin/builddata'
- locale: 'locale'
+paths:
+ output: 'build'
+ source: 'source'
+ includes: 'source/includes'
+ images: 'source/images'
+ tools: 'bin'
+ buildsystem: 'build/docs-tools'
+ builddata: 'config'
+ locale: 'locale'
...
View
0  bin/builddata/delegated.yaml → config/delegated.yaml
File renamed without changes
View
0  bin/builddata/errors.yaml → config/errors.yaml
File renamed without changes
View
0  bin/builddata/htaccess-next.yaml → config/htaccess-next.yaml
File renamed without changes
View
0  bin/builddata/htaccess-operators.yaml → config/htaccess-operators.yaml
File renamed without changes
View
0  bin/builddata/htaccess.yaml → config/htaccess.yaml
File renamed without changes
View
0  bin/builddata/integration.yaml → config/integration.yaml
File renamed without changes
View
0  bin/builddata/intersphinx.yaml → config/intersphinx.yaml
File renamed without changes
View
6 bin/builddata/migrations.yaml → config/migrations.yaml
@@ -34,7 +34,7 @@ dependency:
action: 'dep'
---
target: 'mongodb-domain.yaml'
-dependency: 'bin/builddata/mongodb-domain.yaml'
+dependency: 'config/mongodb-domain.yaml'
action: 'cp'
type: 'build'
---
@@ -74,7 +74,7 @@ action: dep
---
target: $(public-output)/.htaccess
dependency:
- - bin/builddata/htaccess.yaml
+ - config/htaccess.yaml
- $(tools)/bin/htaccess.py
command: "fab generate.htaccess:$(public-output)/.htaccess"
action: cmd
@@ -85,7 +85,7 @@ action: dep
---
target: $(public-output)/robots.txt
dependency:
- - bin/builddata/robots.yaml
+ - config/robots.yaml
command: "fab generate.robots:$(public-output)/robots.txt"
action: cmd
...
View
0  bin/builddata/mongodb-domain.yaml → config/mongodb-domain.yaml
File renamed without changes
View
0  bin/builddata/pdfs.yaml → config/pdfs.yaml
File renamed without changes
View
0  bin/builddata/push.yaml → config/push.yaml
File renamed without changes
View
0  bin/builddata/releases.yaml → config/releases.yaml
File renamed without changes
View
0  bin/builddata/robots.yaml → config/robots.yaml
File renamed without changes
View
0  bin/builddata/sphinx.yaml → config/sphinx.yaml
File renamed without changes
Please sign in to comment.
Something went wrong with that request. Please try again.