Projet

Général

Profil

0003-manager-add-gadjo-as-a-submodule.patch

Benjamin Dauvergne, 13 août 2014 15:28

Télécharger (2,22 ko)

Voir les différences:

Subject: [PATCH 3/5] manager: add gadjo as a submodule

* Use STATICFILES_DIR and TEMPLATE_DIRS to load gadjo templates and
	statics.
* Use MANIFEST.in to install gadjo
 .gitmodules                     |    3 +++
 MANIFEST.in                     |    3 +++
 authentic2/manager/vendor/gadjo |    1 +
 authentic2/settings.py          |    2 ++
 4 files changed, 9 insertions(+)
 create mode 100644 .gitmodules
 create mode 160000 authentic2/manager/vendor/gadjo
.gitmodules
1
[submodule "authentic2/manager/vendor/gadjo"]
2
	path = authentic2/manager/vendor/gadjo
3
	url = git://repos.entrouvert.org/gadjo.git
MANIFEST.in
30 30
recursive-include authentic2/disco_service/locale *.po *.mo
31 31
recursive-include authentic2 README  xrds.xml *.txt yadis.xrdf
32 32

  
33
# gadjo submodule
34
recursive-include authentic2/manager/vendor/gadjo *
35

  
33 36
include doc/*.rst
34 37
include doc/pictures/*
35 38
include COPYING NEWS README.rst AUTHORS.txt
authentic2/manager/vendor/gadjo
1
Subproject commit 8ff6f22ac2ee0155470a96f4798d2014ee272256
authentic2/settings.py
136 136
TEMPLATE_DIRS = (
137 137
        os.path.join(VAR_DIR, 'templates'),
138 138
        os.path.join(BASE_DIR, 'templates'),
139
        os.path.join(BASE_DIR, 'manager', 'vendor', 'gadjo', 'gadjo', 'templates'),
139 140
)
140 141

  
141 142
STATICFILES_DIRS = (
142 143
        os.path.join(VAR_DIR, 'extra-static'),
143 144
        os.path.join(BASE_DIR, 'static'),
145
        os.path.join(BASE_DIR, 'manager', 'vendor', 'gadjo', 'gadjo', 'static'),
144 146
)
145 147

  
146 148
if os.environ.get('TEMPLATE_DIRS'):
147
-