jitpack: debug flavour

Author: ignoramous

Makefile

@@ -18,17 +18,17 @@ LINUX_BUILDDIR=$(BUILDDIR)/linux
 ANDROID_BUILD_CMD=env PATH=$(GOBIN):$(PATH) $(GOMOBILE) $(GOBIND) $(ANDROID23) \
 				-ldflags '-w -s' -gcflags='-trimpath=${HOME}' -asmflags='-trimpath=${HOME}'
 # built without stripping dwarf/symbols
-ANDROID_ARM64_BUILD_CMD=env PATH=$(GOBIN):$(PATH) $(GOMOBILE) $(GOBIND) $(ANDROID23)
+ANDROID_DEBUG_BUILD_CMD=env PATH=$(GOBIN):$(PATH) $(GOMOBILE) $(GOBIND) $(ANDROID23)
 # exported pkgs
 INTRA_BUILD_CMD=$(IMPORT_PATH)/intra $(IMPORT_PATH)/intra/backend $(IMPORT_PATH)/intra/rnet $(IMPORT_PATH)/intra/settings
 
 $(BUILDDIR)/intra/tun2socks.aar: $(GOMOBILE)
 	mkdir -p $(BUILDDIR)/intra
 	$(ANDROID_BUILD_CMD) -o $@ $(INTRA_BUILD_CMD)
 
-$(BUILDDIR)/intra/tun2socks-arm.aar: $(GOMOBILE)
+$(BUILDDIR)/intra/tun2socks-debug.aar: $(GOMOBILE)
 	mkdir -p $(BUILDDIR)/intra
-	$(ANDROID_ARM64_BUILD_CMD) -o $@ $(INTRA_BUILD_CMD)
+	$(ANDROID_DEBUG_BUILD_CMD) -o $@ $(INTRA_BUILD_CMD)
 
 $(BUILDDIR)/android/tun2socks.aar: $(GOMOBILE)
 	mkdir -p $(BUILDDIR)/android
@@ -65,7 +65,7 @@ android: $(BUILDDIR)/android/tun2socks.aar
 
 intra: $(BUILDDIR)/intra/tun2socks.aar
 
-intrarm: $(BUILDDIR)/intra/tun2socks-arm.aar
+intradebug: $(BUILDDIR)/intra/tun2socks-debug.aar
 
 apple: $(BUILDDIR)/apple/Tun2socks.xcframework
 

jitpack.yml

@@ -3,11 +3,11 @@ jdk:
 env:
   PACK: "aar"
   CLASSFULL: "full"
-  CLASSARM: "arm64"
+  CLASSDBG: "debug"
   FOUT: "firestack.aar"
-  FOUTARM: "firestack-arm.aar"
+  FOUTDBG: "firestack-debug.aar"
   BOUT: "build/intra/tun2socks.aar"
-  BOUTARM: "build/intra/tun2socks-arm.aar"
+  BOUTDBG: "build/intra/tun2socks-debug.aar"
   SOURCES: "build/intra/tun2socks-sources.jar"
 before_install:
 # - sdk install java 17.0.8-jbr

make-aar

@@ -12,18 +12,22 @@ set -eux
 # gitlab.com/fdroid/fdroiddata/-/blob/81c14003f/metadata/com.tailscale.ipn.yml
 # gitlab.com/fdroid/fdroiddata/-/blob/d6c5315a/metadata/org.calyxinstitute.vpn.yml
 
-# defaults
+# defaults; can be overridden for ex by jitpack.yml
 PACK="${PACK:-aar}"
+# final out
 FOUT="${FOUT:-firestack.aar}"
+FOUTDBG="${FOUTDBG:-firestack-debug.aar}"
+# build out
 BOUT="${BOUT:-build/intra/tun2socks.aar}"
-FOUTARM="${FOUTARM:-firestack-arm.aar}"
-BOUTARM="${BOUTARM:-build/intra/tun2socks-arm.aar}"
-# CLASSFULL="${CLASSFULL:-full}"
-CLASSARM="${CLASSARM:-arm64}"
+BOUTDBG="${BOUTDBG:-build/intra/tun2socks-debug.aar}"
+# artifact classifier
+CLASSFULL="${CLASSFULL:-full}" # unused
+CLASSDBG="${CLASSDBG:-debug}"
+# artifact bytecode sources
 SOURCES="${SOURCES:-build/intra/tun2socks-sources.jar}"
 
 ARG1="${1:-go}"
-ARG2="${2:-nodebug}"
+ARG2="${2:-debug}"
 
 # debug
 printenv
@@ -56,17 +60,16 @@ go env
 # gomobile aar
 
 if [ "$ARG2" = "debug" ]; then
-  make clean && make intra && make intraarm
+  # default: with debug builds
+  make clean && make intra && make intradebug
   # rename
   mv ./"$BOUT" ./"$FOUT"
-  mv ./"$BOUTARM" ./"$FOUTARM"
+  mv ./"$BOUTDBG" ./"$FOUTDBG"
 else
-  # default: disable arm (debug) builds
   make clean && make intra
   # rename
   mv ./"$BOUT" ./"$FOUT"
 fi
 
-
 # ls cwd
 ls -ltr

mvn-install

@@ -25,11 +25,11 @@ mvn install:install-file \
     -Dsources=${SOURCES}
 #    -Dclassifier=${CLASSFULL} \
 # usage: docs.gradle.org/current/userguide/dependency_management.html
-# mvn -X install:install-file \
-#    -Dfile=${FOUTARM} \
-#    -Dpackaging=${PACK} \
-#    -Dversion=${VERSION} \
-#    -DgroupId=${GROUP} \
-#    -DartifactId=${ARTIFACT} \
-#    -Dclassifier=${CLASSARM} \
-#    -Dsources=${SOURCES}
+mvn -X install:install-file \
+    -Dfile=${FOUTDBG} \
+    -Dpackaging=${PACK} \
+    -Dversion=${VERSION} \
+    -DgroupId=${GROUP} \
+    -DartifactId=${ARTIFACT} \
+    -Dclassifier=${CLASSDBG} \
+    -Dsources=${SOURCES}