manager: add gadjo as a submodule (refs #5180)

* Use STATICFILES_DIR and TEMPLATE_DIRS to load gadjo templates and
	statics.
* Use MANIFEST.in to install gadjo
This commit is contained in:
Benjamin Dauvergne 2014-08-13 15:04:27 +02:00
parent cecc9f4d2c
commit 13a50077ed
4 changed files with 9 additions and 0 deletions

3
.gitmodules vendored Normal file
View File

@ -0,0 +1,3 @@
[submodule "authentic2/manager/vendor/gadjo"]
path = authentic2/manager/vendor/gadjo
url = git://repos.entrouvert.org/gadjo.git

View File

@ -30,6 +30,9 @@ recursive-include authentic2/attribute_aggregator/locale *.po *.mo
recursive-include authentic2/disco_service/locale *.po *.mo
recursive-include authentic2 README xrds.xml *.txt yadis.xrdf
# gadjo submodule
recursive-include authentic2/manager/vendor/gadjo *
include doc/*.rst
include doc/pictures/*
include COPYING NEWS README.rst AUTHORS.txt

1
authentic2/manager/vendor/gadjo vendored Submodule

@ -0,0 +1 @@
Subproject commit a075ca07c9f387ab1ec00de0673840f6e9a9e501

View File

@ -136,11 +136,13 @@ ROOT_URLCONF = 'authentic2.urls'
TEMPLATE_DIRS = (
os.path.join(VAR_DIR, 'templates'),
os.path.join(BASE_DIR, 'templates'),
os.path.join(BASE_DIR, 'manager', 'vendor', 'gadjo', 'gadjo', 'templates'),
)
STATICFILES_DIRS = (
os.path.join(VAR_DIR, 'extra-static'),
os.path.join(BASE_DIR, 'static'),
os.path.join(BASE_DIR, 'manager', 'vendor', 'gadjo', 'gadjo', 'static'),
)
if os.environ.get('TEMPLATE_DIRS'):