[GRASS-SVN] r61870 - grass/branches/releasebranch_7_0/gui/wxpython/core

[svn_grass at osgeo.org]

Author: martinl
Date: 2014-09-12 04:30:53 -0700 (Fri, 12 Sep 2014)
New Revision: 61870

Modified:
   grass/branches/releasebranch_7_0/gui/wxpython/core/globalvar.py
Log:
winGRASS: fix addons scanning (python scripts have now bat wrapper)
          (merge r61714 from trunk)


Modified: grass/branches/releasebranch_7_0/gui/wxpython/core/globalvar.py
===================================================================
--- grass/branches/releasebranch_7_0/gui/wxpython/core/globalvar.py	2014-09-12 11:26:24 UTC (rev 61869)
+++ grass/branches/releasebranch_7_0/gui/wxpython/core/globalvar.py	2014-09-12 11:30:53 UTC (rev 61870)
@@ -131,7 +131,7 @@
 
 if sys.platform == 'win32':
     BIN_EXT = '.exe'
-    SCT_EXT = '.py'
+    SCT_EXT = '.bat'
 else:
     BIN_EXT = SCT_EXT = ''
 
@@ -148,9 +148,10 @@
     addonPath = os.getenv('GRASS_ADDON_PATH', '')
     addonBase = os.getenv('GRASS_ADDON_BASE')
     if addonBase:
-        addonPath += os.pathsep + os.path.join(addonBase, 'bin') + os.pathsep + \
-            os.path.join(addonBase, 'scripts')
-
+        addonPath += os.pathsep + os.path.join(addonBase, 'bin')
+        if sys.platform != 'win32':
+            addonPath += os.pathsep + os.path.join(addonBase, 'scripts')
+    
     # remove commands first
     if eList:
         for ext in eList:
@@ -189,12 +190,12 @@
                     grassCmd.add(fname)
                     Debug.msg(3, "AddOn commands: %s", fname)
                     nCmd += 1
+    
+    Debug.msg(1, "Number of GRASS AddOn commands: %d", nCmd)
 
-    Debug.msg(1, "Number of new AddOn commands: %d", nCmd)
-
 """@brief Collected GRASS-relared binaries/scripts"""
 grassCmd, grassScripts = get_commands()
-Debug.msg(1, "Number of GRASS commands: %d", len(grassCmd))
+Debug.msg(1, "Number of core GRASS commands: %d", len(grassCmd))
 UpdateGRASSAddOnCommands()
 
 """@Toolbar icon size"""