Update setup installer on Linux - include proper License file

cztomczak · Jun 30, 2016 · 22ade5c · 22ade5c
1 parent ba9c5b9
commit 22ade5c
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 44 deletions.
diff --git a/src/linux/binaries_64bit/LICENSE.txt b/src/linux/binaries_64bit/LICENSE.txt
diff --git a/src/linux/installer/make-deb.py b/src/linux/installer/make-deb.py
@@ -153,7 +153,7 @@ def create_copyright_file():
     copyright = re.sub("[\r\n]", "\n", copyright)
     copyright += "\n"
     copyright += "License: BSD 3-clause\n"
-    with open(INSTALLER+"/../../../LICENSE.txt", "r") as f:
+    with open(INSTALLER+"/../../../License", "r") as f:
         license = f.readlines()
     for line in license:
         if not len(re.sub("\s+", "", line)):

diff --git a/src/linux/installer/make-setup.py b/src/linux/installer/make-setup.py
@@ -82,6 +82,10 @@ def main():
     print("Creating package dir")
     os.mkdir(package_dir)
 
+    print("Copying License file")
+    shutil.copy("../../../License", package_dir)
+
+
     print("Creating README.txt from template")
     with open(setup_dir+"/README.txt", "w") as f:
         f.write(README_CONTENT)
@@ -116,10 +120,6 @@ def main():
     shutil.move(package_dir+"/kivy-select-boxes",
             package_dir+"/examples/kivy-select-boxes")
 
-    #kivy_select_boxes_dir = package_dir+"/examples/kivy-select-boxes/"
-    #ret = os.system("cp -rf "+kivy_select_boxes_dir+"/* "+package_dir+"/wx/")
-    #assert ret == 0
-
     print("Creating wx dir in package dir")
     os.mkdir(package_dir+"/wx/")
 

diff --git a/src/linux/installer/setup.py.template b/src/linux/installer/setup.py.template
@@ -87,6 +87,7 @@ setup(
         'wx/*.txt',
         'wx/images/*.png',
         '*.txt',
+        'License',
         'cefclient',
         'subprocess',
         '*.so',