[Pymoul-svn] SF.net SVN: pymoul: [251] pymoul/trunk

[<ti...@us...>]

Revision: 251
          http://pymoul.svn.sourceforge.net/pymoul/?rev=251&view=rev
Author:   tiran
Date:     2007-03-13 08:37:27 -0700 (Tue, 13 Mar 2007)

Log Message:
-----------
Fixes for Mac support
compilui fix: prints Nothing to do when all files are up to date
Added Windows Quickstart to INSTALL.txt

Modified Paths:
--------------
    pymoul/trunk/INSTALL.txt
    pymoul/trunk/src/moul/osdependent/darwin/__init__.py
    pymoul/trunk/src/moul/osdependent/linux/__init__.py
    pymoul/trunk/utilities/compileui.py

Modified: pymoul/trunk/INSTALL.txt
===================================================================
--- pymoul/trunk/INSTALL.txt	2007-03-13 15:32:00 UTC (rev 250)
+++ pymoul/trunk/INSTALL.txt	2007-03-13 15:37:27 UTC (rev 251)
@@ -37,6 +37,21 @@
 Windows Installation
 ====================
 
+Quick Start
+-----------
+
+ * Grap the Qt4.2.2 DLL package from http://sourceforge.net/projects/pymoul
+
+ * Install Python 2.5, MinGW32 and the DLL files according to the INSTALL.txt
+
+ * Install PyQt4
+
+ * Set PATH and QT4DIR
+
+ * Invoke utilities\ez_setup.py with Python 2.5
+
+ * Start / Run: easy_install-2.5 -Z pytz
+
 Installation
 ------------
 

Modified: pymoul/trunk/src/moul/osdependent/darwin/__init__.py
===================================================================
--- pymoul/trunk/src/moul/osdependent/darwin/__init__.py	2007-03-13 15:32:00 UTC (rev 250)
+++ pymoul/trunk/src/moul/osdependent/darwin/__init__.py	2007-03-13 15:37:27 UTC (rev 251)
@@ -48,20 +48,38 @@
     The MOUL data directory contains log files, chatlogs, KI images and many
     more things.
     """
-    moul_data = os.path.join(HOME, MOUL_DIR)
+    return os.path.join(HOME, MOUL_DIR)
 
 def getPyMoulDataDir():
     """Get path to the pyMoul ini directory
     """
-    inidir= os.path.join(HOME, PYMOUL_DIR)
-    return inidir
+    return os.path.join(HOME, PYMOUL_DIR)
 
+def getMoulInstallDir():
+    """Get path to MOUL install dir
+    """
+    for path in LOCATIONS:
+        if os.path.isfile(os.path.join(path, EXEC_NAME)):
+            LOG.info("Uru directory found: %s" % path)
+            return path
+    LOG.warning("Uru directory NOT found! Search path was: \n %s" % 
+                repr(LOCATIONS))
+    return 'INVALID'
+
 def startMoul(installdir, *args, **kwargs):
     """Start MOUL - returns a Popen instance
-    
+
     args are applied to the program while kwargs are applied to
     subprocess.Popen()
     """
     path = os.path.join(installdir, EXEC_NAME)
     args = ' '.join(args)
     return Popen("%s %s" % (path, args), cwd=installdir, **kwargs)
+
+def isMoulRunning():
+    """Test if MOUL or the launcher is running
+    """
+    for pid, name in getPidNames().items():
+        if name.lower() in PROCESSES:
+            return pid
+    return False

Modified: pymoul/trunk/src/moul/osdependent/linux/__init__.py
===================================================================
--- pymoul/trunk/src/moul/osdependent/linux/__init__.py	2007-03-13 15:32:00 UTC (rev 250)
+++ pymoul/trunk/src/moul/osdependent/linux/__init__.py	2007-03-13 15:37:27 UTC (rev 251)
@@ -40,6 +40,7 @@
     "/media/d/games/MystOnline",
     "/usr/local/games/MystOnline"
     ]
+PYMOUL_DIR = '.pymoul'
 
 def getMoulUserDataDir():
     """Get path of MOUL data directory
@@ -52,8 +53,7 @@
 def getPyMoulDataDir():
     """Get path to the pyMoul ini directory
     """
-    inidir= os.path.join(HOME, '.pymoul')
-    return inidir
+    return os.path.join(HOME, PYMOUL_DIR)
 
 def getMoulInstallDir():
     """Get path to MOUL install dir
@@ -68,7 +68,7 @@
 
 def startMoul(installdir, *args, **kwargs):
     """Start MOUL - returns a Popen instance
-    
+
     args are applied to the program while kwargs are applied to
     subprocess.Popen()
     """

Modified: pymoul/trunk/utilities/compileui.py
===================================================================
--- pymoul/trunk/utilities/compileui.py	2007-03-13 15:32:00 UTC (rev 250)
+++ pymoul/trunk/utilities/compileui.py	2007-03-13 15:37:27 UTC (rev 251)
@@ -118,5 +118,8 @@
 
     print "Searching in %s" % os.path.abspath(sys.argv[1])
     pys = compileUi(sys.argv[1])
-    print "Python files written:"
-    print '\n'.join(pys)
+    if not pys:
+        print "Nothing to do."
+    else:
+        print "Python files written:"
+        print '\n'.join(pys)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.