Skip to content
Browse files

Moved ProcessManager to more sensible location.

Adjusted .gitignore to be more granular in ignoring web libs.
  • Loading branch information...
1 parent c122405 commit cb15b96de29cb2831486667d16c8d7fb49f79f95 @labisso labisso committed Feb 3, 2010
Showing with 3 additions and 16 deletions.
  1. +2 −1 .gitignore
  2. 0 web/lib/{ → python}/ProcessManager.py
  3. +1 −15 web/sbin/install-deps.sh
View
3 .gitignore
@@ -6,7 +6,8 @@ build/
dist/
autocontainer/downloads/
autocontainer/gt/
-web/lib/python/
+web/lib/python/cherrypy/
+web/lib/python/django/
web/lib/java/
web/src/env.sh
web/src/python/nimbusweb/portal/generated_secrets.py
View
0 web/lib/ProcessManager.py → web/lib/python/ProcessManager.py
File renamed without changes.
View
16 web/sbin/install-deps.sh
@@ -11,12 +11,10 @@ MARKERFILE="nimbusweb.empty.marker"
DJANGO_TARGET="$NIMBUS_WEBDIR/lib/python/django"
CHERRPY_TARGET="$NIMBUS_WEBDIR/lib/python/cherrypy"
AUTOCOMMON_JAR_TARGET="$NIMBUS_WEBDIR/lib/java"
-PROCESSMAN_TARGET="$NIMBUS_WEBDIR/lib/python/ProcessManager.py"
if [ ! -f "$DJANGO_TARGET/$MARKERFILE" ] &&
[ ! -f "$CHERRPY_TARGET/$MARKERFILE" ] &&
- [ ! -f "$AUTOCOMMON_JAR_TARGET/$MARKERFILE" ] &&
- [ -f $PROCESSMAN_TARGET ]; then # processman is only a single file
+ [ ! -f "$AUTOCOMMON_JAR_TARGET/$MARKERFILE" ]; then
#echo "debug: no marker files found"
exit 0
@@ -30,7 +28,6 @@ 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"
AUTOCOMMON_ARCHIVE="$NIMBUS_WEBDIR/lib/nimbus-autocommon.tar.gz"
-PROCESSMAN_SRCFILE="$NIMBUS_WEBDIR/lib/ProcessManager.py"
if [ -e $TMPDIR ]; then
echo "Cannot proceed, the temp directory exists: $TMPDIR"
@@ -144,17 +141,6 @@ if [ -f "$AUTOCOMMON_JAR_TARGET/$MARKERFILE" ]; then
fi
fi
-if [ ! -f $PROCESSMAN_TARGET ]; then
-
- if [ ! -f $PROCESSMAN_SRCFILE ]; then
- echo "Could not find ProcessManager source file: $PROCESSMAN_SRCFILE"
- exit 1
- fi
-
- cp $PROCESSMAN_SRCFILE $PROCESSMAN_TARGET
-
-fi
-
rm -rf $TMPDIR
if [ $? -ne 0 ]; then
echo "Could not remove temp directory: $TMPDIR"

0 comments on commit cb15b96

Please sign in to comment.
Something went wrong with that request. Please try again.