Mercurial > code > home > repos > light9

changeset 1411:0b2edd4de97a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
setup changes for laptop Ignore-this: d66248aa8e10e157409fb873479de732
author drewp@bigasterisk.com
date Fri, 10 Jun 2016 03:25:31 +0000
parents 20782112abf0
children 4916b397b5b8
files bin/homepage light9/web/index.html light9/web/lib/bower.json makefile
diffstat 4 files changed, 8 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/bin/homepage	Tue Jun 16 05:05:28 2015 +0000
+++ b/bin/homepage	Fri Jun 10 03:25:31 2016 +0000
@@ -33,4 +33,4 @@
 }
 EOF
 head -1 /tmp/light9_nginx_routes.conf
-exec nginx -c $CONF
+exec /usr/sbin/nginx -c $CONF
--- a/light9/web/index.html	Tue Jun 16 05:05:28 2015 +0000
+++ b/light9/web/index.html	Fri Jun 10 03:25:31 2016 +0000
@@ -5,6 +5,7 @@
     <meta charset="utf-8" />
     <script src="/lib/webcomponentsjs/webcomponents-lite.min.js"></script>
     <link rel="stylesheet" href="/style.css">
+    <script src="/lib/webcomponentsjs/webcomponents-lite.min.js"></script>
     <link rel="import" href="/lib/polymer/polymer.html">
   </head>
   <body>
--- a/light9/web/lib/bower.json	Tue Jun 16 05:05:28 2015 +0000
+++ b/light9/web/lib/bower.json	Fri Jun 10 03:25:31 2016 +0000
@@ -15,7 +15,8 @@
     "rdfstore": "https://github.com/antoniogarrote/rdfstore-js.git#b3f7c0c9c1da9b26261af0d4858722fa982411bb",
     "N3.js": "https://github.com/RubenVerborgh/N3.js.git#04f4e21f4ccb351587dc00a3f26340b28d4bb10f",
     "shortcut": "http://www.openjs.com/scripts/events/keyboard_shortcuts/shortcut.js",
-    "async": "https://github.com/caolan/async.git#^1.5.2"
+    "async": "https://github.com/caolan/async.git#^1.5.2",
+    "iron-resizable-behavior": "PolymerElements/iron-resizable-behavior#^1.0.3"
   },
   "resolutions": {
     "paper-styles": "^1.1.4",
--- a/makefile	Tue Jun 16 05:05:28 2015 +0000
+++ b/makefile	Fri Jun 10 03:25:31 2016 +0000
@@ -46,6 +46,9 @@
 	ln -sf $(DP)/pygst.py $(SP)/
 	ln -sf $(DP)/gst-0.10 $(SP)/
 	ln -sf $(DP)/goocanvasmodule.so $(SP)/
+	ln -sf $(DP)/cv2.x86_64-linux-gnu.so $(SP)/
+	ln -sf $(DP)/cv.py $(SP)/
+	ln -sf $(DP)/numpy $(SP)/
 
 PYTHON=/usr/bin/pypy
 PYTHON=/usr/bin/python
@@ -69,7 +72,7 @@
 	sudo aptitude install python-gi gir1.2-gst-plugins-base-1.0 libgirepository-1.0-1 gir1.2-gstreamer-1.0 gstreamer1.0-tools gstreamer1.0-plugins-good gstreamer1.0-pulseaudio 
 
 packages:
-	sudo aptitude install coffeescript freemind normalize-audio audacity python-pygoocanvas python-pygame gir1.2-goocanvas-2.0-9 libffi-dev tix libzmq3 python-dev libssl-dev
+	sudo aptitude install coffeescript freemind normalize-audio audacity python-pygoocanvas python-pygame gir1.2-goocanvas-2.0-9 libffi-dev tix libzmq3 python-dev libssl-dev python-opencv
 
 bower:
 	cd light9/web/lib; bower install