heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Script and makefile adjustments for updating extlib

Browse Source
This commit is contained in:
Christopher Allan Webber 2015-02-14 11:55:43 -06:00
parent 88579e61ac
commit 572106e230
2 changed files with 49 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Makefile.in
View File

@ -80,7 +80,7 @@ endif
.PHONY: all install uninstall distclean info install-html html \ .PHONY: all install uninstall distclean info install-html html \
install-pdf pdf install-dvi dvi install-ps ps clean dist check \ install-pdf pdf install-dvi dvi install-ps ps clean dist check \
installdirs i18n virtualenv docs installdirs i18n virtualenv docs extlib
# update postgresql # update postgresql
@ -93,6 +93,11 @@ else
cd docs && make html cd docs && make html
endif endif
# In the future we may provide more options than just npm/bower here
# eg, we may support guix updating.
extlib:
./devtools/update_extlib.sh
develop: $(maybe_venv_dep) i18n mediagoblin.ini develop: $(maybe_venv_dep) i18n mediagoblin.ini
# NEVER clobber a user's mediagoblin.ini once they've defined it # NEVER clobber a user's mediagoblin.ini once they've defined it
@ -116,7 +121,7 @@ ifneq ($(VIRTUALENV),no)
virtualenv --system-site-packages --python=$(PYTHON) . virtualenv --system-site-packages --python=$(PYTHON) .
./bin/python setup.py develop --upgrade ./bin/python setup.py develop --upgrade
virtualenv: bin/python virtualenv: bin/python extlib
clean-virtualenv: clean-virtualenv:
rm -rf ./bin/ rm -rf ./bin/
@ -164,7 +169,7 @@ distclean: $(maybe_venv_clean)
# You can either use the setup.py sdist command or you can roll your own here # You can either use the setup.py sdist command or you can roll your own here
dist: dist: extlib
# $(maybe_venved_python) setup.py sdist # $(maybe_venved_python) setup.py sdist
mkdir $(PACKAGE_DISTNAME) mkdir $(PACKAGE_DISTNAME)
cp -r $(DISTFILES) $(PACKAGE_DISTNAME) cp -r $(DISTFILES) $(PACKAGE_DISTNAME)

41
devtools/update_extlib.sh Executable file
View File

@ -0,0 +1,41 @@
#!/bin/bash
# GNU MediaGoblin -- federated, autonomous media hosting
# Copyright (C) 2015 GNU MediaGoblin Contributors. See AUTHORS.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
set -e
# Make sure we have npm available
if ! which npm > /dev/null; then
echo "Can't find npm, no way to install extlib :(";
exit 1;
fi
# Install bower if need be
if which bower > /dev/null; then
BOWER=`which bower`;
elif [ -f ./node_modules/.bin/bower ]; then
BOWER="./node_modules/.bin/bower";
else
echo "Bower not found, installing via npm!";
npm install bower;
BOWER="./node_modules/.bin/bower";
fi
# Do package/file installs
$BOWER install