Changeset 681:6d454f3c68c8 for src


Ignore:
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:
3 edited

Legend:

Unmodified
Added
Removed
  • src/mlx/const.py

    r647 r681  
    1111
    1212## The version of the program
    13 VERSION="0.34cef"
     13VERSION="0.35.2"
    1414
    1515#-------------------------------------------------------------------------------
     
    4545## Flight simulator type: X-Plane 10
    4646SIM_XPLANE10 = 4
     47
     48## Flight simulator type: Prepar3D
     49SIM_P3D = 5
    4750
    4851#-------------------------------------------------------------------------------
  • src/mlx/update.py

    r652 r681  
    465465        if os.name=="nt":
    466466            win32api.ShellExecute(0, "open", os.path.join(directory, "mlxupdate"),
    467                                   str(port) + " " +  manifestFile, "", 1)
     467                                  str(port) + " " +  manifestFile + " " + updateURL, "", 1)
    468468        else:
    469469            process = subprocess.Popen([os.path.join(directory, "mlxupdate"),
    470                                         str(port), manifestFile],
    471                                        shell = os.name=="nt")
     470                                        str(port), manifestFile, updateURL],
     471                                        shell = os.name=="nt")
    472472
    473473        (mlxUpdateSocket, _) = serverSocket.accept()
     
    546546    clientSocket.connect(("127.0.0.1", int(sys.argv[1])))
    547547
    548     config = Config()
    549     config.load()
    550 
    551548    directory = os.path.dirname(sys.argv[0])
    552549
     
    560557    localRemoved = getToremoveFiles(directory)
    561558
    562     updateFiles(directory, Config.DEFAULT_UPDATE_URL,
     559    updateFiles(directory, sys.argv[3],
    563560                ClientListener(clientSocket),
    564561                updateManifest, modifiedAndNew, removed, localRemoved)
  • src/mlx/update.py

    r672 r681  
    525525        return
    526526
    527     print "update: result:", result
    528 
    529527    (manifest, updateManifest, modifiedAndNew, removed) = result       
    530528    localRemoved = getToremoveFiles(directory)
Note: See TracChangeset for help on using the changeset viewer.