Browse files

Bug 974476 - Use templeton from pypi, move webapp under eideticker/;r…

…=davehunt
  • Loading branch information...
1 parent 89bf62c commit 8bae7617e275d5559aeedbb8ac109295739f60e4 @wlach wlach committed Feb 19, 2014
View
3 .gitmodules
@@ -7,9 +7,6 @@
[submodule "src/pageloader"]
path = src/pageloader
url = git://github.com/wlach/pageloader.git
-[submodule "src/templeton"]
- path = src/templeton
- url = git://github.com/wlach/templeton.git
[submodule "src/tests/ep1"]
path = src/tests/ep1
url = git://wrla.ch/ep1.git
View
5 bin/webapp.sh
@@ -2,8 +2,9 @@
set -e
-SERVER_DIR=$(dirname $0)/../src/webapp/server/
-cd $SERVER_DIR && ../../../bin/python server.py $1 &
+PYTHON=$PWD/$(dirname $0)/python
+SERVER_DIR=$(dirname $0)/../src/eideticker/eideticker/webapp/server/
+cd $SERVER_DIR && $PYTHON server.py $1 &
PID=$!
echo "Server running with PID $PID"
View
0 src/webapp/html/capture.html → ...icker/eideticker/webapp/html/capture.html
File renamed without changes.
View
0 src/webapp/html/css/bootstrap.min.css → ...eticker/webapp/html/css/bootstrap.min.css
File renamed without changes.
View
0 src/webapp/html/index.html → ...eticker/eideticker/webapp/html/index.html
File renamed without changes.
View
0 src/webapp/html/js/ICanHaz.min.js → .../eideticker/webapp/html/js/ICanHaz.min.js
File renamed without changes.
View
0 src/webapp/html/js/capture.js → ...cker/eideticker/webapp/html/js/capture.js
File renamed without changes.
View
0 src/webapp/html/js/eideticker.js → ...r/eideticker/webapp/html/js/eideticker.js
File renamed without changes.
View
0 src/webapp/html/js/index.js → ...ticker/eideticker/webapp/html/js/index.js
File renamed without changes.
View
0 src/webapp/html/js/spin.js → ...eticker/eideticker/webapp/html/js/spin.js
File renamed without changes.
View
2 src/webapp/server/handlers.py → ...cker/eideticker/webapp/server/handlers.py
@@ -6,7 +6,7 @@
from PIL import Image
CAPTURE_DIR = os.path.abspath(os.path.join(os.path.dirname(__file__),
- "../../../captures"))
+ "../../../../../captures"))
class CapturesHandler:
View
0 src/webapp/server/server.py → ...ticker/eideticker/webapp/server/server.py
File renamed without changes.
View
3 src/eideticker/setup.py
@@ -6,6 +6,7 @@
install_requires=[
'mozdevice>=0.31', 'mozlog>=1.5', 'mozprofile>=0.19',
'moznetwork>=0.24', 'mozhttpd>=0.7', 'BeautifulSoup',
- 'gaiatest>=0.21.7', 'httplib2', 'b2gpopulate>=0.16'])
+ 'gaiatest>=0.21.7', 'httplib2', 'b2gpopulate>=0.16',
+ 'templeton>=0.6'])
# FIXME: Compile decklink-capture script automatically
1 src/templeton
@@ -1 +0,0 @@
-Subproject commit 0d193261cd4a3df461eccf14f2799a21d83a976f

0 comments on commit 8bae761

Please sign in to comment.