Skip to content

Commit 15a2063

Browse files
committed
Fix setup scripts on Linux for v54 release.
1 parent eb842cd commit 15a2063

File tree

2 files changed

+11
-9
lines changed

2 files changed

+11
-9
lines changed

src/linux/installer/make-setup.py

+6-4
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,7 @@ def main():
159159
os.mkdir(package_dir+"/examples/")
160160

161161
print("Copying root examples/ directory")
162+
ret = os.system("rm ../../../examples/*.log")
162163
ret = os.system("cp -r ../../../examples/* "+package_dir+"/examples/")
163164
assert ret == 0
164165

@@ -192,9 +193,9 @@ def main():
192193
ret = os.system("cp -rf "+wx_subpackage_dir+"/* "+package_dir+"/wx/")
193194
assert ret == 0
194195

195-
print("Moving wx examples from wx/examples to examples/wx")
196-
shutil.move(package_dir+"/wx/examples", package_dir+"/wx/wx/")
197-
shutil.move(package_dir+"/wx/wx/", package_dir+"/examples/")
196+
# print("Moving wx examples from wx/examples to examples/wx")
197+
# shutil.move(package_dir+"/wx/examples", package_dir+"/wx/wx/")
198+
# shutil.move(package_dir+"/wx/wx/", package_dir+"/examples/")
198199

199200
print("Copying package dir examples to setup dir")
200201
ret = os.system("cp -rf "+package_dir+"/examples/ "+setup_dir+"/examples/")
@@ -204,7 +205,8 @@ def main():
204205
# in case examples were launched. Issue 149.
205206
debug_log_dirs = [package_dir,
206207
package_dir+"/examples/",
207-
package_dir+"/examples/wx/"]
208+
# package_dir+"/examples/wx/"
209+
]
208210
for curdir in debug_log_dirs:
209211
print("Creating empty debug.log in %s" % curdir)
210212
with open(curdir+"/debug.log", "w") as f:

src/linux/installer/setup.py.template

+5-5
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ def post_install():
4444
commands = [
4545
"chmod 666 %s/debug.log" % package_dir,
4646
"chmod 666 %s/examples/debug.log" % package_dir,
47-
"chmod 666 %s/examples/wx/debug.log" % package_dir,
47+
# "chmod 666 %s/examples/wx/debug.log" % package_dir,
4848
]
4949
for command in commands:
5050
print("[setup.py] %s" % command)
@@ -83,9 +83,9 @@ setup(
8383
'examples/kivy-select-boxes/*.css',
8484
'examples/kivy-select-boxes/*.md',
8585
'examples/resources/*.png',
86-
'examples/wx/*.py',
87-
'examples/wx/*.html',
88-
'examples/wx/*.png',
86+
# 'examples/wx/*.py',
87+
# 'examples/wx/*.html',
88+
# 'examples/wx/*.png',
8989
'locales/*.pak',
9090
'wx/*.txt',
9191
'wx/images/*.png',
@@ -99,6 +99,6 @@ setup(
9999
'*.dat',
100100
'debug.log',
101101
'examples/debug.log',
102-
'examples/wx/debug.log',
102+
# 'examples/wx/debug.log',
103103
]}
104104
)

0 commit comments

Comments
 (0)