Skip to content

Commit fbe4bea

Browse files
cztomczakcztomczak
committed
Updated inno setup installer scripts on Windows.
Created package installer for the v55 release. Added wx subpackage to the cefpython package.
1 parent 9c8b1a4 commit fbe4bea

3 files changed

Lines changed: 38 additions & 7 deletions

File tree

‎cefpython/cef1/windows/installer/__init__.py.template‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ else:
88
raise Exception("Unsupported python version: " + sys.version)
99

1010
__version__ = "%(APP_VERSION)s"
11-
__author__ = "CEF Python authors"
11+
__author__ = "The CEF Python authors"

‎cefpython/cef1/windows/installer/innosetup.template‎

Lines changed: 35 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ LicenseFile = %(BINARIES_DIR)s\LICENSE.txt
3535

3636
[Icons]
3737

38-
Name: "{group}\Examples"; Filename: "{app}\%(PACKAGE_NAME)s\examples"
39-
Name: "{group}\Uninstall Package"; Filename: "{uninstallexe}"
38+
Name: "{group}\Examples"; Filename: "{app}\%(PACKAGE_NAME)s\examples";
39+
Name: "{group}\Uninstall Package"; Filename: "{uninstallexe}";
4040

4141
[Run]
4242

@@ -47,25 +47,54 @@ Filename: "{app}\%(PACKAGE_NAME)s\examples"; Flags: postinstall shellexec;
4747
Source: "*.dll"; DestDir: "{app}\%(PACKAGE_NAME)s"; Flags: ignoreversion;
4848
Source: "*.pak"; DestDir: "{app}\%(PACKAGE_NAME)s"; Flags: ignoreversion;
4949
Source: "locales\*.pak"; DestDir: "{app}\%(PACKAGE_NAME)s\locales"; Flags: ignoreversion;
50+
5051
Source: "%(INSTALLER_DIR)s\__init__.py.generated"; DestDir: "{app}\%(PACKAGE_NAME)s"; DestName: "__init__.py"; Flags: ignoreversion;
52+
5153
Source: "cefclient.exe"; DestDir: "{app}\%(PACKAGE_NAME)s"; Flags: ignoreversion;
52-
Source: "cefpython_py27.py"; DestDir: "{app}\%(PACKAGE_NAME)s"; Flags: ignoreversion;
53-
Source: "cefpython_py27.pyd"; DestDir: "{app}\%(PACKAGE_NAME)s"; Flags: ignoreversion;
54-
Source: "cefpython_py32.py"; DestDir: "{app}\%(PACKAGE_NAME)s"; Flags: ignoreversion;
55-
Source: "cefpython_py32.pyd"; DestDir: "{app}\%(PACKAGE_NAME)s"; Flags: ignoreversion;
54+
55+
Source: "cefpython_py%(PYTHON_VERSION_NODOT)s.pyd"; DestDir: "{app}\%(PACKAGE_NAME)s"; Flags: ignoreversion;
56+
Source: "cefpython_py%(PYTHON_VERSION_NODOT)s.py"; DestDir: "{app}\%(PACKAGE_NAME)s"; Flags: ignoreversion;
57+
5658
Source: "LICENSE.txt"; DestDir: "{app}\%(PACKAGE_NAME)s"; Flags: ignoreversion;
59+
5760
Source: "Microsoft.VC90.CRT.manifest"; DestDir: "{app}\%(PACKAGE_NAME)s"; Flags: ignoreversion;
61+
5862
Source: "README.txt"; DestDir: "{app}\%(PACKAGE_NAME)s"; Flags: ignoreversion;
5963

64+
; ------------------------------------------------------------------------------
65+
; wx subpackage
66+
; ------------------------------------------------------------------------------
67+
68+
Source: "%(WX_SUBPACKAGE_DIR)s\*.py"; DestDir: "{app}\%(PACKAGE_NAME)s\wx"; Flags: ignoreversion;
69+
Source: "%(WX_SUBPACKAGE_DIR)s\*.txt"; DestDir: "{app}\%(PACKAGE_NAME)s\wx"; Flags: ignoreversion;
70+
Source: "%(WX_SUBPACKAGE_DIR)s\images\*.png"; DestDir: "{app}\%(PACKAGE_NAME)s\wx\images"; Flags: ignoreversion;
71+
72+
; ------------------------------------------------------------------------------
73+
; wx examples
74+
; ------------------------------------------------------------------------------
75+
76+
Source: "%(WX_SUBPACKAGE_DIR)s\examples\*.py"; DestDir: "{app}\%(PACKAGE_NAME)s\examples\wx"; Flags: ignoreversion;
77+
Source: "%(WX_SUBPACKAGE_DIR)s\examples\*.html"; DestDir: "{app}\%(PACKAGE_NAME)s\examples\wx"; Flags: ignoreversion;
78+
Source: "%(WX_SUBPACKAGE_DIR)s\examples\*.png"; DestDir: "{app}\%(PACKAGE_NAME)s\examples\wx"; Flags: ignoreversion;
79+
80+
; ------------------------------------------------------------------------------
81+
; examples
82+
; ------------------------------------------------------------------------------
83+
6084
Source: "cefadvanced.html"; DestDir: "{app}\%(PACKAGE_NAME)s\examples"; Flags: ignoreversion;
6185
Source: "cefadvanced.py"; DestDir: "{app}\%(PACKAGE_NAME)s\examples"; Flags: ignoreversion;
86+
6287
Source: "cefsimple.html"; DestDir: "{app}\%(PACKAGE_NAME)s\examples"; Flags: ignoreversion;
6388
Source: "cefsimple.py"; DestDir: "{app}\%(PACKAGE_NAME)s\examples"; Flags: ignoreversion;
89+
6490
Source: "cefwindow.py"; DestDir: "{app}\%(PACKAGE_NAME)s\examples"; Flags: ignoreversion;
91+
6592
Source: "cefwxpanel.py"; DestDir: "{app}\%(PACKAGE_NAME)s\examples"; Flags: ignoreversion;
6693
Source: "cefwxpanel_sample1.py"; DestDir: "{app}\%(PACKAGE_NAME)s\examples"; Flags: ignoreversion;
6794
Source: "cefwxpanel_sample2.py"; DestDir: "{app}\%(PACKAGE_NAME)s\examples"; Flags: ignoreversion;
95+
6896
Source: "icon.ico"; DestDir: "{app}\%(PACKAGE_NAME)s\examples"; Flags: ignoreversion;
97+
6998
Source: "panda3d_.py"; DestDir: "{app}\%(PACKAGE_NAME)s\examples"; Flags: ignoreversion;
7099
Source: "pygtk_.py"; DestDir: "{app}\%(PACKAGE_NAME)s\examples"; Flags: ignoreversion;
71100
Source: "pyqt.py"; DestDir: "{app}\%(PACKAGE_NAME)s\examples"; Flags: ignoreversion;

‎cefpython/cef1/windows/installer/make_installer.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ def main():
3131
+ str(sys.version_info.major) + str(sys.version_info.minor)
3232
+ ".pyd")
3333
vars["INSTALLER_DIR"] = os.getcwd()
34+
vars["WX_SUBPACKAGE_DIR"] = os.path.realpath(os.getcwd()+r"\..\.."
35+
"\wx-subpackage")
3436

3537
print("Reading template: %s" % TEMPLATE_FILE)
3638

0 commit comments

Comments
 (0)