From 0d76cf6e53533562adfa40e3b7b86736c796df3a Mon Sep 17 00:00:00 2001
From: Dan Miller <dan@cypherstack.com>
Date: Tue, 28 Oct 2025 17:55:54 -0700
Subject: [PATCH] isar_build

---
 .../templates/configure_template_files.sh     |  17 +--
 scripts/app_config/templates/isar_build.sh    | 100 ------------------
 2 files changed, 11 insertions(+), 106 deletions(-)
 delete mode 100644 scripts/app_config/templates/isar_build.sh

diff --git a/scripts/app_config/templates/configure_template_files.sh b/scripts/app_config/templates/configure_template_files.sh
index 24a4195cf..28c0844be 100755
--- a/scripts/app_config/templates/configure_template_files.sh
+++ b/scripts/app_config/templates/configure_template_files.sh
@@ -57,7 +57,17 @@ TEMPLATE_FILES=(
 if [ -f "${ACTUAL_PUBSPEC}" ]; then
   rm "${ACTUAL_PUBSPEC}"
 fi
-cp "${T_PUBSPEC}" "${ACTUAL_PUBSPEC}"
+
+if [ "$BUILD_ISAR_FROM_SOURCE" -eq 1 ]; then
+    sed '/^# %%ENABLE_ISAR%%$/,/^# %%END_ENABLE_ISAR%%$/{
+        /^# %%ENABLE_ISAR%%$/d
+        /^# %%END_ENABLE_ISAR%%$/d
+        s/^#  /  /g
+        s/^#    /    /g
+    }' "${T_PUBSPEC}" > "${ACTUAL_PUBSPEC}"
+else
+    cp "${T_PUBSPEC}" "${ACTUAL_PUBSPEC}"
+fi
 
 for TF in "${TEMPLATE_FILES[@]}"; do
   FILE="${APP_PROJECT_ROOT_DIR}/${TF}"
@@ -66,8 +76,3 @@ for TF in "${TEMPLATE_FILES[@]}"; do
   fi
   cp -rp "${TEMPLATES_DIR}/${TF}" "${FILE}"
 done
-
-if [ "$BUILD_ISAR_FROM_SOURCE" -eq 1 ]; then
-  source "${APP_PROJECT_ROOT_DIR}/scripts/app_config/templates/isar_build.sh"
-  build_isar_source
-fi
diff --git a/scripts/app_config/templates/isar_build.sh b/scripts/app_config/templates/isar_build.sh
deleted file mode 100644
index d1d53d7f9..000000000
--- a/scripts/app_config/templates/isar_build.sh
+++ /dev/null
@@ -1,100 +0,0 @@
-#!/bin/bash
-
-find_isar_core_lib() {
-    local isar_core_path
-    isar_core_path=$(find "${HOME}/.pub-cache/git" -type d -path "*/isar_core_ffi" -print -quit 2>/dev/null)
-    [[ -z "${isar_core_path}" ]] && return 1
-    echo "${isar_core_path}"
-}
-
-detect_isar_version() {
-    local version="unknown"
-    local lock_file="${APP_PROJECT_ROOT_DIR}/pubspec.lock"
-    [[ -f "${lock_file}" ]] && version=$(grep -A1 "isar_community:" "${lock_file}" 2>/dev/null | grep version | awk -F'"' '{print $2}' | head -n1)
-    echo "${version:-3.3.0-dev.2}"
-}
-
-copy_isar_lib() {
-    local lib_src="$1"
-    local lib_dest="$2"
-
-    if [[ ! -f "${lib_src}" ]]; then
-        echo "Warning: libisar.so not found at ${lib_src}"
-        return 1
-    fi
-
-    mkdir -p "${lib_dest}"
-    cp -f "${lib_src}" "${lib_dest}/"
-    echo "Copied libisar.so to ${lib_dest}"
-}
-
-build_isar_core() {
-    local isar_core_path="$1"
-    local workspace_root="$2"
-
-    echo "Building Isar core from: ${isar_core_path}"
-
-    if [[ ! -f "${isar_core_path}/Cargo.toml" ]]; then
-        echo "Error: Cargo.toml not found" >&2
-        return 1
-    fi
-
-    if [[ -f "${workspace_root}/target/release/libisar.so" ]] || \
-       [[ -f "${workspace_root}/target/release/deps/libisar.so" ]]; then
-        echo "Note: libisar.so already built, skipping build step"
-        return 0
-    fi
-
-    (cd "${isar_core_path}" && cargo build --release) || {
-        echo "Error: cargo build failed for isar_core_ffi" >&2
-        return 1
-    }
-}
-
-find_isar_library() {
-    local workspace_root="$1"
-
-    if [[ -f "${workspace_root}/target/release/libisar.so" ]]; then
-        echo "${workspace_root}/target/release/libisar.so"
-        return 0
-    fi
-
-    if [[ -f "${workspace_root}/target/release/deps/libisar.so" ]]; then
-        echo "${workspace_root}/target/release/deps/libisar.so"
-        return 0
-    fi
-
-    echo "Error: could not produce libisar.so" >&2
-    return 1
-}
-
-build_isar_source() {
-    echo "------------------------------------------------------------"
-    echo "Building Isar database library from source (BUILD_ISAR_FROM_SOURCE=1)"
-    echo "------------------------------------------------------------"
-
-    local isar_core_path
-    isar_core_path=$(find_isar_core_lib) || {
-        echo "Error: could not locate isar_core_ffi inside ~/.pub-cache/git."
-        return 1
-    }
-
-    echo "Found isar_core_ffi at: ${isar_core_path}"
-
-    local workspace_root=$(dirname $(dirname "${isar_core_path}"))
-
-    build_isar_core "${isar_core_path}" "${workspace_root}" || return 1
-
-    local lib_src
-    lib_src=$(find_isar_library "${workspace_root}") || return 1
-
-    local plugin_path="${APP_PROJECT_ROOT_DIR}/linux/flutter/ephemeral/.plugin_symlinks/isar_community_flutter_libs/linux"
-    if [[ -d "$(dirname "${plugin_path}")" ]]; then
-        copy_isar_lib "${lib_src}" "${plugin_path}" || return 1
-    fi
-
-    local bundle_path="${APP_PROJECT_ROOT_DIR}/build/linux/x64/release/bundle/lib"
-    if [[ -d "$(dirname "${bundle_path}")" ]]; then
-        copy_isar_lib "${lib_src}" "${bundle_path}" || return 1
-    fi
-}