Changeset 653:329e2eecb565


Ignore:
Timestamp:
06/28/15 12:24:32 (9 years ago)
Author:
István Váradi <ivaradi@…>
Branch:
cef
Phase:
public
Message:

Updated the Windows install package generator infrastructure to incorporate CEF in the installer (re #272)

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • makeinst.bat

    r20 r653  
    11set MSVCRDIR=c:\windows\winsxs\x86_Microsoft.VC90.CRT*9.0.21022.8*
    22set GTKRTDIR=c:\Python27\Lib\site-packages\gtk-2.0\runtime
     3set CEFDIR=c:\Python27\Lib\site-packages\cefpython3
    34set NSISDIR=C:\Program Files\NSIS
    45
  • setup.py

    r497 r653  
    2828    msvcrDir = os.environ["MSVCRDIR"] if "MSVCRDIR" in os.environ else None
    2929    if msvcrDir:
    30         data_files.append(("Microsoft.VC90.CRT",  glob(os.path.join(msvcrDir, "*.*"))))
     30        data_files.append(("Microsoft.VC90.CRT", glob(os.path.join(msvcrDir, "*.*"))))
     31        os.environ["PATH"] = os.environ["PATH"] + ";" + glob(os.path.join(msvcrDir))[0]
    3132
    3233    gtkRuntimeDir = os.environ["GTKRTDIR"] if "GTKRTDIR" in os.environ else None
     
    4647        data_files.append((os.path.join("library", path),
    4748                           glob(os.path.join(gtkRuntimeDir, path, "*"))))
     49
     50    cefDir = os.environ.get("CEFDIR")
     51    if cefDir:
     52        for fileName in ["icudt.dll", "subprocess.exe"]:
     53            data_files.append(("", [os.path.join(cefDir, fileName)]))
     54
     55        data_files.append(("locales",
     56                           glob(os.path.join(cefDir, "locales", "*"))))
     57
     58    print data_files
    4859
    4960    with open("mlx-common.nsh", "wt") as f:
     
    8495        print >> f, "StartMenuFolder=MAVA Logger X"
    8596        print >> f, "LinkName=MAVA Logger X"
     97    os.rename(os.path.join(scriptdir, "dist", "library", "libcef.dll"),
     98              os.path.join(scriptdir, "dist", "libcef.dll"))
Note: See TracChangeset for help on using the changeset viewer.