Mercurial Mercurial > bubbletv / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with 5e1d7f77f3551ba422a171148a8b8db7d9797ac0
authorymh <ymh.work@gmail.com>
Tue, 21 Feb 2012 22:47:19 +0100
changeset 31 7b76d97e3051
parent 30 80040858c006 (diff)
parent 27 5e1d7f77f355 (current diff)
child 32 1e47b1f9f42d
Merge with 5e1d7f77f3551ba422a171148a8b8db7d9797ac0
client/js/tweetanim.js file | annotate | diff | comparison | revisions 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sbin/sync/sync_client	Tue Feb 21 22:47:19 2012 +0100
@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+set -e
+if [ -d ~/tmp/bubbletv_$1 ]; then
+    rm -fr ~/tmp/bubbletv_$1;
+fi
+
+hg archive -r $1 ~/tmp/bubbletv_$1 -X ".hg*"
+
+if [ -d ~/tmp/bubbletv_$1 ]; then
+    cat <<EOT | rsync -Cvrlz --delete --filter=". -" ~/tmp/bubbletv_$1/client/ iri@ftv.iri-research.org:/srv/www/bubbletv
++ core
+EOT
+fi
+
+if [ -d ~/tmp/bubbletv_$1 ]; then
+    echo "Deleting temp export"
+    rm -fr ~/tmp/bubbletv_$1;
+fi
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sbin/sync/sync_server	Tue Feb 21 22:47:19 2012 +0100
@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+set -e
+if [ -d ~/tmp/bubbletv_$1 ]; then
+    rm -fr ~/tmp/bubbletv_$1;
+fi
+
+hg archive -r $1 ~/tmp/bubbletv_$1 -X ".hg*"
+
+if [ -d ~/tmp/bubbletv_$1 ]; then
+    cat <<EOT | rsync -Cvrlz --delete --filter=". -" ~/tmp/bubbletv_$1/server/web/ iri@ftv.iri-research.org:/srv/wsgi/bubbletv
++ core
+P instance/settings.cfg
+EOT
+fi
+
+if [ -d ~/tmp/bubbletv_$1 ]; then
+    echo "Deleting temp export"
+    rm -fr ~/tmp/bubbletv_$1;
+fi
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sbin/sync/sync_server_venv	Tue Feb 21 22:47:19 2012 +0100
@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+set -e
+if [ -d ~/tmp/bubbletv_$1 ]; then
+    rm -fr ~/tmp/bubbletv_$1;
+fi
+
+hg archive -r $1 ~/tmp/bubbletv_$1 -X ".hg*"
+
+if [ -d ~/tmp/bubbletv_$1 ]; then
+    cat <<EOT | rsync -Cvrlz --delete --filter=". -" ~/tmp/bubbletv_$1/server/virtualenv/ ftv.iri-research.org:project/bubbletv/virtualenv
++ core
+EOT
+fi
+
+if [ -d ~/tmp/bubbletv_$1 ]; then
+    echo "Deleting temp export"
+    rm -fr ~/tmp/bubbletv_$1;
+fi
--- a/server/virtualenv/res/lib/lib_create_env.py	Tue Feb 21 21:28:56 2012 +0100
+++ b/server/virtualenv/res/lib/lib_create_env.py	Tue Feb 21 22:47:19 2012 +0100
@@ -23,7 +23,8 @@
     'WERKZEUG' : { 'setup': 'werkzeug', 'url':'http://pypi.python.org/packages/source/W/Werkzeug/Werkzeug-0.8.1.tar.gz','local':'Werkzeug-0.8.1.tar.gz'},
     'JINJA2' : { 'setup': 'jinja2', 'url':'http://pypi.python.org/packages/source/J/Jinja2/Jinja2-2.6.tar.gz','local':'Jinja2-2.6.tar.gz'},
     'PYTZ' : { 'setup':'pytz', 'url': 'http://pypi.python.org/packages/source/p/pytz/pytz-2011n.tar.bz2', 'local': 'pytz-2011n.tar.bz2'},
-    'RFC3339' : { 'setup':'pyRFC3339', 'url': 'http://pypi.python.org/packages/source/p/pyRFC3339/pyRFC3339-0.1.tar.gz', 'local': 'pyRFC3339-0.1.tar.gz'},    
+    'RFC3339' : { 'setup':'pyRFC3339', 'url': 'http://pypi.python.org/packages/source/p/pyRFC3339/pyRFC3339-0.1.tar.gz', 'local': 'pyRFC3339-0.1.tar.gz'},
+    'IRI_TWEET' : { 'setup':'iri_tweet', 'url': 'iri_tweet.tar.gz', 'local': 'iri_tweet.tar.gz'},    
 }
 
 if system_str == 'Windows':
@@ -218,9 +219,9 @@
         logger.notify("Install %s from %s with %s" % (key,res_env.URLS[key][res_source_key],method))
         if method == 'pip':
             if sys.platform == 'win32':
-                args = [os.path.abspath(os.path.join(home_dir, 'Scripts', 'pip')), 'install', '-E', os.path.abspath(home_dir), res_env.URLS[key][res_source_key]]
+                args = [os.path.abspath(os.path.join(home_dir, 'Scripts', 'pip')), 'install', res_env.URLS[key][res_source_key]]
             else:
-                args = [os.path.abspath(os.path.join(home_dir, 'bin', 'pip')), 'install', '-E', os.path.abspath(home_dir), res_env.URLS[key][res_source_key]]
+                args = [os.path.abspath(os.path.join(home_dir, 'bin', 'pip')), 'install', res_env.URLS[key][res_source_key]]
             if option_str :
                 args.insert(4,option_str)
             call_subprocess(args,
Binary file server/virtualenv/res/src/iri_tweet.tar.gz has changed
--- a/server/virtualenv/web/res/res_create_env.py	Tue Feb 21 21:28:56 2012 +0100
+++ b/server/virtualenv/web/res/res_create_env.py	Tue Feb 21 22:47:19 2012 +0100
@@ -29,6 +29,7 @@
     ('ANYJSON', 'pip', None, None),
     ('PYTZ', 'pip', None, None),
     ('RFC3339', 'pip', None, None),
+    ('IRI_TWEET', 'pip', None, None),
 ])
bubbletv