From 13872fa36e56eb90c16c7d8abfbfdec814501276 Mon Sep 17 00:00:00 2001 From: ziirish Date: Sat, 28 Nov 2015 10:51:15 +0100 Subject: [PATCH] use submodules so we don't rely on bower for builts anymore --- .bowerrc | 4 ---- .gitignore | 1 - .gitmodules | 3 +++ bower.json | 37 ------------------------------------- burpui/static/vendor | 1 + setup.py | 5 ----- 6 files changed, 4 insertions(+), 47 deletions(-) delete mode 100644 .bowerrc create mode 100644 .gitmodules delete mode 100644 bower.json create mode 160000 burpui/static/vendor diff --git a/.bowerrc b/.bowerrc deleted file mode 100644 index 3b657a79..00000000 --- a/.bowerrc +++ /dev/null @@ -1,4 +0,0 @@ -{ - "directory": "burpui/static/vendor/", - "allow_root": true -} diff --git a/.gitignore b/.gitignore index 0f307bfa..f72a8e6f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,5 @@ *.pyc *.swp -burpui/static/vendor burpui-dev.cfg burpui/RELEASE devel.sh diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 00000000..c66715c2 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "burpui/static/vendor"] + path = burpui/static/vendor + url = https://git.ziirish.me/ziirish/burp-ui-externals.git diff --git a/bower.json b/bower.json deleted file mode 100644 index 1241242a..00000000 --- a/bower.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "name": "burp-ui", - "authors": [ - "ziirish " - ], - "repository": { - "type": "git", - "url": "https://git.ziirish.me/ziirish/burp-ui.git" - }, - "description": "Burp-UI is a web-ui for burp backup written in python with Flask and jQuery/Bootstrap", - "license": "BSD", - "homepage": "https://git.ziirish.me/ziirish/burp-ui", - "private": true, - "dependencies": { - "jquery-file-download": "~1.4.4", - "datatables-responsive": "~1.0.7", - "jquery-ui": "jqueryui#~1.11.4", - "angular-bootstrap-switch": "~0.4.1", - "angular-onbeforeunload": "~0.1.7", - "angular-strap": "~2.3.3", - "ui-select": "angular-ui-select#~0.13.2", - "jquery.fancytree": "fancytree#~2.12.0", - "d3": "~3.5.6", - "nvd3": "~1.8.1", - "lodash": "~2.4.2", - "typeahead.js": "~0.11.1", - "bootswatch": "~3.3.5", - "angular-resource": "~1.4.7", - "angular-sanitize": "~1.4.7", - "angular-animate": "~1.4.7", - "angular-route": "~1.4.7", - "bootstrap-switch": "~3.3.2" - }, - "resolutions": { - "angular": "~1.4.0" - } -} diff --git a/burpui/static/vendor b/burpui/static/vendor new file mode 160000 index 00000000..bc4c064c --- /dev/null +++ b/burpui/static/vendor @@ -0,0 +1 @@ +Subproject commit bc4c064cbdeea4946cf0e1c976d14a823584522a diff --git a/setup.py b/setup.py index 2284b50b..47cfb345 100755 --- a/setup.py +++ b/setup.py @@ -83,11 +83,6 @@ class BuildStatic(Command): pass except: pass - log.info("running [bower install]") - try: - check_output(['bower', 'install']) - except Exception as e: - log.warn('Bower error: {}'.format(str(e))) # Not sure bower was a great idea... keep = [ 'burpui/static/vendor/bootswatch/slate/bootstrap.min.css',