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
Vladimir KozLove
bitmask-vpn
Commits
d64f4542
Unverified
Commit
d64f4542
authored
5 years ago
by
Kali Kaneko
Browse files
Options
Downloads
Patches
Plain Diff
[pkg] do not copy binaries for osx on prepare step
parent
04c7f9b4
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
+4
-3
4 additions, 3 deletions
Makefile
branding/templates/osx/generate.py
+4
-3
4 additions, 3 deletions
branding/templates/osx/generate.py
pkg/config/config.go
+1
-1
1 addition, 1 deletion
pkg/config/config.go
with
9 additions
and
7 deletions
Makefile
+
4
−
3
View file @
d64f4542
...
...
@@ -65,7 +65,7 @@ build_win:
clean
:
@
rm
-f
build/
${
PROVIDER
}
/bin/bitmask-
*
@
rm
-
r
f
build/
@
unlink
branding/assets/default
#########################################################################
...
...
@@ -99,7 +99,7 @@ tgz:
@
chmod
+x
$(
TGZ_PATH
)
/helpers/bitmask-root
@
wget
-O
$(
TGZ_PATH
)
/helpers/se.leap.bitmask.policy https://0xacab.org/leap/bitmask-dev/raw/master/src/leap/bitmask/vpn/helpers/linux/se.leap.bitmask.policy
@
cd
build/
&&
tar
cvzf bitmask-vpn_
$(
VERSION
)
.tgz
${
TGZ_NAME
}
@
rm
-f
$(
TGZ_PATH
)
@
rm
-
r
f
$(
TGZ_PATH
)
gen_pkg_win
:
@
mkdir
-p
build/
${
PROVIDER
}
/windows/
...
...
@@ -142,7 +142,8 @@ gen_pkg_deb:
# packaging action
#########################################################################
packages
:
pkg_snap pkg_deb pkg_osx pkg_win
packages
:
package_deb package_osx package_win
# package_snap
package_snap
:
@
make
-C
build/
${
PROVIDER
}
pkg_snap
...
...
This diff is collapsed.
Click to expand it.
branding/templates/osx/generate.py
+
4
−
3
View file @
d64f4542
...
...
@@ -98,9 +98,10 @@ with open(APP_PATH + "/Contents/PkgInfo", "w") as f:
# 3. Copy the binary payloads
# --------------------------------------------
copy_payload
(
ENTRYPOINT
)
copy_payload
(
HELPER
)
copy_payload
(
OPENVPN
,
destfile
=
'
/Contents/Resources/openvpn.leap
'
)
# TODO ------------------------ move this to makefile
# copy_payload(ENTRYPOINT)
# copy_payload(HELPER)
# copy_payload(OPENVPN, destfile='/Contents/Resources/openvpn.leap')
# 4. Copy the app icon from the assets folder
# -----------------------------------------------
...
...
This diff is collapsed.
Click to expand it.
pkg/config/config.go
+
1
−
1
View file @
d64f4542
// Code generated by go generate; DO NOT EDIT.
// This file was generated by vendorize.py
// At 2019-08-06 1
7:57:4
8
// At 2019-08-06 1
9:25:0
8
package
config
...
...
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