Merge pull request #5781 from minggo/script-fix

set COCOS_CONSOLE_ROOT to path on windows

setup.py

@@ -87,19 +87,6 @@ class SetEnvVar(object):
 
         return file_to_write
 
-    def _update_system_variable(self, origin_content, target_content):
-
-        is_updated = False
-        file = open(self.file_used_for_setup, 'a')
-        for line in fileinput.input(file_to_write, inplace=1):
-            if line.startswith(origin_content):
-                line = target_content
-                if_undated = True
-            sys.stdout.write(line)
-
-        file.close()
-        return is_updated
-
     def _find_string_in_file(self, string, file_path):
         with open(file_path) as f:
             for line in f:
@@ -118,7 +105,9 @@ class SetEnvVar(object):
                                 0,
                                 _winreg.KEY_SET_VALUE | _winreg.KEY_READ)
             _winreg.SetValueEx(env, key, 0, _winreg.REG_SZ, value)
+            _winreg.FlushKey(env)
             _winreg.CloseKey(env)
+
         except Exception:
             if env:
                 _winreg.CloseKey(env)
@@ -293,6 +282,35 @@ class SetEnvVar(object):
         else:
             return False
 
+    def set_windows_path(self, cocos_consle_root):
+        import _winreg
+        try:
+            env = None
+            path = None
+            env = _winreg.OpenKeyEx(_winreg.HKEY_CURRENT_USER,
+                                'Environment',
+                                0,
+                                _winreg.KEY_SET_VALUE | _winreg.KEY_READ)
+            path = _winreg.QueryValueEx(env, 'Path')[0]
+            path = path + ';' + cocos_consle_root
+            path.replace('/', '\\')
+            _winreg.SetValueEx(env, 'Path', 0, _winreg.REG_SZ, path)
+            _winreg.FlushKey(env)
+            _winreg.CloseKey(env)
+
+        except Exception:
+            if not path:
+                path = cocos_consle_root.replace('/', '\\')
+                _winreg.SetValueEx(env, 'Path', 0, _winreg.REG_SZ, path)
+                _winreg.FlushKey(env)
+            else:
+                _winreg.SetValueEx(env, 'Path', 0, _winreg.REG_SZ, path)
+                _winreg.FlushKey(env)
+            if env:
+                _winreg.CloseKey(env)
+            return False
+        return True
+
 
     def set_console_root(self):
 
@@ -300,6 +318,8 @@ class SetEnvVar(object):
         print '-> Adding COCOS2D_CONSOLE_ROOT environment variable...',
         if not self._find_environment_variable(COCOS_CONSOLE_ROOT):
             cocos_consle_root = os.path.join(self.current_absolute_path, 'tools/cocos2d-console/bin')
+            if self._isWindows():
+                self.set_windows_path(cocos_consle_root)
             if self._set_environment_variable(COCOS_CONSOLE_ROOT, cocos_consle_root):
                 print 'OK'
                 print '  -> Added: %s = %s' % (COCOS_CONSOLE_ROOT, cocos_consle_root)