From b507cdb0e1f6ae2f22558103a50f35b261509f4f Mon Sep 17 00:00:00 2001 From: cyBerta <cyberta@riseup.net> Date: Tue, 9 Jul 2024 17:06:59 +0200 Subject: [PATCH] rename references to bitmaskcore to bitmask-core-andrdoid, adapt module name --- build_core.sh | 12 ++++++------ build_core_dev.sh | 14 +++++++------- go.mod | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/build_core.sh b/build_core.sh index ba1183d..8223a46 100755 --- a/build_core.sh +++ b/build_core.sh @@ -116,20 +116,20 @@ else fi -showtitle "Building Bitmask core as full aar" +showtitle "Building Bitmask Core Android as full aar" gomobile bind -x -target android -ldflags="-s -w" -tags=netcgo -androidapi=21 -v -trimpath -o lib/bitmaskcore.aar ./obfsvpn/client/ ./motd ./IPtProxy/IPtProxy.go -showtitle "Building Bitmask web core as full aar including pgpverify" +showtitle "Building Bitmask Core Android Web as full aar including pgpverify" gomobile bind -x -target='android' -ldflags="-s -w" -androidapi=21 -v -tags=netcgo -trimpath -o ./lib/bitmaskcore_web.aar -v ./pgpverify ./obfsvpn/client ./IPtProxy/IPtProxy.go ./motd -showtitle "Building Bitmask core for armv7" +showtitle "Building Bitmask Core Android for armv7" gomobile bind -target='android/arm' -ldflags="-s -w" -androidapi=21 -v -tags=netcgo -trimpath -o ./lib/bitmaskcore_arm.aar -v ./obfsvpn/client ./IPtProxy/IPtProxy.go ./motd -showtitle "Building Bitmask core for x86" +showtitle "Building Bitmask Core Android for x86" gomobile bind -target='android/386' -ldflags="-s -w" -androidapi=21 -v -tags=netcgo -trimpath -o ./lib/bitmaskcore_x86.aar -v ./obfsvpn/client ./IPtProxy/IPtProxy.go ./motd -showtitle "Building Bitmask core for arm64" +showtitle "Building Bitmask Core Android for arm64" gomobile bind -target='android/arm64' -ldflags="-s -w" -androidapi=21 -v -tags=netcgo -trimpath -o ./lib/bitmaskcore_arm64.aar -v ./obfsvpn/client ./IPtProxy/IPtProxy.go ./motd -showtitle "Building Bitmask core for x86_64" +showtitle "Building Bitmask Core Android for x86_64" gomobile bind -target='android/amd64' -ldflags="-s -w" -androidapi=21 -v -tags=netcgo -trimpath -o ./lib/bitmaskcore_x86_64.aar -v ./obfsvpn/client ./IPtProxy/IPtProxy.go ./motd diff --git a/build_core_dev.sh b/build_core_dev.sh index 97d20f4..21c8697 100755 --- a/build_core_dev.sh +++ b/build_core_dev.sh @@ -1,6 +1,6 @@ #!/bin/bash -# This script is meant to be used during development of any component related to bitmaskcore +# This script is meant to be used during development of any component related to bitmask-core-android # Make sure you have run build_core.sh at least once before using this script, so that # golang dev environment is correctly setup, all patches have been applied to the submodules etc. # This script only builds the different go submodules together as they are currently checked out. @@ -122,22 +122,22 @@ else fi -showtitle "Building Bitmask core as full aar" +showtitle "Building Bitmask Core Android as full aar" gomobile bind -x -target android -ldflags="-s -w" -tags=netcgo -androidapi=21 -v -trimpath -o lib/bitmaskcore.aar ./obfsvpn/client/ ./motd ./IPtProxy/IPtProxy.go -showtitle "Building Bitmask web core as full aar including pgpverify" +showtitle "Building Bitmask Core Android Web as full aar including pgpverify" gomobile bind -x -target='android' -ldflags="-s -w" -androidapi=21 -v -tags=netcgo -trimpath -o ./lib/bitmaskcore_web.aar -v ./pgpverify ./obfsvpn/client ./IPtProxy/IPtProxy.go ./motd -showtitle "Building Bitmask core for armv7" +showtitle "Building Bitmask Core Android for armv7" gomobile bind -target='android/arm' -ldflags="-s -w" -androidapi=21 -v -tags=netcgo -trimpath -o ./lib/bitmaskcore_arm.aar -v ./obfsvpn/client ./IPtProxy/IPtProxy.go ./motd -showtitle "Building Bitmask core for x86" +showtitle "Building Bitmask Core Android for x86" gomobile bind -target='android/386' -ldflags="-s -w" -androidapi=21 -v -tags=netcgo -trimpath -o ./lib/bitmaskcore_x86.aar -v ./obfsvpn/client ./IPtProxy/IPtProxy.go ./motd -showtitle "Building Bitmask core for arm64" +showtitle "Building Bitmask Core Android for arm64" gomobile bind -target='android/arm64' -ldflags="-s -w" -androidapi=21 -v -tags=netcgo -trimpath -o ./lib/bitmaskcore_arm64.aar -v ./obfsvpn/client ./IPtProxy/IPtProxy.go ./motd -showtitle "Building Bitmask core for x86_64" +showtitle "Building Bitmask Core Android for x86_64" gomobile bind -target='android/amd64' -ldflags="-s -w" -androidapi=21 -v -tags=netcgo -trimpath -o ./lib/bitmaskcore_x86_64.aar -v ./obfsvpn/client ./IPtProxy/IPtProxy.go ./motd if [[ "bitmask_android" == `pwd | rev | cut -d / -f 2 | rev` ]]; then diff --git a/go.mod b/go.mod index 0b9b77b..d3b0bca 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module org.0xacab/leap/bitmaskcore +module 0xacab.org/leap/bitmask-core-android go 1.22.2 -- GitLab