summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkali <kali@win>2020-10-30 22:11:20 +0100
committerkali kaneko (leap communications) <kali@leap.se>2020-11-04 12:38:45 +0100
commitd3c7abb7eba8658667b0962cacc6ecd3526fc792 (patch)
tree442ae1703e9ddc03fa11c08d43fc48d893e3ac32
parentb04607a7d97d59c09ac563fd257930d7ce406ad5 (diff)
[bug] remove debug console in windows
squashed in this commit: reintroduce the dummy autostart_win implementation that was removed by mistake. I did not manage to get autostart working in windows, this is pending to be re-worked. see https://0xacab.org/leap/bitmask-vpn/-/issues/389
-rw-r--r--bitmask.pro2
-rw-r--r--docs/build.windows.rst3
-rwxr-xr-xgui/build.sh5
-rw-r--r--pkg/bitmask/autostart_win.go23
4 files changed, 24 insertions, 9 deletions
diff --git a/bitmask.pro b/bitmask.pro
index c9e95c6..e9b40db 100644
--- a/bitmask.pro
+++ b/bitmask.pro
@@ -1,7 +1,7 @@
#TARGET = $$BINARY_NAME
CONFIG += qt staticlib
-windows:CONFIG += console
+windows:CONFIG -= console
unix:DEBUG:CONFIG += debug
lessThan(QT_MAJOR_VERSION, 5): error("requires Qt 5")
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.11
diff --git a/docs/build.windows.rst b/docs/build.windows.rst
index 9ea1360..93e9d41 100644
--- a/docs/build.windows.rst
+++ b/docs/build.windows.rst
@@ -33,9 +33,6 @@ ask again.
adding metadata to binaries
---------------------------
-TODO: add metadata properly
-https://github.com/electron/rcedit/releases/tag/v1.1.1
-https://stackoverflow.com/questions/284258/how-do-i-set-the-version-information-for-an-existing-exe-dll
the steps to do release signatures are::
diff --git a/gui/build.sh b/gui/build.sh
index 17f76d4..c8433c1 100755
--- a/gui/build.sh
+++ b/gui/build.sh
@@ -58,11 +58,6 @@ function buildGoLib {
CGO_LDFLAGS="-g -O2 -mmacosx-version-min=$OSX_TARGET"
fi
- #if [ "$PLATFORM" == "MINGW64_NT-10.0" ]
- #then
- # LDFLAGS="-H windowsgui"
- #fi
-
if [ "$XBUILD" == "no" ]
then
echo "[+] Building Go library with standard Go compiler"
diff --git a/pkg/bitmask/autostart_win.go b/pkg/bitmask/autostart_win.go
new file mode 100644
index 0000000..51ac0cd
--- /dev/null
+++ b/pkg/bitmask/autostart_win.go
@@ -0,0 +1,23 @@
+// +build windows
+package bitmask
+
+// Workaround for broken autostart package on windows.
+
+type DummyAutostart struct{}
+
+func (a *DummyAutostart) Disable() error {
+ return nil
+}
+
+func (a *DummyAutostart) Enable() error {
+ return nil
+}
+
+type Autostart interface {
+ Disable() error
+ Enable() error
+}
+
+func NewAutostart(appName string, iconPath string) Autostart {
+ return &DummyAutostart{}
+}