Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] Remove globals from api loader #956

Closed
wants to merge 1 commit into from
Closed

[WIP] Remove globals from api loader #956

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 2 additions & 24 deletions buildout.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@ parts = eggs
doc
node-modules
lessc
ol3-install
ol3-serverconfig
develop = .
index = http://pypi.camptocamp.net/pypi
allow-hosts = pypi.camptocamp.net
Expand Down Expand Up @@ -228,43 +226,23 @@ on_update = true
cmds =
node_modules/.bin/lessc -ru --clean-css chsdi/static/less/extended.less chsdi/static/css/extended.min.css

[ol3-install]
[ol3-update]
recipe = collective.recipe.cmd
on_install = true
on_update = true
cmds =
if ! [ -d chsdi/static/js/ol3 ];
then
cd ${buildout:directory}/chsdi/static/js/ && git clone https://github.com/geoadmin/ol3.git
cd ol3 && npm install && API_URL=${vars:api_url} ${buildout:bin-directory}/python build-ga.py
cd ${buildout:directory}
fi

[ol3-serverconfig]
recipe = collective.recipe.cmd
on_install = true
on_update = true
cmds =
if [ -d chsdi/static/js/ol3 ];
then
cd ${buildout:directory}/chsdi/static/js/ol3
rm -f ${buildout:directory}/chsdi/static/js/serverconfig*.js &&
API_URL=${vars:api_url} ${buildout:bin-directory}/python build-ga.py build/serverconfig &&
cp ${buildout:directory}/chsdi/static/js/ol3/build/*config*.js ${buildout:directory}/chsdi/static/js/ &&
cd ${buildout:directory}
fi

[ol3-update]
recipe = collective.recipe.cmd
on_install = true
on_update = true
cmds =
cd ${buildout:directory}/chsdi/static/js/ol3
git pull origin master
rm -f ${buildout:directory}/chsdi/static/js/ol3/build/ga.css &&
rm -f ${buildout:directory}/chsdi/static/js/ol3/build/ol.css &&
rm -f ${buildout:directory}/chsdi/static/js/ol3/build/ga*.js &&
rm -f ${buildout:directory}/chsdi/static/js/ol3/build/marker.png &&
npm install &&
API_URL=${vars:api_url} ${buildout:bin-directory}/python build-ga.py &&
cp ${buildout:directory}/chsdi/static/js/ol3/build/ga.css ${buildout:directory}/chsdi/static/css/ &&
cp ${buildout:directory}/chsdi/static/js/ol3/build/ol.css ${buildout:directory}/chsdi/static/css/ &&
Expand Down
2 changes: 0 additions & 2 deletions buildout_cleaner.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,5 @@ parts -= activate
doc
node-modules
lessc
ol3-install
ol3-serverconfig
extensions += buildout.eggscleaner
old-eggs-directory = buildout/old-eggs
Loading