light9 Changeset - 0b2edd4de97a

Changeset - 0b2edd4de97a

Parent rev.

Child rev.

[Not reviewed]

default

0 4 0

drewp@bigasterisk.com - 9 years ago 2016-06-10 03:25:31
drewp@bigasterisk.com

setup changes for laptop
Ignore-this: d66248aa8e10e157409fb873479de732

4 files changed with 8 insertions and 3 deletions:

bin/homepage

light9/web/index.html

light9/web/lib/bower.json

makefile

0 comments (0 inline, 0 general)

bin/homepage

➞

Show inline comments

@@ @@ -24,13 +24,13 @@ http { @@
   access_log off;
   include "/tmp/light9_nginx_routes.conf";
   location / {
     root $ROOT/light9/web;
+  }
+ }
+}
 EOF
 head -1 /tmp/light9_nginx_routes.conf
 exec nginx -c $CONF
+exec /usr/sbin/nginx -c $CONF

light9/web/index.html

➞

Show inline comments

 <!doctype html>
 <html>
   <head>
     <title></title>
     <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>
     <dom-module id="service-button-row">
       <template>
         <style>
          div {
              display: flex;
              justify-content: space-between;
              padding: 2px 3px;
+         }
          div:hover {

light9/web/lib/bower.json

➞

Show inline comments

@@ @@ -6,20 +6,21 @@ @@
     "iron-ajax": "PolymerElements/iron-ajax#~1.2.0",
     "jquery": "~2.2.4",
     "underscore": "~1.8.3",
     "jquery-ui": "~1.11.4",
     "QueryString": "http://unixpapa.com/js/QueryString.js",
     "knockout": "knockoutjs#^3.4.0",
     "sylvester": "~0.1.3",
     "d3": "https://github.com/d3/d3.git#e7194db33090a0afc06c77a959594361ffb949df",
     "rdflib.js": "https://github.com/linkeddata/rdflib.js.git#920e59fe37",
     "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",
     "rdflib.js": "920e59fe37",
     "d3": "e7194db33090a0afc06c77a959594361ffb949df"
+  }
+}

makefile

➞

Show inline comments

@@ @@ -37,48 +37,51 @@ link_to_sys_packages: @@
 	# http://stackoverflow.com/questions/249283/virtualenv-on-ubuntu-with-no-site-packages
 	ln -sf $(DP)/glib $(SP)/
 	ln -sf $(DP)/gi $(SP)/
 	ln -sf $(DP)/gobject $(SP)/
 	ln -sf $(DP)/cairo $(SP)/
 	ln -sf $(DP)/gtk-2.0 $(SP)/
 	ln -sf $(DP)/pygtk.py $(SP)/
 	ln -sf $(DP)/pygtk.pth $(SP)/
 	ln -sf $(DP)/pygst.pth $(SP)/
 	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
 create_virtualenv:
 	mkdir -p env
 	virtualenv -p $(PYTHON) env
 	env/bin/pip install -U pip
 	ln -sf ../env/bin/python bin/python
 tkdnd_build:
 	# get tkdnd r95 with subversion
 	# then apply tkdnd-patch-on-r95 to that
 	cd tkdnd/trunk
 	./configure
 	make
 bin/ascoltami2: gst_packages link_to_sys_packages
 gst_packages:
 	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
 	cd light9/web/lib/N3.js; npm install; npm run browser
 	cd light9/web/lib/d3; npm install
 raspberry_pi_virtualenv:
 	mkdir -p env_pi
 	virtualenv --system-site-packages env_pi
 raspberry_pi_packages:
 	sudo apt-get install python-picamera python-dev python-twisted python-virtualenv

0 comments (0 inline, 0 general)