Changeset 681:6d454f3c68c8 for src/mlx

Timestamp:

09/27/15 15:11:57 (9 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

cef

Parents:

655:912e0c6076d1 (diff), 680:965523af85d4 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Phase:

public

Message:

Merged in the default branch

Location:

src/mlx

Files:

• const.py (modified) (2 diffs)
• update.py (modified) (3 diffs)
• update.py (modified) (1 diff)

src/mlx/const.py

@@ -11 +11 @@
 
 ## The version of the program
-VERSION="0.34cef"
+VERSION="0.35.2"
 
 #-------------------------------------------------------------------------------
@@ -45 +45 @@
 ## Flight simulator type: X-Plane 10
 SIM_XPLANE10 = 4
+
+## Flight simulator type: Prepar3D
+SIM_P3D = 5
 
 #-------------------------------------------------------------------------------

src/mlx/update.py

@@ -465 +465 @@
         if os.name=="nt":
             win32api.ShellExecute(0, "open", os.path.join(directory, "mlxupdate"),
-                                  str(port) + " " +  manifestFile, "", 1)
+                                  str(port) + " " +  manifestFile + " " + updateURL, "", 1)
         else:
             process = subprocess.Popen([os.path.join(directory, "mlxupdate"),
-                                        str(port), manifestFile],
-                                       shell = os.name=="nt")
+                                        str(port), manifestFile, updateURL],
+                                        shell = os.name=="nt")
 
         (mlxUpdateSocket, _) = serverSocket.accept()
@@ -546 +546 @@
     clientSocket.connect(("127.0.0.1", int(sys.argv[1])))
 
-    config = Config()
-    config.load()
-
     directory = os.path.dirname(sys.argv[0])
 
@@ -560 +557 @@
     localRemoved = getToremoveFiles(directory)
 
-    updateFiles(directory, Config.DEFAULT_UPDATE_URL,
+    updateFiles(directory, sys.argv[3],
                 ClientListener(clientSocket),
                 updateManifest, modifiedAndNew, removed, localRemoved)

src/mlx/update.py

@@ -525 +525 @@
         return
 
-    print "update: result:", result
-
     (manifest, updateManifest, modifiedAndNew, removed) = result        
     localRemoved = getToremoveFiles(directory)