Changeset 653:329e2eecb565

Timestamp:

06/28/15 12:24:32 (9 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

cef

hg-Phase:

(<MercurialRepository 1 'hg:/home/ivaradi/mlx/hg' '/'>, 'public')

Message:

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

Files:

• makeinst.bat (modified) (1 diff)
• setup.py (modified) (3 diffs)

makeinst.bat

@@ -1 +1 @@
 set MSVCRDIR=c:\windows\winsxs\x86_Microsoft.VC90.CRT*9.0.21022.8*
 set GTKRTDIR=c:\Python27\Lib\site-packages\gtk-2.0\runtime
+set CEFDIR=c:\Python27\Lib\site-packages\cefpython3
 set NSISDIR=C:\Program Files\NSIS
 

setup.py

@@ -28 +28 @@
     msvcrDir = os.environ["MSVCRDIR"] if "MSVCRDIR" in os.environ else None
     if msvcrDir:
-        data_files.append(("Microsoft.VC90.CRT",  glob(os.path.join(msvcrDir, "*.*"))))
+        data_files.append(("Microsoft.VC90.CRT", glob(os.path.join(msvcrDir, "*.*"))))
+        os.environ["PATH"] = os.environ["PATH"] + ";" + glob(os.path.join(msvcrDir))[0]
 
     gtkRuntimeDir = os.environ["GTKRTDIR"] if "GTKRTDIR" in os.environ else None
@@ -46 +47 @@
         data_files.append((os.path.join("library", path),
                            glob(os.path.join(gtkRuntimeDir, path, "*"))))
+
+    cefDir = os.environ.get("CEFDIR")
+    if cefDir:
+        for fileName in ["icudt.dll", "subprocess.exe"]:
+            data_files.append(("", [os.path.join(cefDir, fileName)]))
+
+        data_files.append(("locales",
+                           glob(os.path.join(cefDir, "locales", "*"))))
+
+    print data_files
 
     with open("mlx-common.nsh", "wt") as f:
@@ -84 +95 @@
         print >> f, "StartMenuFolder=MAVA Logger X"
         print >> f, "LinkName=MAVA Logger X"
+    os.rename(os.path.join(scriptdir, "dist", "library", "libcef.dll"),
+              os.path.join(scriptdir, "dist", "libcef.dll"))