From e24355110a908af9fc95ac0fd4c2754562a125ec Mon Sep 17 00:00:00 2001
From: Ruben Pollan <meskio@sindominio.net>
Date: Mon, 25 Jun 2018 18:39:49 +0200
Subject: [PATCH] [feat] rename bitmask_go to standalone
---
Makefile | 10 +++++-----
bitmaskd.go | 2 +-
bitmask_go.go => standalone.go | 6 +++---
{bitmask_go => standalone}/bonafide.go | 0
{bitmask_go => standalone}/bonafide_test.go | 0
{bitmask_go => standalone}/launcher_linux.go | 0
{bitmask_go => standalone}/launcher_windows.go | 0
{bitmask_go => standalone}/main.go | 0
{bitmask_go => standalone}/status.go | 0
{bitmask_go => standalone}/vpn.go | 0
10 files changed, 9 insertions(+), 9 deletions(-)
rename bitmask_go.go => standalone.go (88%)
rename {bitmask_go => standalone}/bonafide.go (100%)
rename {bitmask_go => standalone}/bonafide_test.go (100%)
rename {bitmask_go => standalone}/launcher_linux.go (100%)
rename {bitmask_go => standalone}/launcher_windows.go (100%)
rename {bitmask_go => standalone}/main.go (100%)
rename {bitmask_go => standalone}/status.go (100%)
rename {bitmask_go => standalone}/vpn.go (100%)
diff --git a/Makefile b/Makefile
index ef69b505..34542321 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,11 @@
-.PHONY: all get build build_go icon locales generate_locales clean
+.PHONY: all get build standalone icon locales generate_locales clean
TAGS ?= gtk_3_18
all: icon locales get build
get:
- go get -tags $(TAGS) . ./bitmask_go
+ go get -tags $(TAGS) . ./standalone
build:
go build -tags $(TAGS) -ldflags "-X main.version=`git describe --tags`"
@@ -13,11 +13,11 @@ build:
test:
go test -tags $(TAGS) ./...
-build_go:
- go build -tags "$(TAGS) bitmask_go" -ldflags "-X main.version=`git describe --tags`"
+standalone:
+ go build -tags "$(TAGS) standalone" -ldflags "-X main.version=`git describe --tags`"
build_win:
- go build -tags "bitmask_go" -ldflags "-H windowsgui"
+ go build -tags "standalone" -ldflags "-H windowsgui"
clean:
make -C icon clean
diff --git a/bitmaskd.go b/bitmaskd.go
index aa94ca0d..cb67b8bf 100644
--- a/bitmaskd.go
+++ b/bitmaskd.go
@@ -1,4 +1,4 @@
-// +build !bitmask_go
+// +build !standalone
// Copyright (C) 2018 LEAP
//
// This program is free software: you can redistribute it and/or modify
diff --git a/bitmask_go.go b/standalone.go
similarity index 88%
rename from bitmask_go.go
rename to standalone.go
index 38ec2893..cda78f85 100644
--- a/bitmask_go.go
+++ b/standalone.go
@@ -1,4 +1,4 @@
-// +build bitmask_go
+// +build standalone
// Copyright (C) 2018 LEAP
//
// This program is free software: you can redistribute it and/or modify
@@ -18,9 +18,9 @@ package main
import (
"0xacab.org/leap/bitmask-systray/bitmask"
- bitmask_go "0xacab.org/leap/bitmask-systray/bitmask_go"
+ standalone "0xacab.org/leap/bitmask-systray/standalone"
)
func initBitmask() (bitmask.Bitmask, error) {
- return bitmask_go.Init()
+ return standalone.Init()
}
diff --git a/bitmask_go/bonafide.go b/standalone/bonafide.go
similarity index 100%
rename from bitmask_go/bonafide.go
rename to standalone/bonafide.go
diff --git a/bitmask_go/bonafide_test.go b/standalone/bonafide_test.go
similarity index 100%
rename from bitmask_go/bonafide_test.go
rename to standalone/bonafide_test.go
diff --git a/bitmask_go/launcher_linux.go b/standalone/launcher_linux.go
similarity index 100%
rename from bitmask_go/launcher_linux.go
rename to standalone/launcher_linux.go
diff --git a/bitmask_go/launcher_windows.go b/standalone/launcher_windows.go
similarity index 100%
rename from bitmask_go/launcher_windows.go
rename to standalone/launcher_windows.go
diff --git a/bitmask_go/main.go b/standalone/main.go
similarity index 100%
rename from bitmask_go/main.go
rename to standalone/main.go
diff --git a/bitmask_go/status.go b/standalone/status.go
similarity index 100%
rename from bitmask_go/status.go
rename to standalone/status.go
diff --git a/bitmask_go/vpn.go b/standalone/vpn.go
similarity index 100%
rename from bitmask_go/vpn.go
rename to standalone/vpn.go
--
GitLab