almet/dangerzone
1
0
Fork 0
mirror of https://github.com/freedomofpress/dangerzone.git synced 2025-04-28 18:02:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Remove git submodule, and all references to the container

Browse source
This commit is contained in:
Micah Lee 2020-02-27 15:21:30 -08:00
parent 389f9db421
commit e7f5ce0c38
No known key found for this signature in database
GPG key ID: 403C2657CD994F73
7 changed files with 3 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitmodules vendored
View file

@ -1,3 +0,0 @@
[submodule "share/container"]
path = share/container
url = git@github.com:firstlookmedia/dangerzone-converter.git

7
BUILD.md
View file

@ -1,12 +1,5 @@
# Development environment # Development environment
After cloning this git repo, make sure to checkout the git submodules.
```
git submodule init
git submodule update
```
## Debian/Ubuntu ## Debian/Ubuntu
Install dependencies: Install dependencies:

4
RELEASE.md
View file

@ -18,12 +18,10 @@ git fetch
git tag -v v$VERSION git tag -v v$VERSION
``` ```
If the tag verifies successfully, check it out, and also its submodules: If the tag verifies successfully and check it out:
``` ```
git checkout v$VERSION git checkout v$VERSION
git submodule init
git submodule update
``` ```
## macOS release ## macOS release

2
install/pyinstaller/pyinstaller.spec
View file

@ -16,7 +16,7 @@ sys.path.insert(0, root)
import dangerzone import dangerzone
version = dangerzone.dangerzone_version version = dangerzone.dangerzone_version
print("Flock Agent version: {}".format(version)) print("Dangerzone version: {}".format(version))
if p == "Darwin": if p == "Darwin":
datas = [("../../share", "share"), ("../macos/../macos/document.icns", ".")] datas = [("../../share", "share"), ("../macos/../macos/document.icns", ".")]

23
install/windows/Dangerzone.wxs
View file

@ -40,11 +40,7 @@
<Directory Id="FolderPyQt5QtTranslations" Name="translations" /> <Directory Id="FolderPyQt5QtTranslations" Name="translations" />
</Directory> </Directory>
</Directory> </Directory>
<Directory Id="FolderShare" Name="share"> <Directory Id="FolderShare" Name="share" />
<Directory Id="FolderShareContainer" Name="container">
<Directory Id="FolderShareContainerScripts" Name="scripts" />
</Directory>
</Directory>
<Directory Id="FolderWin32com" Name="win32com"> <Directory Id="FolderWin32com" Name="win32com">
<Directory Id="FolderWin32comShell" Name="shell" /> <Directory Id="FolderWin32comShell" Name="shell" />
</Directory> </Directory>
@ -202,23 +198,6 @@
</Component> </Component>
</DirectoryRef> </DirectoryRef>
<DirectoryRef Id="FolderShareContainer">
<Component Id="FolderComponentShareContainer" Guid="4a3e5a58-8804-40eb-8216-5f0d75e8afa2">
<File Source="..\..\dist\dangerzone\share\container\Dockerfile" />
<File Source="..\..\dist\dangerzone\share\container\LICENSE" />
<File Source="..\..\dist\dangerzone\share\container\README.md" />
</Component>
</DirectoryRef>
<DirectoryRef Id="FolderShareContainerScripts">
<Component Id="FolderComponentShareContainerScripts" Guid="863a148f-b0cd-404f-ab59-fc29d5961786">
<File Source="..\..\dist\dangerzone\share\container\scripts\document-to-pixels" />
<File Source="..\..\dist\dangerzone\share\container\scripts\document-to-pixels-unpriv" />
<File Source="..\..\dist\dangerzone\share\container\scripts\pixels-to-pdf" />
<File Source="..\..\dist\dangerzone\share\container\scripts\pixels-to-pdf-unpriv" />
</Component>
</DirectoryRef>
<DirectoryRef Id="FolderWin32comShell"> <DirectoryRef Id="FolderWin32comShell">
<Component Id="FolderComponentWin32comShell" Guid="b51f7768-64f2-4666-a919-736a6ae6c332"> <Component Id="FolderComponentWin32comShell" Guid="b51f7768-64f2-4666-a919-736a6ae6c332">
<File Source="..\..\dist\dangerzone\win32com\shell\shell.pyd" /> <File Source="..\..\dist\dangerzone\win32com\shell\shell.pyd" />

2
setup.py
View file

@ -29,8 +29,6 @@ setuptools.setup(
["install/linux/media.firstlook.dangerzone.png"], ["install/linux/media.firstlook.dangerzone.png"],
), ),
("share/dangerzone", file_list("share")), ("share/dangerzone", file_list("share")),
("share/dangerzone/container", file_list("share/container")),
("share/dangerzone/container/scripts", file_list("share/container/scripts")),
], ],
classifiers=[ classifiers=[
"Programming Language :: Python", "Programming Language :: Python",

1
share/container

@ -1 +0,0 @@
Subproject commit 9de7f4cd81e71df0dcea4c4f9a76bee6a27cb234