[Python-modules-commits] r27106 - in packages/ipython/trunk/debian (3 files)

[jtaylor-guest at users.alioth.debian.org]

    Date: Tuesday, January 7, 2014 @ 21:56:53
  Author: jtaylor-guest
Revision: 27106

build and install bootstrap from source

Modified:
  packages/ipython/trunk/debian/control
  packages/ipython/trunk/debian/patches/packaged-lessc.patch
  packages/ipython/trunk/debian/rules

Modified: packages/ipython/trunk/debian/control
===================================================================
--- packages/ipython/trunk/debian/control	2014-01-07 21:56:51 UTC (rev 27105)
+++ packages/ipython/trunk/debian/control	2014-01-07 21:56:53 UTC (rev 27106)
@@ -12,6 +12,7 @@
                      libjs-highlight,
                      libjs-jquery-ui,
                      libjs-marked,
+                     node-uglify,
                      node-less,
                      python-all (>= 2.6.6-3~),
                      python-argparse,

Modified: packages/ipython/trunk/debian/patches/packaged-lessc.patch
===================================================================
--- packages/ipython/trunk/debian/patches/packaged-lessc.patch	2014-01-07 21:56:51 UTC (rev 27105)
+++ packages/ipython/trunk/debian/patches/packaged-lessc.patch	2014-01-07 21:56:53 UTC (rev 27106)
@@ -1,4 +1,4 @@
-Description: use packaged lessc compiler
+Description: use packaged lessc compiler and uglifyjs
 --- a/IPython/html/fabfile.py
 +++ b/IPython/html/fabfile.py
 @@ -27,7 +27,7 @@ def _compile_less(source, target, minify
@@ -10,3 +10,14 @@
      with lcd(static_dir):
          local('{lessc} {min_flag} {ver_flag} {source} {target}'.format(**locals()))
  
+--- a/IPython/html/static/components/bootstrap/Makefile
++++ b/IPython/html/static/components/bootstrap/Makefile
+@@ -73,7 +73,7 @@ bootstrap-js: bootstrap/js/*.js
+ bootstrap/js/*.js: js/*.js
+ 	mkdir -p bootstrap/js
+ 	cat js/bootstrap-transition.js js/bootstrap-alert.js js/bootstrap-button.js js/bootstrap-carousel.js js/bootstrap-collapse.js js/bootstrap-dropdown.js js/bootstrap-modal.js js/bootstrap-tooltip.js js/bootstrap-popover.js js/bootstrap-scrollspy.js js/bootstrap-tab.js js/bootstrap-typeahead.js js/bootstrap-affix.js > bootstrap/js/bootstrap.js
+-	./node_modules/.bin/uglifyjs -nc bootstrap/js/bootstrap.js > bootstrap/js/bootstrap.min.tmp.js
++	uglifyjs -nc bootstrap/js/bootstrap.js > bootstrap/js/bootstrap.min.tmp.js
+ 	echo "/*!\n* Bootstrap.js by @fat & @mdo\n* Copyright 2012 Twitter, Inc.\n* http://www.apache.org/licenses/LICENSE-2.0.txt\n*/" > bootstrap/js/copyright.js
+ 	cat bootstrap/js/copyright.js bootstrap/js/bootstrap.min.tmp.js > bootstrap/js/bootstrap.min.js
+ 	rm bootstrap/js/copyright.js bootstrap/js/bootstrap.min.tmp.js

Modified: packages/ipython/trunk/debian/rules
===================================================================
--- packages/ipython/trunk/debian/rules	2014-01-07 21:56:51 UTC (rev 27105)
+++ packages/ipython/trunk/debian/rules	2014-01-07 21:56:53 UTC (rev 27106)
@@ -91,6 +91,15 @@
 
 	rm -rf $(NB)/components/codemirror/bin/
 
+	rm -rf $(NB)/components/bootstrap/
+	make -C IPython/html/static/components/bootstrap/ clean
+	make -C IPython/html/static/components/bootstrap/ bootstrap-img
+	make -C IPython/html/static/components/bootstrap/ bootstrap-js
+	# no bootstrap-css, recess used by makefile is broken #734505
+	mkdir -p $(NB)/components/bootstrap/bootstrap/css/
+	lessc  IPython/html/static/components/bootstrap/less/bootstrap.less > $(NB)/components/bootstrap/bootstrap/css/bootstrap.min.css
+	cp -r IPython/html/static/components/bootstrap/bootstrap/ $(NB)/components/bootstrap/
+
 	mkdir -p debian/ipython3/usr/share/applications/
 	sed -e "s/ipython/ipython3/" -e "s/IPython/IPython3/" \
 	    examples/core/ipython.desktop > debian/ipython3/usr/share/applications/ipython3.desktop