Return-Path: 
 <commits-return-1247-apmail-gump-commits-archive=www.apache.org@gump.apache.org>
Delivered-To: apmail-gump-commits-archive@www.apache.org
Received: (qmail 69478 invoked from network); 5 Apr 2005 22:35:29 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 5 Apr 2005 22:35:29 -0000
Received: (qmail 29119 invoked by uid 500); 5 Apr 2005 22:35:29 -0000
Mailing-List: contact commits-help@gump.apache.org; run by ezmlm
Precedence: bulk
Reply-To: commits@gump.apache.org
List-Help: <mailto:commits-help@gump.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@gump.apache.org>
List-Post: <mailto:commits@gump.apache.org>
List-Id: <commits.gump.apache.org>
Delivered-To: mailing list commits@gump.apache.org
Received: (qmail 29091 invoked by uid 99); 5 Apr 2005 22:35:28 -0000
X-ASF-Spam-Status: No, hits=-9.8 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from minotaur.apache.org (HELO minotaur.apache.org)
 (209.237.227.194)
  by apache.org (qpsmtpd/0.28) with SMTP; Tue, 05 Apr 2005 15:35:27 -0700
Received: (qmail 69448 invoked by uid 65534); 5 Apr 2005 22:35:26 -0000
Message-ID: <20050405223526.69446.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Mailer: svnmailer-1.0.0-dev
Date: Tue, 05 Apr 2005 22:35:26 -0000
Subject: svn commit: r160235 - in gump/branches/Gump3: bin/PrintPath
 giraffe-settings.sh gump pygump/main.py pygump/python/gump/util/sysinfo.py
To: commits@gump.apache.org
From: leosimons@apache.org
X-Virus-Checked: Checked
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: leosimons
Date: Tue Apr  5 15:35:22 2005
New Revision: 160235

URL: http://svn.apache.org/viewcvs?view=3Drev&rev=3D160235
Log:
Make help|run|test targets work under windows w/ cygwin. See http://wiki.ap=
ache.org/gump/ for details. Basically, we needed to edit the shell scripts =
to know about cygwin and the required path munging. Also, some posix featur=
es obviously aren't available, so we need those disabled on windows.

Modified:
    gump/branches/Gump3/bin/PrintPath
    gump/branches/Gump3/giraffe-settings.sh
    gump/branches/Gump3/gump
    gump/branches/Gump3/pygump/main.py
    gump/branches/Gump3/pygump/python/gump/util/sysinfo.py

Modified: gump/branches/Gump3/bin/PrintPath
URL: http://svn.apache.org/viewcvs/gump/branches/Gump3/bin/PrintPath?view=
=3Ddiff&r1=3D160234&r2=3D160235
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- gump/branches/Gump3/bin/PrintPath (original)
+++ gump/branches/Gump3/bin/PrintPath Tue Apr  5 15:35:22 2005
@@ -31,6 +31,28 @@
 #
 # This version found in Apache Portable Runtime CVS under "build"
=20
+
+##
+# Hack to have at least some support for cygwin...
+##
+cygwin=3Dfalse;
+case "`uname`" in
+  CYGWIN*) cygwin=3Dtrue ;;
+esac
+
+if $cygwin; then
+  for args in $*; do
+    case $args in
+	-s) echo=3D"no";;
+	-p*) pathname=3D"" ;;
+	*) programs=3D"$programs $args" ;;
+    esac
+  done
+  echo `which $programs 2>/dev/null`
+  exit 0
+fi
+
+
 ##
 # Some "constants"
 ##

Modified: gump/branches/Gump3/giraffe-settings.sh
URL: http://svn.apache.org/viewcvs/gump/branches/Gump3/giraffe-settings.sh?=
view=3Ddiff&r1=3D160234&r2=3D160235
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- gump/branches/Gump3/giraffe-settings.sh (original)
+++ gump/branches/Gump3/giraffe-settings.sh Tue Apr  5 15:35:22 2005
@@ -1 +1,10 @@
-export JAVA_HOME=3D/usr/lib/j2se/1.4
+case "`uname`" in
+  CYGWIN*) cygwin=3Dtrue ;;
+esac
+
+if $cygwin; then
+  export JAVA_HOME=3D/cygdrive/c/j2sdk1.4.2_08
+else
+  export JAVA_HOME=3D/usr/lib/j2se/1.4
+fi
+

