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
ea112704
Unverified
Commit
ea112704
authored
4 years ago
by
Kali Kaneko
Committed by
meskio
4 years ago
Browse files
Options
Downloads
Patches
Plain Diff
[pkg] check for qtinstaller framework
parent
f1fc8004
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
Makefile
+14
-3
14 additions, 3 deletions
Makefile
with
14 additions
and
3 deletions
Makefile
+
14
−
3
View file @
ea112704
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
# (c) LEAP Encryption Access Project, 2019-2020
# (c) LEAP Encryption Access Project, 2019-2020
#########################################################################
#########################################################################
.PHONY
:
all get build icon locales generate_locales clean
.PHONY
:
all get build icon locales generate_locales clean
check_qtifw HAS-qtifw
XBUILD
?=
no
XBUILD
?=
no
SKIP_CACHECK
?=
no
SKIP_CACHECK
?=
no
...
@@ -28,6 +28,8 @@ SCRIPTS = branding/scripts
...
@@ -28,6 +28,8 @@ SCRIPTS = branding/scripts
all
:
icon locales helper build
all
:
icon locales helper build
HAS_QTIFW
:=
$(
shell
PATH
=
$(
PATH
)
which binarycreator
)
#########################################################################
#########################################################################
# go build
# go build
...
@@ -79,12 +81,18 @@ else
...
@@ -79,12 +81,18 @@ else
@gui/build.sh
@gui/build.sh
endif
endif
build_installer
:
build
build_installer
:
check_qtifw build
# TODO check for binarycreator in path
cp
-r
qtbuild/release/
${
PROVIDER
}
-vpn
.app installer/packages/
${
PROVIDER
}
vpn/data/
cp
-r
qtbuild/release/
${
PROVIDER
}
-vpn
.app installer/packages/
${
PROVIDER
}
vpn/data/
cp
build/bin/
${
PLATFORM
}
/bitmask-helper installer/packages/
${
PROVIDER
}
vpn/data/
cp
build/bin/
${
PLATFORM
}
/bitmask-helper installer/packages/
${
PROVIDER
}
vpn/data/
cd
installer
&&
qmake
&&
make
cd
installer
&&
qmake
&&
make
check_qtifw
:
ifdef
HAS_QTIFW
@
echo
"[+] Found QTIFW"
else
$(
error
"[!] Cannot find QTIFW. Please install it and add it to your PATH"
)
endif
# ----------- FIXME ------- old build, reuse or delete -----------------------------
# ----------- FIXME ------- old build, reuse or delete -----------------------------
CROSS_WIN_FLAGS
=
CGO_ENABLED
=
1
GOARCH
=
386
GOOS
=
windows
CC
=
"/usr/bin/i686-w64-mingw32-gcc"
CGO_LDFLAGS
=
"-lssp"
CXX
=
"i686-w64-mingw32-c++"
CROSS_WIN_FLAGS
=
CGO_ENABLED
=
1
GOARCH
=
386
GOOS
=
windows
CC
=
"/usr/bin/i686-w64-mingw32-gcc"
CGO_LDFLAGS
=
"-lssp"
CXX
=
"i686-w64-mingw32-c++"
...
@@ -113,6 +121,9 @@ _build_xbuild_done:
...
@@ -113,6 +121,9 @@ _build_xbuild_done:
# --------- FIXME -----------------------------------------------------------------------
# --------- FIXME -----------------------------------------------------------------------
clean
:
clean
:
@
rm
-rf
installer/
*
.app
@
rm
-rf
installer/packages/
${
PROVIDER
}
vpn/data/
*
.app
@
rm
-rf
installer/packages/
${
PROVIDER
}
vpn/data/bitmask-helper
@
rm
-rf
build/
@
rm
-rf
build/
@
unlink
branding/assets/default
@
unlink
branding/assets/default
...
...
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