Changeset 37873

Timestamp:

Jun 13, 2009, 7:27:48 PM (15 years ago)

Author:

glynn

Message:

Windows fixes
Handle missing ~/.grassrc7
Call wxgui.py, not wxgui shell script

Location:

grass/trunk/lib/init

Files:

• Makefile (modified) (3 diffs)
• grass.py (modified) (6 diffs)

grass/trunk/lib/init/Makefile

@@ -32 +32 @@
 FILES = \
         $(ARCH_BINDIR)/$(START_UP).sh \
-        $(ARCH_BINDIR)/$(START_UP) \
         $(ETC)/Init.sh \
         $(ETC)/functions.sh \
@@ -56 +55 @@
 ifneq ($(strip $(MINGW)),)
         FILES += \
+                $(ARCH_BINDIR)/$(START_UP).py \
                 $(ARCH_BINDIR)/$(START_UP).bat \
                 $(ETC)/Init.bat
+else
+        FILES += \
+                $(ARCH_BINDIR)/$(START_UP)
+
 endif
 
@@ -76 +80 @@
         chmod a+x $@
 
+ifneq ($(strip $(MINGW)),)
+$(ARCH_BINDIR)/$(START_UP).py: grass.py
+else
 $(ARCH_BINDIR)/$(START_UP): grass.py
+endif
         rm -f $@
         sed \
-        -e 's#@GISBASE@#$(GISBASE)#' \
+        -e 's#@GISBASE@#$(RUN_GISBASE)#' \
         -e 's#@GRASS_VERSION_NUMBER@#$(GRASS_VERSION_NUMBER)#' \
         -e 's#@LD_LIBRARY_PATH_VAR@#$(LD_LIBRARY_PATH_VAR)#' \

grass/trunk/lib/init/grass.py

@@ -38 +38 @@
 config_projshare = "@CONFIG_PROJSHARE@"
 
+gisbase = os.path.normpath(gisbase)
+
 tmpdir = None
 lockfile = None
@@ -191 +193 @@
     if not grass_gui:
         # Check for a reference to the GRASS user interface in the grassrc file
-        kv = read_gisrc()
-        if 'GRASS_GUI' not in kv:
-            # Set the GRASS user interface to the default if needed
-            grass_gui = default_gui
+        if os.access(gisrc, os.R_OK):
+            kv = read_gisrc()
+            if 'GRASS_GUI' not in kv:
+                # Set the GRASS user interface to the default if needed
+                grass_gui = default_gui
         else:
             grass_gui = kv['GRASS_GUI']
     
+    if not grass_gui:
+        grass_gui = default_gui
+
     if grass_gui == 'gui':
         grass_gui = default_gui
@@ -271 +277 @@
     if not os.getenv('GRASS_PYTHON'):
         if windows:
-            os.environ['GRASS_PYTHON'] = "pythonw.exe"
+            os.environ['GRASS_PYTHON'] = "python.exe"
         else:
             os.environ['GRASS_PYTHON'] = "python"
@@ -320 +326 @@
 
 def grass_intro():
-    path = gfile("locale", locale, "etc", "grass_intro")
-    if not os.access(path, os.R_OK):
+    if locale:
+        path = gfile("locale", locale, "etc", "grass_intro")
+        if not os.access(path, os.R_OK):
+            path = gfile("etc", "grass_intro")
+    else:
         path = gfile("etc", "grass_intro")
     f = open(path, 'r')
@@ -583 +592 @@
     # Check for gui interface
     if grass_gui == "wxpython":
-        call([gfile("etc", "wxpython", "scripts", "wxgui")])
+        call([gfile("etc", "wxpython", "wxgui.py")])
 
 def clear_screen():
@@ -802 +811 @@
 os.environ['GISBASE'] = gisbase
 
+# set HOME
+if windows and not os.getenv('HOME'):
+    os.environ['HOME'] = os.path.join(os.getenv('HOMEDRIVE'), os.getenv('HOMEPATH'))
+
 atexit.register(cleanup)