Modified: gump/branches/Gump3/gump
URL: http://svn.apache.org/viewcvs/gump/branches/Gump3/gump?view=3Ddiff&r1=
=3D160234&r2=3D160235
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- gump/branches/Gump3/gump (original)
+++ gump/branches/Gump3/gump Tue Apr  5 15:35:22 2005
@@ -289,6 +289,18 @@
   export GUMP_ENV_FILE=3D"$GUMP_HOME/$GUMP_HOSTNAME-settings.sh"
 }
=20
+# Determine whether we're running under cygwin
+function find_cygwin
+{
+  local cygwin=3Dfalse
+  case "`uname`" in
+    CYGWIN*) cygwin=3Dtrue ;;
+  esac
+  if $cygwin; then
+    export GUMP_CYGWIN=3Dtrue
+  fi
+}
+
 # Determine the python command to use
 function find_python
 {
@@ -296,18 +308,18 @@
     return
   fi
=20
-  local python=3D`which python2.4`
+  local python=3D`which python2.4 2>/dev/null`
   if [[ -z "$python" || "$python" =3D=3D "no"* ]]; then
-    python=3D`which python2.3`
+    python=3D`which python2.3 2>/dev/null`
   fi
   if [[ -z "$python" || "$python" =3D=3D "no"* ]]; then
-    python=3D`which python2.2`
+    python=3D`which python2.2 2>/dev/null`
   fi
   if [[ -z "$python" || "$python" =3D=3D "no"* ]]; then
-    python=3D`which python2`
+    python=3D`which python2 2>/dev/null`
   fi
   if [[ -z "$python" || "$python" =3D=3D "no"* ]]; then
-    python=3D`which python`
+    python=3D`which python 2>/dev/null`
   fi
   if [[ -z "$python" || "$python" =3D=3D "no"* ]]; then
     python=3D"python" # hope for the best...
@@ -327,7 +339,9 @@
   if [[ -f "$GUMP_ENV_FILE" ]]; then
     . "$GUMP_ENV_FILE"
   fi
- =20
+
+
+  find_cygwin
   find_python
   find_workdir
 }
@@ -403,7 +417,11 @@
 except:
   print "error"
 ENDCOMMAND
-  local cmd=3D`$GUMP_PYTHON "$GUMP_HOME/pycmd.tmp.py"`
+  if $GUMP_CYGWIN; then
+    local cmd=3D"$GUMP_PYTHON `cygpath -w $GUMP_HOME/pycmd.tmp.py`"
+  else
+    local cmd=3D"$GUMP_PYTHON '$GUMP_HOME/pycmd.tmp.py'"
+  fi
   result=3D`$cmd`
   rm -f "$GUMP_HOME/pycmd.tmp.py"
