Fix setup scripts on Linux for v54 release.

cztomczak · cztomczak · commit 15a206343489 · 2016-10-19T11:29:51.000+02:00
diff --git a/src/linux/installer/make-setup.py b/src/linux/installer/make-setup.py
@@ -159,6 +159,7 @@ def main():
     os.mkdir(package_dir+"/examples/")
 
     print("Copying root examples/ directory")
+    ret = os.system("rm ../../../examples/*.log")
     ret = os.system("cp -r ../../../examples/* "+package_dir+"/examples/")
     assert ret == 0
 
@@ -192,9 +193,9 @@ def main():
     ret = os.system("cp -rf "+wx_subpackage_dir+"/* "+package_dir+"/wx/")
     assert ret == 0
 
-    print("Moving wx examples from wx/examples to examples/wx")
-    shutil.move(package_dir+"/wx/examples", package_dir+"/wx/wx/")
-    shutil.move(package_dir+"/wx/wx/", package_dir+"/examples/")
+    # print("Moving wx examples from wx/examples to examples/wx")
+    # shutil.move(package_dir+"/wx/examples", package_dir+"/wx/wx/")
+    # shutil.move(package_dir+"/wx/wx/", package_dir+"/examples/")
 
     print("Copying package dir examples to setup dir")
     ret = os.system("cp -rf "+package_dir+"/examples/ "+setup_dir+"/examples/")
@@ -204,7 +205,8 @@ def main():
     # in case examples were launched. Issue 149.
     debug_log_dirs = [package_dir, 
                       package_dir+"/examples/", 
-                      package_dir+"/examples/wx/"]
+                      # package_dir+"/examples/wx/"
+                     ]
     for curdir in debug_log_dirs:
         print("Creating empty debug.log in %s" % curdir)
         with open(curdir+"/debug.log", "w") as f:
diff --git a/src/linux/installer/setup.py.template b/src/linux/installer/setup.py.template
@@ -44,7 +44,7 @@ def post_install():
     commands = [
         "chmod 666 %s/debug.log" % package_dir,
         "chmod 666 %s/examples/debug.log" % package_dir,
-        "chmod 666 %s/examples/wx/debug.log" % package_dir,
+        # "chmod 666 %s/examples/wx/debug.log" % package_dir,
     ]
     for command in commands:
         print("[setup.py] %s" % command)
@@ -83,9 +83,9 @@ setup(
         'examples/kivy-select-boxes/*.css',
         'examples/kivy-select-boxes/*.md',
         'examples/resources/*.png',
-        'examples/wx/*.py',
-        'examples/wx/*.html',
-        'examples/wx/*.png',
+        # 'examples/wx/*.py',
+        # 'examples/wx/*.html',
+        # 'examples/wx/*.png',
         'locales/*.pak',
         'wx/*.txt',
         'wx/images/*.png',
@@ -99,6 +99,6 @@ setup(
         '*.dat',
         'debug.log',
         'examples/debug.log',
-        'examples/wx/debug.log',
+        # 'examples/wx/debug.log',
     ]}
 )
