Merge branch 'master' of github.com:jessp01/zaje

Author: jessp01

.github/workflows/go.yml

@@ -42,3 +42,8 @@ jobs:
           pre-commit run --all-files
           go test -v
           sudo ./install_zaje.sh
+      - name: Test super-zaje
+        env:
+          TERM: term-256color
+        run: |
+          sudo bash -x ./cmd/super-zaje/static_build_debian.sh

cmd/super-zaje/README.md

@@ -53,6 +53,10 @@ For example, try:
 $ ~/go/bin/super-zaje "https://github.com/jessp01/zaje/blob/master/testimg/go1.png?raw=true"
 ```
 
+##### Static Build
+
+See this [doc](./static_build.md).
+
 ### PDF inputs
 
 PDF files are also supported. For example:

cmd/super-zaje/static_build.md

@@ -3,35 +3,47 @@
 The below will produce a rather chubby binary (29M on my Debian box) but it should run correctly on all modern Linux distros.
 If you don't need a static binary, simply follow the relevant install procedure [here](./README.md)
 
+For your convenience, a [build script](./static_build_debian.sh) with all of these is also available.
+
 - Install deps:
 ```sh
-# apt-get install libdeflate-dev libtiff-dev libsharpyuv-dev libwebp-dev liblerc-dev liblzma-dev libjbig-dev libpng-dev libzstd-dev libjpeg-dev
+apt-get -U -y -q install libdeflate-dev libtiff-dev libsharpyuv-dev libwebp-dev git libgif-dev \
+  liblerc-dev liblzma-dev libjbig-dev libpng-dev libzstd-dev libjpeg-dev build-essential
 ```
 
-Note: Debian/Ubuntu do provide static archives for both `libleptonica` and `libtesseract` but these are compiled with additional options that `super-zaje` does not need and statically linking against these archives would require the installation of several more `dev` packages.
+**Note: Debian/Ubuntu do provide static archives for both `libleptonica` and `libtesseract` but these are compiled with additional options that `super-zaje` does not need and statically linking against them would require the installation of several more `dev` packages.
+The below commands clone from head, obviously, you can use specific versions instead (always best).**
 
 - Build a statically linked version of libleptonica:
 
 ```sh
-$ git clone --depth 1 https://github.com/DanBloomberg/leptonica.git
-$ ./autogen.sh
-$ ./configure --with-pic --disable-shared 'CFLAGS=-D DEFAULT_SEVERITY=L_SEVERITY_ERROR -g0 -O3'
-$ make
-# make install
+git clone --depth 1 https://github.com/DanBloomberg/leptonica.git
+cd leptonica
+./autogen.sh
+./configure --with-pic --disable-shared 'CFLAGS=-D DEFAULT_SEVERITY=L_SEVERITY_ERROR -g0 -O3'
+make 
+make install
 ```
 
 - Build a statically linked version of libtesseract:
 ```sh
-$ git clone --depth 1 https://github.com/tesseract-ocr/tesseract.git
-$ ./autogen.sh
-$ ./configure --with-pic --disable-shared --disable-legacy --disable-graphics --disable-openmp --without-curl --without-archive --disable-doc 'CXXFLAGS=-DTESS_EXPORTS -g0 -O3 -ffast-math' 
-$ make
-# make install
+git clone --depth 1 https://github.com/tesseract-ocr/tesseract.git
+cd tesseract
+./autogen.sh
+./configure --with-pic --disable-shared --disable-legacy --disable-graphics \
+--disable-openmp --without-curl --without-archive --disable-doc \
+'CXXFLAGS=-DTESS_EXPORTS -g0 -O3 -ffast-math' 
+make
+make install
 ```
 
 - Build super-zaje:
 ```sh
 git clone https://github.com/jessp01/zaje.git 
 cd zaje/cmd/super-zaje  
-CGO_ENABLED=1 GOOS=linux go build  -a -tags netgo -ldflags '-extldflags "-static -ldeflate -ltiff  -L/usr/local/lib -ldeflate -lsharpyuv -lwebp -lLerc -llzma -ljbig -ltesseract -lleptonica -lpng -lzstd -ljpeg -lz -lgif -lsharpyuv -lwebp"' super-zaje.go
+CGO_ENABLED=1 GOOS=linux go build  -a -tags netgo -ldflags \
+ '-extldflags "-static -ldeflate -ltiff -L/usr/local/lib -ldeflate -lsharpyuv -lwebp -lLerc -llzma -ljbig -ltesseract -lleptonica -lpng -lzstd -ljpeg -lz -lgif -lsharpyuv -lwebp"' super-zaje.go
+```
 
+**Note: to run `super-zaje` on your target machines, you will need to copy [eng.traineddata](https://github.com/tesseract-ocr/tessdata/raw/refs/heads/main/eng.traineddata) to `/usr/local/share/tessdata`.
+You can also set the `TESSDATA_PREFIX` ENV dir if you wish to copy it to a different location.**

cmd/super-zaje/static_build_debian.sh

@@ -0,0 +1,50 @@
+#!/bin/sh -e
+
+if [ "$(id -u)" != 0 ];then
+    echo "You need super user privileges to run this script."
+    exit 1
+fi
+
+apt-get -U -y -q install libdeflate-dev libtiff-dev libsharpyuv-dev libwebp-dev libgif-dev \
+  liblerc-dev liblzma-dev libjbig-dev libpng-dev libzstd-dev libjpeg-dev build-essential strace
+
+TMPDIR=$(mktemp -d --suffix=_super-zaje)
+
+cd "$TMPDIR"
+
+git clone --depth 1 https://github.com/DanBloomberg/leptonica.git
+cd leptonica
+./autogen.sh
+./configure --with-pic --disable-shared 'CFLAGS=-D DEFAULT_SEVERITY=L_SEVERITY_ERROR -g0 -O3'
+make && make install
+
+cd "$TMPDIR"
+
+git clone --depth 1 https://github.com/tesseract-ocr/tesseract.git
+cd tesseract
+./autogen.sh
+./configure --with-pic --disable-shared --disable-legacy --disable-graphics \
+--disable-openmp --without-curl --without-archive --disable-doc \
+'CXXFLAGS=-DTESS_EXPORTS -g0 -O3 -ffast-math' 
+make && make install
+wget -q https://github.com/tesseract-ocr/tessdata/raw/refs/heads/main/eng.traineddata -P /usr/local/share/tessdata
+
+
+cd "$TMPDIR"
+
+BIN_NAME=super-zaje
+git clone https://github.com/jessp01/zaje.git --recursive
+mkdir -p ~/.config/zaje
+ln -s ~/zaje/highlight/syntax_files ~/.config/zaje/syntax_files
+cd zaje/cmd/super-zaje  
+CGO_ENABLED=1 GOOS=linux go build  -a -tags netgo -ldflags \
+    '-extldflags "-static -ldeflate -ltiff -L/usr/local/lib -ldeflate -lsharpyuv -lwebp -lLerc -llzma -ljbig -ltesseract -lleptonica -lpng -lzstd -ljpeg -lz -lgif -lsharpyuv -lwebp"' super-zaje.go
+
+set +e
+echo "Let's make sure we got a static binary..."
+ldd $BIN_NAME
+
+echo "Okay, now let's test it..."
+strace ./$BIN_NAME "https://github.com/jessp01/zaje/blob/master/testimg/go1.png?raw=true"
+echo $?
+echo "Great. Remember to copy /usr/local/share/tessdata to your target machine."