=20
@@ -421,7 +439,7 @@
 function check_environment
 {
   # PrintPath doesn't deal with absolute paths properly
-  check_command $GUMP_PYTHON "http://www.python.org/"
+  #check_command $GUMP_PYTHON "http://www.python.org/"
   #check_command "pkill" "http://sourceforge.net/projects/proctools"
   check_command "mysql" "http://www.mysql.com/"
   check_command "mysqladmin" "http://www.mysql.com/"
@@ -480,14 +498,26 @@
   find $GUMP_HOME/pygump -type f -name '*.pyc' | xargs rm -Rf
=20
   # compile everything
-  $GUMP_PYTHON -c "import re; from compileall import compile_dir; compile_=
dir('$GUMP_HOME/pygump/python', 10, '$GUMP_HOME', False, re.compile('\.svn'=
), True)"
-
+  if $GUMP_CYGWIN; then
+    $GUMP_PYTHON -c "import re; import os; from compileall import compile_=
dir; compile_dir(os.path.join('`cygpath -w $GUMP_HOME`', 'pygump', 'python'=
), 10, '`cygpath -w $GUMP_HOME`', False, re.compile('\.svn'), True)"
+  else
+    $GUMP_PYTHON -c "import re; import os; from compileall import compile_=
dir; compile_dir(os.path.join('$GUMP_HOME', 'pygump', 'python'), 10, '$GUMP=
_HOME', False, re.compile('\.svn'), True)"
+  fi
+ =20
   # add pygump to python path
   local oldpythonpath=3D"$PYTHONPATH"
   if [[ -z "$oldpythonpath" ]]; then
-    export PYTHONPATH=3D"$GUMP_HOME/pygump/python:$GUMP_HOME/pygump"
+    if $GUMP_CYGWIN; then
+      export PYTHONPATH=3D"`cygpath -w $GUMP_HOME/pygump/python`;`cygpath =
-w $GUMP_HOME/pygump`"
+    else
+      export PYTHONPATH=3D"$GUMP_HOME/pygump/python:$GUMP_HOME/pygump"
+    fi
   else
-    export PYTHONPATH=3D"$GUMP_HOME/pygump/python:$GUMP_HOME/pygump:$PYTHO=
NPATH"
+    if $GUMP_CYGWIN; then
+      export PYTHONPATH=3D"`cygpath -w $GUMP_HOME/pygump/python`;`cygpath =
-w $GUMP_HOME/pygump`:$PYTHONPATH"
+    else
+      export PYTHONPATH=3D"$GUMP_HOME/pygump/python:$GUMP_HOME/pygump:$PYT=
HONPATH"
+    fi
   fi
  =20
   # import all modules, one by one, to check syntax
@@ -513,20 +543,43 @@
   # add pygump to python path
   local oldpythonpath=3D"$PYTHONPATH"
   if [[ -z "$oldpythonpath" ]]; then
-    export PYTHONPATH=3D"$GUMP_HOME/pygump/python:$GUMP_HOME/pygump"
+    if $GUMP_CYGWIN; then
+      export PYTHONPATH=3D"`cygpath -w $GUMP_HOME/pygump/python`;`cygpath =
-w $GUMP_HOME/pygump`"
+    else
+      export PYTHONPATH=3D"$GUMP_HOME/pygump/python:$GUMP_HOME/pygump"
+    fi
   else
-    export PYTHONPATH=3D"$GUMP_HOME/pygump/python:$GUMP_HOME/pygump:$PYTHO=
NPATH"
+    if $GUMP_CYGWIN; then
+      export PYTHONPATH=3D"`cygpath -w $GUMP_HOME/pygump/python`;`cygpath =
-w $GUMP_HOME/pygump`:$PYTHONPATH"
+    else
+      export PYTHONPATH=3D"$GUMP_HOME/pygump/python:$GUMP_HOME/pygump:$PYT=
HONPATH"
+    fi
   fi
- =20
+
   local command=3D"$1"
   shift
  =20
   # run pygump
   local current=3D`pwd`
-  cd "$GUMP_HOME/pygump"
   pycompile
=20
+  if $GUMP_CYGWIN; then
+    local old_gump_home=3D$GUMP_HOME
+    local old_gump_workdir=3D$GUMP_WORKDIR
+    local old_java_home=3D$JAVA_HOME
+    export GUMP_HOME=3D`cygpath -w $GUMP_HOME`
+    export GUMP_WORKDIR=3D`cygpath -w $GUMP_WORKDIR`
+    export JAVA_HOME=3D`cygpath -w $JAVA_HOME`
+    cd "$GUMP_HOME\pygump"
+  else
+    cd "$GUMP_HOME/pygump"
+  fi
   $GUMP_PYTHON -c "$command" $@
+  if $GUMP_CYGWIN; then
+    export GUMP_HOME=3D$old_gump_home
+    export GUMP_WORKDIR=3D$old_gump_workdir
+    export JAVA_HOME=3D$old_java_home
+  fi
   cd "$current"
=20
   # restore python path
@@ -584,20 +637,30 @@
   lock
  =20
   # add pygump to python path
-  local oldpythonpath=3D"$PYTHONPATH"
   if [[ -z "$oldpythonpath" ]]; then
-    export PYTHONPATH=3D"$GUMP_HOME/pygump/python:$GUMP_HOME/pygump"
+    if $GUMP_CYGWIN; then
+      export PYTHONPATH=3D"`cygpath -w $GUMP_HOME/pygump/python`;`cygpath =
-w $GUMP_HOME/pygump`"
+    else
+      export PYTHONPATH=3D"$GUMP_HOME/pygump/python:$GUMP_HOME/pygump"
+    fi
   else
-    export PYTHONPATH=3D"$GUMP_HOME/pygump/python:$GUMP_HOME/pygump:$PYTHO=
NPATH"
+    if $GUMP_CYGWIN; then
+      export PYTHONPATH=3D"`cygpath -w $GUMP_HOME/pygump/python`;`cygpath =
-w $GUMP_HOME/pygump`:$PYTHONPATH"
+    else
+      export PYTHONPATH=3D"$GUMP_HOME/pygump/python:$GUMP_HOME/pygump:$PYT=
HONPATH"
+    fi
   fi
- =20
=20
   local current=3D`pwd`
   cd "$GUMP_HOME/pygump/python"
   pycompile
  =20
   # Run the pygump tests
-  $GUMP_PYTHON $GUMP_HOME/bin/testrunner.py -d $GUMP_HOME/pygump/python/gu=
mp/test $@
+  if $GUMP_CYGWIN; then
+    $GUMP_PYTHON `cygpath -w $GUMP_HOME/bin/testrunner.py` -d `cygpath -w =
$GUMP_HOME/pygump/python/gump/test` $@
+  else
+    $GUMP_PYTHON $GUMP_HOME/bin/testrunner.py -d $GUMP_HOME/pygump/python/=
gump/test $@
+  fi
   cd "$current"
  =20
   # restore python path

Modified: gump/branches/Gump3/pygump/main.py
URL: http://svn.apache.org/viewcvs/gump/branches/Gump3/pygump/main.py?view=
=3Ddiff&r1=3D160234&r2=3D160235
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- gump/branches/Gump3/pygump/main.py (original)
+++ gump/branches/Gump3/pygump/main.py Tue Apr  5 15:35:22 2005
@@ -375,7 +375,7 @@
         _homedir   =3D os.environ["GUMP_HOME"]
         _hostname  =3D os.environ["GUMP_HOSTNAME"]
         try:
-            _workdir   =3D os.environ["GUMP_WORKDIR"]
+            _workdir =3D os.environ["GUMP_WORKDIR"]
         except:
             _workdir =3D os.path.join(_homedir, "pygump", "work")
            =20

Modified: gump/branches/Gump3/pygump/python/gump/util/sysinfo.py
URL: http://svn.apache.org/viewcvs/gump/branches/Gump3/pygump/python/gump/u=
til/sysinfo.py?view=3Ddiff&r1=3D160234&r2=3D160235
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- gump/branches/Gump3/pygump/python/gump/util/sysinfo.py (original)
+++ gump/branches/Gump3/pygump/python/gump/util/sysinfo.py Tue Apr  5 15:35=
:22 2005
@@ -20,12 +20,15 @@
 __copyright__ =3D "Copyright (c) 2005 The Apache Software Foundation"
 __license__   =3D "http://www.apache.org/licenses/LICENSE-2.0"
=20
+import sys
 from subprocess import Popen
 from subprocess import PIPE
=20
 def amount_of_memory():
     """Returning an integer giving the amount of RAM memory in the system,
     in megabytes. Returns 0 if the amount of RAM cannot be determined."""
+    if sys.platform =3D=3D "win32":
+        return 0
     amount =3D 0 # i.e., we don't know
     cat =3D Popen(["cat", "/proc/meminfo"], stdout=3DPIPE)
     if cat.wait():
@@ -42,6 +45,8 @@
 def amount_of_cpu_mhz():
     """Returning an integer giving the processor speed for this system,
     in MHz. Returns 0 if the processor speed cannot be determined."""
+    if sys.platform =3D=3D "win32":
+        return 0
     amount =3D 0 # i.e., we don't know
     cat =3D Popen(["cat", "/proc/cpuinfo"], stdout=3DPIPE)
     if cat.wait():
@@ -61,6 +66,8 @@
 def number_of_cpus():
     """Returning an integer giving the number of CPUs in the system.
     Returns 0 if the number of CPUs cannot be determined."""
+    if sys.platform =3D=3D "win32":
+        return 0
     amount =3D 0 # i.e., we don't know
     cat =3D Popen(["cat", "/proc/cpuinfo"], stdout=3DPIPE)
     if cat.wait():