fix: build process without using cbor-diag (rust)

stergiotis · Feb 24, 2024 · 9225338 · 9225338
1 parent e6296ee
commit 9225338
Show file tree

Hide file tree

Showing 6 changed files with 171 additions and 137 deletions.
diff --git a/public/imzero/generate.sh b/public/imzero/generate.sh
@@ -3,6 +3,16 @@ set -ev
 set -o pipefail
 here=$(dirname "$(readlink -f "$BASH_SOURCE")")
 cd "$here"
+
+if [ -z "${IMZERO_CPP_BINDING_DIR}" ]; then
+ echo "IMZERO_CPP_BINDING_DIR env variable is not set"
+ exit 1
+fi
+if [ -z "${IMZERO_DOXYGEN}" ]; then
+ echo "IMZERO_DOXYGEN env variable is not set"
+ exit 1
+fi
+
 find . -type f -name "*.out.go" -delete
 ./build.sh
 ./imgui/doxygen/generate.sh

diff --git a/public/imzero/imcolortextedit/generate.sh b/public/imzero/imcolortextedit/generate.sh
@@ -9,9 +9,10 @@ outfile="./imcolortextedit/api.out.go"
 rm -f "$outfile"
 
 mkdir -p "$IMZERO_CPP_BINDING_DIR/imcolortextedit"
+./build.sh
 ./main generateFffiCode --idlBuildTag fffi_idl_code \
  --idlPackagePattern github.com/stergiotis/boxer/public/imzero/imcolortextedit \
  --goOutputFile "$outfile" \
  --funcProcIdOffset 2000 \
  --goCodeProlog $'import "github.com/stergiotis/boxer/public/imzero/imgui"\n' \
- --cppOutputFile "$IMZERO_CPP_BINDING_DIR/imcolortextedit/dispatch.h" 2>&1 | cbor-diag
+ --cppOutputFile "$IMZERO_CPP_BINDING_DIR/imcolortextedit/dispatch.h" 2>&1 | ./main cbor diag
diff --git a/public/imzero/imgui/generate.sh b/public/imzero/imgui/generate.sh
@@ -31,10 +31,10 @@ cd ".."
 outfile="./imgui/api.out.go"
 rm -f main
 rm -f "$outfile"
-go build -tags binary_log,bootstrap main.go
+./build.sh
 mkdir -p "$IMZERO_CPP_BINDING_DIR/imgui"
 ./main generateFffiCode --idlBuildTag fffi_idl_code \
  --idlPackagePattern github.com/stergiotis/boxer/public/imzero/imgui \
  --goOutputFile "$outfile" \
  --runeCppType "ImWchar" \
- --cppOutputFile "$IMZERO_CPP_BINDING_DIR/imgui/dispatch.h" 2>&1 | cbor-diag
+ --cppOutputFile "$IMZERO_CPP_BINDING_DIR/imgui/dispatch.h" 2>&1 | ./main cbor diag