Skip to content

Commit a694976

Browse files
committed
Fixes to the setup installers. Copy the js/css files that belong to
examples.
1 parent 2504ef3 commit a694976

5 files changed

Lines changed: 14 additions & 0 deletions

File tree

cefpython/cef3/linux/installer/make-setup.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,8 @@ def main():
105105
continue
106106
os.rename(example, package_dir+"/examples/"+os.path.basename(example))
107107
ret = os.system("mv "+package_dir+"/*.html "+package_dir+"/examples/")
108+
ret = os.system("mv "+package_dir+"/*.js "+package_dir+"/examples/")
109+
ret = os.system("mv "+package_dir+"/*.css "+package_dir+"/examples/")
108110
assert ret == 0
109111

110112
print("Copying wx-subpackage to wx dir in package dir")

cefpython/cef3/linux/installer/setup.py.template

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ setup(
4040
package_data={'cefpython3': [
4141
'examples/*.py',
4242
'examples/*.html',
43+
'examples/*.js',
44+
'examples/*.css',
4345
'examples/kivy-select-boxes/*.html',
4446
'examples/kivy-select-boxes/*.js',
4547
'examples/kivy-select-boxes/*.css',

cefpython/cef3/windows/installer/innosetup.template

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,8 @@ Source: "%(WX_SUBPACKAGE_DIR)s\images\*.png"; DestDir: "{app}\%(PACKAGE_NAME)s\w
6969

7070
Source: "%(WX_SUBPACKAGE_DIR)s\examples\*.py"; DestDir: "{app}\%(PACKAGE_NAME)s\examples\wx"; Flags: ignoreversion;
7171
Source: "%(WX_SUBPACKAGE_DIR)s\examples\*.html"; DestDir: "{app}\%(PACKAGE_NAME)s\examples\wx"; Flags: ignoreversion;
72+
Source: "%(WX_SUBPACKAGE_DIR)s\examples\*.js"; DestDir: "{app}\%(PACKAGE_NAME)s\examples\wx"; Flags: ignoreversion;
73+
Source: "%(WX_SUBPACKAGE_DIR)s\examples\*.css"; DestDir: "{app}\%(PACKAGE_NAME)s\examples\wx"; Flags: ignoreversion;
7274
Source: "%(WX_SUBPACKAGE_DIR)s\examples\*.png"; DestDir: "{app}\%(PACKAGE_NAME)s\examples\wx"; Flags: ignoreversion;
7375

7476
; ------------------------------------------------------------------------------
@@ -78,6 +80,8 @@ Source: "%(WX_SUBPACKAGE_DIR)s\examples\*.png"; DestDir: "{app}\%(PACKAGE_NAME)s
7880
Source: "cefwindow.py"; DestDir: "{app}\%(PACKAGE_NAME)s\examples"; Flags: ignoreversion;
7981
Source: "example.py"; DestDir: "{app}\%(PACKAGE_NAME)s\examples"; Flags: ignoreversion;
8082
Source: "*.html"; DestDir: "{app}\%(PACKAGE_NAME)s\examples"; Flags: ignoreversion;
83+
Source: "*.css"; DestDir: "{app}\%(PACKAGE_NAME)s\examples"; Flags: ignoreversion;
84+
Source: "*.js"; DestDir: "{app}\%(PACKAGE_NAME)s\examples"; Flags: ignoreversion;
8185
Source: "icon.ico"; DestDir: "{app}\%(PACKAGE_NAME)s\examples"; Flags: ignoreversion;
8286
Source: "pygtk_.py"; DestDir: "{app}\%(PACKAGE_NAME)s\examples"; Flags: ignoreversion;
8387
Source: "pyqt.py"; DestDir: "{app}\%(PACKAGE_NAME)s\examples"; Flags: ignoreversion;

cefpython/cef3/windows/installer/make-setup.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,8 @@ def main():
126126
continue
127127
os.rename(example, package_dir+"/examples/"+os.path.basename(example))
128128
glob_move(package_dir+"/*.html", package_dir+"/examples/")
129+
glob_move(package_dir+"/*.css", package_dir+"/examples/")
130+
glob_move(package_dir+"/*.js", package_dir+"/examples/")
129131

130132
print("Copying wx-subpackage to wx dir in package dir")
131133
wx_subpackage_dir = os.path.abspath(installer_dir+"/../../wx-subpackage/")

cefpython/cef3/windows/installer/setup.py.template

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,12 @@ setup(
2525
package_data={'cefpython3': [
2626
'examples/*.py',
2727
'examples/*.html',
28+
'examples/*.js',
29+
'examples/*.css',
2830
'examples/wx/*.py',
2931
'examples/wx/*.html',
32+
'examples/wx/*.js',
33+
'examples/wx/*.css',
3034
'examples/wx/*.png',
3135
'locales/*.pak',
3236
'wx/*.txt',

0 commit comments

Comments
 (0)