From 5aa70d8d28c647bb7e9afd8ec6be1f3f16a76465 Mon Sep 17 00:00:00 2001
From: Mike Nolan <tesses@tesses.net>
Date: Wed, 22 Oct 2025 14:48:58 -0500
Subject: [PATCH] Fix scripts and add tars

---
 .onedev-buildspec.yml                 | 47 ++++++++++++++-------------
 Packaging/CPKG/winbuild.sh            |  4 +--
 Packaging/Linux/build-tars.sh         | 25 ++++++++++++++
 Packaging/Linux/build-ubuntu-jammy.sh |  2 +-
 4 files changed, 52 insertions(+), 26 deletions(-)
 create mode 100644 Packaging/Linux/build-tars.sh

diff --git a/.onedev-buildspec.yml b/.onedev-buildspec.yml
index 085872c..9be38ac 100644
--- a/.onedev-buildspec.yml
+++ b/.onedev-buildspec.yml
@@ -62,6 +62,30 @@ jobs:
       value: '@secret:GITEA_AUTH@'
     useTTY: true
     condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
+  - !CommandStep
+    name: Build and Publish Deb Package
+    runInContainer: true
+    image: onedev.site.tesses.net/dependencies/debbuilder/jammy:latest
+    interpreter: !DefaultInterpreter
+      commands: |
+        mkdir artifacts
+        apt update -y
+        apt install -y pkg-config git
+        cd Packaging/Linux
+        bash build-ubuntu-jammy.sh
+        bash push-ubuntu-jammy.sh
+        bash build-tars.sh
+        apt update -y
+        apt install -y crosslang
+        cd ../CPKG
+        bash pack_and_publish.sh
+    envVars:
+    - name: GITEA_AUTH
+      value: '@secret:GITEA_AUTH@'
+    - name: CPKG_KEY
+      value: '@secret:CPKG_KEY@'
+    useTTY: true
+    condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
   - !SCPCommandStep
     name: Copy Files
     privateKeySecret: TRUENAS_SSH
@@ -78,29 +102,6 @@ jobs:
       cd /mnt/storage24tb/Files/Public/CrossLang
       ln -s @build_number@ latest
     condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
-  - !CommandStep
-    name: Build and Publish Deb Package
-    runInContainer: true
-    image: onedev.site.tesses.net/dependencies/debbuilder/jammy:latest
-    interpreter: !DefaultInterpreter
-      commands: |
-        mkdir artifacts
-        apt update -y
-        apt install -y pkg-config git
-        cd Packaging/Linux
-        bash build-ubuntu-jammy.sh
-        bash push-ubuntu-jammy.sh
-        apt update -y
-        apt install -y crosslang
-        cd ../CPKG
-        bash pack_and_publish.sh
-    envVars:
-    - name: GITEA_AUTH
-      value: '@secret:GITEA_AUTH@'
-    - name: CPKG_KEY
-      value: '@secret:CPKG_KEY@'
-    useTTY: true
-    condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
   triggers:
   - !DependencyFinishedTrigger
     projects: tesses-framework
diff --git a/Packaging/CPKG/winbuild.sh b/Packaging/CPKG/winbuild.sh
index 9229fa7..d5816ff 100644
--- a/Packaging/CPKG/winbuild.sh
+++ b/Packaging/CPKG/winbuild.sh
@@ -1,10 +1,10 @@
 echo "Building Windows Static x86"
-cmake -S "ConsoleOrServer" -B build/win-x86  -DCROSSAPPPUBLISH_STATIC=ON -DDCMAKE_TOOLCHAIN_FILE=`pwd`/WindowsToolchains/x86.cmake
+cmake -S "ConsoleOrServer" -B build/win-x86  -DCROSSAPPPUBLISH_STATIC=ON -DCMAKE_TOOLCHAIN_FILE=`pwd`/WindowsToolchains/x86.cmake
 cd build/win-x86
 make -j`nproc`
 cd ../..
 echo "Building Windows Static x64"
-cmake -S "ConsoleOrServer" -B build/win-x64  -DCROSSAPPPUBLISH_STATIC=ON -DDCMAKE_TOOLCHAIN_FILE=`pwd`/WindowsToolchains/x64.cmake
+cmake -S "ConsoleOrServer" -B build/win-x64  -DCROSSAPPPUBLISH_STATIC=ON -DCMAKE_TOOLCHAIN_FILE=`pwd`/WindowsToolchains/x64.cmake
 cd build/win-x64
 make -j`nproc`
 cd ../..
\ No newline at end of file
diff --git a/Packaging/Linux/build-tars.sh b/Packaging/Linux/build-tars.sh
new file mode 100644
index 0000000..f25a476
--- /dev/null
+++ b/Packaging/Linux/build-tars.sh
@@ -0,0 +1,25 @@
+#!/bin/bash
+mkdir build-x86_64-tar
+cd build-x86_64-tar
+cmake -S ../../.. -B . -DTESSESFRAMEWORK_ENABLE_SHARED=ON -DTESSESFRAMEWORK_ENABLE_STATIC=OFF -DTESSESFRAMEWORK_FETCHCONTENT=ON
+make -j`nproc`
+make install DESTDIR=./crosslang
+mkdir -p crosslang/share/Tesses/CrossLang
+cp ../build/jammy/Tesses.CrossLang.ShellPackage-1.0.0.0-prod.crvm crosslang/share/Tesses/CrossLang/Tesses.CrossLang.ShellPackage-1.0.0.0-prod.crvm
+tar cvzf ../../../artifacts/crosslang-linux-x86_64.tar.gz crosslang
+cd ..
+
+foreign() {
+mkdir build-$1\-tar
+cd build-$1\-tar
+cmake -S ../../.. -B . -DTESSESFRAMEWORK_ENABLE_SHARED=ON -DTESSESFRAMEWORK_ENABLE_STATIC=OFF -DTESSESFRAMEWORK_FETCHCONTENT=ON -DCMAKE_TOOLCHAIN_FILE=/opt/toolchains/$1\.cmake
+make -j`nproc`
+make install DESTDIR=./crosslang
+mkdir -p crosslang/share/Tesses/CrossLang
+cp ../build/jammy/Tesses.CrossLang.ShellPackage-1.0.0.0-prod.crvm crosslang/share/Tesses/CrossLang/Tesses.CrossLang.ShellPackage-1.0.0.0-prod.crvm
+tar cvzf ../../../artifacts/crosslang-linux-$1\.tar.gz crosslang
+cd ..
+}
+foreign arm64
+foreign riscv64
+
diff --git a/Packaging/Linux/build-ubuntu-jammy.sh b/Packaging/Linux/build-ubuntu-jammy.sh
index 9c6468f..b9e262f 100644
--- a/Packaging/Linux/build-ubuntu-jammy.sh
+++ b/Packaging/Linux/build-ubuntu-jammy.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+
 source ./version.sh
 mkdir -p build/jammy
 cd build/jammy
@@ -35,4 +36,3 @@ foreign() {
 
 foreign arm64
 foreign riscv64
-