Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 22ade5c

Browse filesBrowse files
committed
Update setup installer on Linux - include proper License file
1 parent ba9c5b9 commit 22ade5c
Copy full SHA for 22ade5c

File tree

Expand file treeCollapse file tree

4 files changed

+6
-44
lines changed
Open diff view settings
Filter options
Expand file treeCollapse file tree

4 files changed

+6
-44
lines changed
Open diff view settings
Collapse file

‎src/linux/binaries_64bit/LICENSE.txt‎

Copy file name to clipboardExpand all lines: src/linux/binaries_64bit/LICENSE.txt
-39Lines changed: 0 additions & 39 deletions
This file was deleted.
Collapse file

‎src/linux/installer/make-deb.py‎

Copy file name to clipboardExpand all lines: src/linux/installer/make-deb.py
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ def create_copyright_file():
153153
copyright = re.sub("[\r\n]", "\n", copyright)
154154
copyright += "\n"
155155
copyright += "License: BSD 3-clause\n"
156-
with open(INSTALLER+"/../../../LICENSE.txt", "r") as f:
156+
with open(INSTALLER+"/../../../License", "r") as f:
157157
license = f.readlines()
158158
for line in license:
159159
if not len(re.sub("\s+", "", line)):
Collapse file

‎src/linux/installer/make-setup.py‎

Copy file name to clipboardExpand all lines: src/linux/installer/make-setup.py
+4-4Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,10 @@ def main():
8282
print("Creating package dir")
8383
os.mkdir(package_dir)
8484

85+
print("Copying License file")
86+
shutil.copy("../../../License", package_dir)
87+
88+
8589
print("Creating README.txt from template")
8690
with open(setup_dir+"/README.txt", "w") as f:
8791
f.write(README_CONTENT)
@@ -116,10 +120,6 @@ def main():
116120
shutil.move(package_dir+"/kivy-select-boxes",
117121
package_dir+"/examples/kivy-select-boxes")
118122

119-
#kivy_select_boxes_dir = package_dir+"/examples/kivy-select-boxes/"
120-
#ret = os.system("cp -rf "+kivy_select_boxes_dir+"/* "+package_dir+"/wx/")
121-
#assert ret == 0
122-
123123
print("Creating wx dir in package dir")
124124
os.mkdir(package_dir+"/wx/")
125125

Collapse file

‎src/linux/installer/setup.py.template‎

Copy file name to clipboardExpand all lines: src/linux/installer/setup.py.template
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ setup(
8787
'wx/*.txt',
8888
'wx/images/*.png',
8989
'*.txt',
90+
'License',
9091
'cefclient',
9192
'subprocess',
9293
'*.so',

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.