Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Added httplib2 dependency to web/lib/ and scripts.

  • Loading branch information...
commit c4cd294d0dc9e4e976da1d4c2b8669642e4abcdf 1 parent ebf669e
@labisso labisso authored
View
1  .gitignore
@@ -10,6 +10,7 @@ autocontainer/gt/
web/lib/java/
web/lib/python/cherrypy/
web/lib/python/django/
+web/lib/python/httplib2/
web/src/env.sh
web/src/python/nimbusweb/portal/generated_secrets.py
web/src/python/nimbusweb/portal/generated_settings.py
View
BIN  web/lib/httplib2-0.6.0.tar.gz
Binary file not shown
View
0  web/lib/python/httplib2/nimbusweb.empty.marker
No changes.
View
22 web/sbin/clean-slate.sh
@@ -9,6 +9,7 @@ export PYTHONPATH
MARKERFILE="nimbusweb.empty.marker"
DJANGO_TARGET="$NIMBUS_WEBDIR/lib/python/django"
CHERRPY_TARGET="$NIMBUS_WEBDIR/lib/python/cherrypy"
+HTTPLIB2_TARGET="$NIMBUS_WEBDIR/lib/python/httplib2"
AUTOCOMMON_JAR_TARGET="$NIMBUS_WEBDIR/lib/java"
# ------------------------------------------------------------------------------
@@ -49,6 +50,7 @@ echo -e "\nCreating a clean slate...\n"
MARKERFILE="nimbusweb.empty.marker"
DJANGO_TARGET="$NIMBUS_WEBDIR/lib/python/django"
CHERRPY_TARGET="$NIMBUS_WEBDIR/lib/python/cherrypy"
+HTTPLIB2_TARGET="$NIMBUS_WEBDIR/lib/python/httplib2"
AUTOCOMMON_JAR_TARGET="$NIMBUS_WEBDIR/lib/java"
# ------------------------------------------------------------------------------
@@ -93,6 +95,26 @@ fi
# ------------------------------------------------------------------------------
+echo "Wiping httplib2..."
+rm -rf $HTTPLIB2_TARGET
+if [ $? -ne 0 ]; then
+ echo "Could not remove httplib2, exiting."
+ exit 1
+fi
+
+mkdir $HTTPLIB2_TARGET
+if [ $? -ne 0 ]; then
+ echo "Could not make a clean httplib2 dir, exiting."
+ exit 1
+fi
+touch $HTTPLIB2_TARGET/$MARKERFILE
+if [ $? -ne 0 ]; then
+ echo "Could not make a clean httplib2 dir, exiting."
+ exit 1
+fi
+
+# ------------------------------------------------------------------------------
+
echo "Wiping autocommon..."
rm -rf $AUTOCOMMON_JAR_TARGET
if [ $? -ne 0 ]; then
View
35 web/sbin/install-deps.sh
@@ -10,10 +10,12 @@ NIMBUS_WEBDIR=`cd $NIMBUS_WEBDIR_REL; pwd`
MARKERFILE="nimbusweb.empty.marker"
DJANGO_TARGET="$NIMBUS_WEBDIR/lib/python/django"
CHERRPY_TARGET="$NIMBUS_WEBDIR/lib/python/cherrypy"
+HTTPLIB2_TARGET="$NIMBUS_WEBDIR/lib/python/httplib2"
AUTOCOMMON_JAR_TARGET="$NIMBUS_WEBDIR/lib/java"
if [ ! -f "$DJANGO_TARGET/$MARKERFILE" ] &&
[ ! -f "$CHERRPY_TARGET/$MARKERFILE" ] &&
+ [ ! -f "$HTTPLIB2_TARGET/$MARKERFILE" ] &&
[ ! -f "$AUTOCOMMON_JAR_TARGET/$MARKERFILE" ]; then
#echo "debug: no marker files found"
@@ -27,6 +29,7 @@ TMPDIR="$NIMBUS_WEBDIR/var/tmplibdir"
DJANGO_ARCHIVE="$NIMBUS_WEBDIR/lib/Django-1.1.1.tar.gz"
CHERRPY_ARCHIVE="$NIMBUS_WEBDIR/lib/CherryPy-3.1.2.tar.gz"
+HTTPLIB2_ARCHIVE="$NIMBUS_WEBDIR/lib/httplib2-0.6.0.tar.gz"
AUTOCOMMON_ARCHIVE="$NIMBUS_WEBDIR/lib/nimbus-autocommon.tar.gz"
if [ -e $TMPDIR ]; then
@@ -104,6 +107,38 @@ if [ -f "$CHERRPY_TARGET/$MARKERFILE" ]; then
fi
fi
+if [ -f "$HTTPLIB2_TARGET/$MARKERFILE" ]; then
+
+ if [ ! -f $HTTPLIB2_ARCHIVE ]; then
+ echo "Could not find httplib2 archive: $HTTPLIB2_ARCHIVE"
+ exit 1
+ fi
+
+ mkdir $TMPDIR/httplib2
+ if [ $? -ne 0 ]; then
+ echo "Could not create temp directory: $TMPDIR/httplib2"
+ exit 1
+ fi
+
+ tar xzf $HTTPLIB2_ARCHIVE -C $TMPDIR/httplib2
+ if [ ! -e $TMPDIR/httplib2/httplib2-0.6.0/python2/httplib2 ]; then
+ echo "Could not find the expanded httplib2 lib"
+ exit 1
+ fi
+
+ mv $TMPDIR/httplib2/httplib2-0.6.0/python2/httplib2/* $HTTPLIB2_TARGET/
+ if [ $? -ne 0 ]; then
+ echo "Could not install the expanded httplib2 lib"
+ exit 1
+ fi
+
+ rm $HTTPLIB2_TARGET/$MARKERFILE
+ if [ $? -ne 0 ]; then
+ echo "Could not remove $HTTPLIB2_TARGET/$MARKERFILE"
+ exit 1
+ fi
+fi
+
if [ -f "$AUTOCOMMON_JAR_TARGET/$MARKERFILE" ]; then
if [ ! -f $AUTOCOMMON_ARCHIVE ]; then
Please sign in to comment.
Something went wrong with that request. Please try again.