Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
bitmask-vpn
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Julian Merlin
bitmask-vpn
Commits
b04607a7
Unverified
Commit
b04607a7
authored
4 years ago
by
kali
Committed by
Kali Kaneko
4 years ago
Browse files
Options
Downloads
Patches
Plain Diff
[pkg] add windows release target
Also, install the tap driver silently. - Resolves:
#366
parent
3dc345bc
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
Makefile
+6
-2
6 additions, 2 deletions
Makefile
branding/templates/qtinstaller/packages/bitmaskvpn/meta/install.js
+3
-3
3 additions, 3 deletions
...templates/qtinstaller/packages/bitmaskvpn/meta/install.js
docs/build.windows.rst
+4
-0
4 additions, 0 deletions
docs/build.windows.rst
with
13 additions
and
5 deletions
Makefile
+
6
−
2
View file @
b04607a7
...
...
@@ -119,14 +119,14 @@ ifeq (${PLATFORM}, windows)
"c:
\w
indows
\s
ystem32
\r
cedit.exe"
${
QTBUILD
}
/release/
${
TARGET
}
.exe
--set-file-version
${
VERSION
}
"c:
\w
indows
\s
ystem32
\r
cedit.exe"
${
QTBUILD
}
/release/
${
TARGET
}
.exe
--set-product-version
${
VERSION
}
"c:
\w
indows
\s
ystem32
\r
cedit.exe"
${
QTBUILD
}
/release/
${
TARGET
}
.exe
--set-version-string
CompanyName
"LEAP Encryption Access Project"
"c:
\w
indows
\s
ystem32
\r
cedit.exe"
${
QTBUILD
}
/release/
${
TARGET
}
.exe
--set-version-string
FileDescription
"
VPN Application provided by
${
PROVIDER
}
"
"c:
\w
indows
\s
ystem32
\r
cedit.exe"
${
QTBUILD
}
/release/
${
TARGET
}
.exe
--set-version-string
FileDescription
"
${
APPNAME
}
"
"c:
\w
indows
\s
ystem32
\s
igntool.exe"
sign
-debug
-f
"z:
\l
eap
\L
EAP.pfx"
-p
${
WINCERTPASS
}
${
QTBUILD
}
/release/
${
TARGET
}
.exe
cp
build/bin/
${
PLATFORM
}
/bitmask-helper build/bin/
${
PLATFORM
}
/bitmask-helper.exe
"c:
\w
indows
\s
ystem32
\r
cedit.exe"
build/bin/
${
PLATFORM
}
/bitmask-helper.exe
--set-file-version
${
VERSION
}
"c:
\w
indows
\s
ystem32
\r
cedit.exe"
build/bin/
${
PLATFORM
}
/bitmask-helper.exe
--set-product-version
${
VERSION
}
"c:
\w
indows
\s
ystem32
\r
cedit.exe"
build/bin/
${
PLATFORM
}
/bitmask-helper.exe
--set-version-string
ProductName
"bitmask-helper-v2"
"c:
\w
indows
\s
ystem32
\r
cedit.exe"
build/bin/
${
PLATFORM
}
/bitmask-helper.exe
--set-version-string
CompanyName
"LEAP Encryption Access Project"
"c:
\w
indows
\s
ystem32
\r
cedit.exe"
build/bin/
${
PLATFORM
}
/bitmask-helper.exe
--set-version-string
FileDescription
"Administrative helper for
${
TARGET
}
"
"c:
\w
indows
\s
ystem32
\r
cedit.exe"
build/bin/
${
PLATFORM
}
/bitmask-helper.exe
--set-version-string
FileDescription
"Administrative helper for
${
APPNAME
}
"
"c:
\w
indows
\s
ystem32
\s
igntool.exe"
sign
-debug
-f
"z:
\l
eap
\L
EAP.pfx"
-p
${
WINCERTPASS
}
build/bin/
${
PLATFORM
}
/bitmask-helper.exe
endif
...
...
@@ -289,6 +289,10 @@ builder_image:
packages
:
package_deb package_snap package_osx package_win
package_win_release
:
build dosign installer sign_installer
package_win
:
build installer
package_snap_in_docker
:
@
make
-C
docker package_snap
...
...
This diff is collapsed.
Click to expand it.
branding/templates/qtinstaller/packages/bitmaskvpn/meta/install.js
+
3
−
3
View file @
b04607a7
...
...
@@ -91,9 +91,9 @@ Component.prototype.installationFinished = function()
}
function
postInstallWindows
()
{
console
.
log
(
"
Trying to i
nstall OpenVPN tap driver
"
);
component
.
addElevatedOperation
(
"
Execute
"
,
"
@TargetDir@/tap-windows.exe
"
);
/* TODO uninstall? */
console
.
log
(
"
Now trying to install
er
our helper
"
);
console
.
log
(
"
I
nstall
ing
OpenVPN tap driver
"
);
component
.
addElevatedOperation
(
"
Execute
"
,
"
@TargetDir@/tap-windows.exe
"
,
"
/S
"
,
"
/SELECT_UTILITIES=1
"
);
/* TODO uninstall? */
console
.
log
(
"
Now trying to install our helper
"
);
component
.
addElevatedOperation
(
"
Execute
"
,
"
@TargetDir@/helper.exe
"
,
"
install
"
,
"
UNDOEXECUTE
"
,
"
@TargetDir@/helper.exe
"
,
"
remove
"
);
component
.
addElevatedOperation
(
"
Execute
"
,
"
@TargetDir@/helper.exe
"
,
"
start
"
,
"
UNDOEXECUTE
"
,
"
@TargetDir@/helper.exe
"
,
"
stop
"
);
console
.
log
(
"
Adding shortcut entries/...
"
);
...
...
This diff is collapsed.
Click to expand it.
docs/build.windows.rst
+
4
−
0
View file @
b04607a7
...
...
@@ -44,6 +44,10 @@ the steps to do release signatures are::
make installer
make sign_installer
or alltogether as::
make package_win_release
unreviewed notes
----------------
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment