diff options
| author | Micah Lee <micah@micahflee.com> | 2018-06-17 16:43:38 -0700 |
|---|---|---|
| committer | Micah Lee <micah@micahflee.com> | 2018-06-17 16:43:38 -0700 |
| commit | a251dff670bf389c291e1b3aa1543de8d009cd1b (patch) | |
| tree | 2fb7a0618432184412be8a24be5102748faf4590 | |
| parent | 448bf2af4bdbc79d4ee18520b2afe1f985cdc8e6 (diff) | |
| download | onionshare-a251dff670bf389c291e1b3aa1543de8d009cd1b.tar.gz onionshare-a251dff670bf389c291e1b3aa1543de8d009cd1b.zip | |
Add onionshare license to licenses folder, and add licenses folder to PyInstaller spec, and to NSIS installer
| -rw-r--r-- | install/licenses/LICENSE.onionshare (renamed from share/license.txt) | 5 | ||||
| -rw-r--r-- | install/onionshare.nsi | 13 | ||||
| -rw-r--r-- | install/pyinstaller.spec | 1 |
3 files changed, 15 insertions, 4 deletions
diff --git a/share/license.txt b/install/licenses/LICENSE.onionshare index 1223e5a6..3d26a84e 100644 --- a/share/license.txt +++ b/install/licenses/LICENSE.onionshare @@ -1,4 +1,7 @@ -Copyright (C) 2017 Micah Lee <micah@micahflee.com> +OnionShare + +Copyright © 2018 + Micah Lee <micah@micahflee.com> GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007 diff --git a/install/onionshare.nsi b/install/onionshare.nsi index 4030636a..5470b4b6 100644 --- a/install/onionshare.nsi +++ b/install/onionshare.nsi @@ -162,6 +162,12 @@ Section "install" SetOutPath "$INSTDIR\lib2to3\tests\data" File "${BINPATH}\lib2to3\tests\data\README" + SetOutPath "$INSTDIR\licenses" + File "${BINPATH}\licenses\LICENSE.obfs4" + File "${BINPATH}\licenses\LICENSE.onionshare" + File "${BINPATH}\licenses\LICENSE.tor" + File "${BINPATH}\licenses\readme.txt" + SetOutPath "$INSTDIR\PyQt5\Qt\bin" File "${BINPATH}\PyQt5\Qt\bin\qt.conf" @@ -188,7 +194,6 @@ Section "install" File "${BINPATH}\PyQt5\Qt\plugins\printsupport\windowsprintersupport.dll" SetOutPath "$INSTDIR\share" - File "${BINPATH}\share\license.txt" File "${BINPATH}\share\torrc_template" File "${BINPATH}\share\torrc_template-windows" File "${BINPATH}\share\torrc_template-obfs4" @@ -351,6 +356,10 @@ FunctionEnd Delete "$INSTDIR\lib2to3\tests" Delete "$INSTDIR\lib2to3\tests\data" Delete "$INSTDIR\lib2to3\tests\data\README" + Delete "$INSTDIR\licenses\LICENSE.obfs4" + Delete "$INSTDIR\licenses\LICENSE.onionshare" + Delete "$INSTDIR\licenses\LICENSE.tor" + Delete "$INSTDIR\licenses\readme.txt" Delete "$INSTDIR\mfc140u.dll" Delete "$INSTDIR\MSVCP140.dll" Delete "$INSTDIR\onionshare-gui.exe" @@ -405,7 +414,6 @@ FunctionEnd Delete "$INSTDIR\share\images\settings.png" Delete "$INSTDIR\share\images\web_file.png" Delete "$INSTDIR\share\images\web_folder.png" - Delete "$INSTDIR\share\license.txt" Delete "$INSTDIR\share\locale\cs.json" Delete "$INSTDIR\share\locale\de.json" Delete "$INSTDIR\share\locale\en.json" @@ -466,6 +474,7 @@ FunctionEnd rmDir "$INSTDIR\lib2to3\tests\data" rmDir "$INSTDIR\lib2to3\tests" rmDir "$INSTDIR\lib2to3" + rmDir "$INSTDIR\licenses" rmDir "$INSTDIR\PyQt5\Qt\bin" rmDir "$INSTDIR\PyQt5\Qt\plugins\iconengines" rmDir "$INSTDIR\PyQt5\Qt\plugins\imageformats" diff --git a/install/pyinstaller.spec b/install/pyinstaller.spec index 6ca2fdbe..30553707 100644 --- a/install/pyinstaller.spec +++ b/install/pyinstaller.spec @@ -10,7 +10,6 @@ a = Analysis( pathex=['.'], binaries=None, datas=[ - ('../share/license.txt', 'share'), ('../share/version.txt', 'share'), ('../share/wordlist.txt', 'share'), ('../share/torrc_template', 'share'), |