Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
bitmask-vpn
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Package Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
th
bitmask-vpn
Commits
e35caad6
Unverified
Commit
e35caad6
authored
Nov 21, 2020
by
Kali Kaneko
Committed by
Kali Kaneko
Nov 21, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[pkg] add notarization steps for installer in osx
parent
e8399d24
Pipeline
#49489
passed with stages
in 9 minutes and 26 seconds
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
38 additions
and
4 deletions
+38
-4
Makefile
Makefile
+32
-4
bitmask.pro
bitmask.pro
+2
-0
branding/templates/qtinstaller/config/config.xml
branding/templates/qtinstaller/config/config.xml
+1
-0
branding/templates/qtinstaller/installer.pro
branding/templates/qtinstaller/installer.pro
+3
-0
No files found.
Makefile
View file @
e35caad6
...
...
@@ -13,6 +13,8 @@ TARGET ?= $(shell VENDOR_PATH=${VENDOR_PATH} branding/scripts/getparam binname |
PROVIDER
?=
$(
shell
grep
^
'provider ='
${VENDOR_PATH}
/vendor.conf |
cut
-d
'='
-f
2 |
tr
-d
"[:space:]"
)
VERSION
?=
$(
shell
git describe
)
WINCERTPASS
?=
pass
OSXAPPPASS
?=
pass
OSXMORDORUID
?=
uid
# go paths
GOPATH
=
$(
shell
go
env
GOPATH
)
...
...
@@ -30,9 +32,8 @@ endif
QTBUILD
=
build/qt
INSTALLER
=
build/installer
INST_DATA
=
${INSTALLER}
/packages/bitmaskvpn/data/
OSX_CERT
=
"Developer ID Installer: LEAP Encryption Access Project"
MACDEPLOYQT_OPTS
=
-appstore-compliant
-qmldir
=
gui/qml
-always-overwrite
# XXX expired cert -codesign="${OSX_CERT}"
OSX_CERT
=
"Developer ID Application: LEAP Encryption Access Project"
MACDEPLOYQT_OPTS
=
-appstore-compliant
-qmldir
=
gui/qml
-always-overwrite
-codesign
=
"
${OSX_CERT}
"
SCRIPTS
=
branding/scripts
TEMPLATES
=
branding/templates
...
...
@@ -67,7 +68,7 @@ dependsLinux:
@
# debian needs also: snap install snapcraft --classic; snap install multipass --beta --classic
dependsDarwin
:
@
brew
install
python3 golang make pkg-config curl
@
brew
install
python3 golang make pkg-config curl
create-dmg
@
brew
install
--default-names
gnu-sed
dependsCYGWIN_NT-10.0
:
...
...
@@ -214,6 +215,33 @@ ifeq (${PLATFORM}, windows)
# TODO add flag to skip signing for regular builds
"c:
\w
indows
\s
ystem32
\s
igntool.exe"
sign
-f
"z:
\l
eap
\L
EAP.pfx"
-p
${WINCERTPASS}
build/installer/
${APPNAME}
-installer-
${VERSION}
.exe
endif
ifeq
(${PLATFORM}, darwin)
gsed
-i
"s/com.yourcompany.installerbase/se.leap.bitmask.
${TARGET}
/g"
build/installer/
${APPNAME}
-installer-
${VERSION}
.app/Contents/Info.plist
codesign
-s
${OSX_CERT}
--options
"runtime"
build/installer/
${APPNAME}
-installer-
${VERSION}
.app
ditto
-ck
--rsrc
--sequesterRsrc
build/installer/
${APPNAME}
-installer-
${VERSION}
.app build/installer/
${APPNAME}
-installer-
${VERSION}
.zip
endif
notarize_installer
:
# courtesy of https://skyronic.com/2019/07/app-notarization-for-qt-applications/
ifeq
(${PLATFORM}, darwin)
xcrun
altool
--notarize-app
-t
osx
-f
build/installer/${APPNAME}-installer-${VERSION}.zip
--primary-bundle-id
=
"se.leap.bitmask.
${TARGET}
"
-u
"info@leap.se"
-p
${OSXAPPPASS}
endif
notarize_check
:
ifeq
(${PLATFORM}, darwin)
xcrun altool
--notarization-info
${OSXMORDORUID}
-u
"info@leap.se"
-p
${OSXAPPPASS}
endif
notarize_staple
:
ifeq
(${PLATFORM}, darwin)
xcrun stapler staple build/installer/
${APPNAME}
-installer-
${VERSION}
.app
endif
create_dmg
:
ifeq
(${PLATFORM}, darwin)
@
create-dmg deploy/
${APPNAME}
-
${VERSION}
.dmg build/installer/
${APPNAME}
-installer-
${VERSION}
.app
endif
check_qtifw
:
ifdef
HAS_QTIFW
...
...
bitmask.pro
View file @
e35caad6
...
...
@@ -5,6 +5,8 @@ windows:CONFIG -= console
unix
:
DEBUG
:
CONFIG
+=
debug
lessThan
(
QT_MAJOR_VERSION
,
5
)
:
error
(
"requires Qt 5"
)
QMAKE_MACOSX_DEPLOYMENT_TARGET
=
10.11
QMAKE_TARGET_BUNDLE_PREFIX
=
se
.
leap
QMAKE_BUNDLE
=
$$
TARGET
!
defined
(
VENDOR_PATH
,
var
)
:
VENDOR_PATH
=
"providers/riseup"
...
...
branding/templates/qtinstaller/config/config.xml
View file @
e35caad6
...
...
@@ -4,6 +4,7 @@
<Version>
$VERSION
</Version>
<Title>
$APPNAME Installer ($VERSION)
</Title>
<Publisher>
LEAP Encryption Access Project
</Publisher>
<ProductUrl>
https://leap.se
</ProductUrl>
<AllowNonAsciiCharacters>
false
</AllowNonAsciiCharacters>
<Logo>
installer-logo.png
</Logo>
<InstallerApplicationIcon>
installer-icon
</InstallerApplicationIcon>
...
...
branding/templates/qtinstaller/installer.pro
View file @
e35caad6
!
defined
(
INSTALLER
,
var
)
:
INSTALLER
=
"BitmaskVPN-Installer-git"
!
defined
(
TARGET
,
var
)
:
TARGET
=
"bitmask-vpn"
TEMPLATE
=
aux
CONFIG
-=
debug_and_release
...
...
@@ -8,6 +9,8 @@ inst.output = $$INSTALLER
inst
.
commands
=
binarycreator
--
ignore
-
translations
-
c
$$
PWD
/
config
/
config
.
xml
-
p
$$
PWD
/
packages
$
{
QMAKE_FILE_OUT
}
inst
.
CONFIG
+=
target_predeps
no_link
combine
QMAKE_TARGET_BUNDLE_PREFIX
=
se
.
leap
QMAKE_BUNDLE
=
$$
TARGET
QMAKE_EXTRA_COMPILERS
+=
inst
OTHER_FILES
+=
\
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment