[sagenb] 06/14: Build minified JS

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch master
in repository sagenb.

commit a9357e712d231fea054e969201398ea4bf8223fc
Author: Ximin Luo <infinity0 at pwned.gg>
Date:   Fri Dec 2 21:36:37 2016 +0100

    Build minified JS
---
 debian/control                    |  3 ++-
 debian/patches/fix-bullshit.patch | 12 ++++++++++++
 debian/patches/series             |  1 +
 debian/rules                      | 15 ++++++++++++++-
 4 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index ce3dfc6..26c9ac1 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,8 @@ Build-Depends: debhelper (>= 10),
  python-flask,
  python-babel,
  python-flask-oldsessions,
- ruby-compass
+ ruby-compass,
+ uglifyjs
 Standards-Version: 3.9.7
 
 Package: python-sagenb
diff --git a/debian/patches/fix-bullshit.patch b/debian/patches/fix-bullshit.patch
new file mode 100644
index 0000000..f53fb81
--- /dev/null
+++ b/debian/patches/fix-bullshit.patch
@@ -0,0 +1,12 @@
+--- a/sagenb/data/graph_editor/processing.editor.js
++++ b/sagenb/data/graph_editor/processing.editor.js
+@@ -432,7 +432,8 @@
+         img.data[pos + 2] = parseInt(c[2]);
+         img.data[pos + 3] = parseFloat(c[3]) * 100;
+       }
+-      var canvas = document.createElement("canvas") canvas.width = img.width;
++      var canvas = document.createElement("canvas");
++      canvas.width = img.width;
+       canvas.height = img.height;
+       var context = canvas.getContext("2d");
+       context.putImageData(img, 0, 0);
diff --git a/debian/patches/series b/debian/patches/series
index f0f8142..1671a3d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ update-codemirror-version.patch
 switch-system-jquery-vanderlee-colorpicker.patch
 disable-bgiframe.patch
 disable-farbtastic-jpicker.patch
+fix-bullshit.patch
diff --git a/debian/rules b/debian/rules
index 77ddef2..4f7e429 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,10 +2,22 @@
 
 export PYBUILD_NAME=sagenb
 
+MIN_JS = \
+ sagenb/data/graph_editor/processing.editor.min.js \
+ sagenb/data/graph_editor/processing.min.js \
+# not following naming convention, but it's unused so just ignore it
+# sagenb/data/jquery/plugins/achtung/ui.achtung-min.js \
+ sagenb/data/jquery/plugins/achtung/ui.achtung-mod.min.js \
+ sagenb/data/jquery/plugins/extendedclick/jquery.event.extendedclick.min.js \
+ sagenb/data/openid-realselector/js/jquery.openid.min.js \
+
 %:
 	dh "$@" --with python2 --buildsystem=pybuild
 
-override_dh_auto_build:
+%.min.js: %.js
+	uglifyjs < "$<" > "$@"
+
+override_dh_auto_build: $(MIN_JS)
 	cd sagenb/data/sage3d && ant \
 	  -lib /usr/share/java/j3dcore.jar \
 	  -lib /usr/share/java/vecmath.jar \
@@ -21,3 +33,4 @@ override_dh_auto_clean:
 	dh_auto_clean
 	cd sass && compass clean
 	rm -rf sagenb/data/sage3d/build sagenb/data/sage3d/lib
+	rm -rf $(MIN_JS)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/sagenb.git