wasi build scripts

Author: pmp-p

ci-17_4_WASM.sh

@@ -13,18 +13,21 @@ export CI=${CI:-false}
 export WASI=${WASI:-false}
 if $WASI
 then
-    export BUILD_PATH=postgresql-${PG_BRANCH}/build/postgres-wasi
+    BUILD=wasi
 else
-    export BUILD_PATH=postgresql-${PG_BRANCH}/build/postgres-emscripten
+    BUILD=emscripten
 fi
 
+export BUILD_PATH=postgresql-${PG_BRANCH}/build/postgres-${BUILD}
+
+
 PG_DIST_EXT="${WORKSPACE}/postgresql-${PG_BRANCH}/dist/extensions-emsdk"
 PG_DIST_PGLITE="${WORKSPACE}/postgresql-${PG_BRANCH}/dist/pglite-sandbox"
 
 # for local testing
 if [ -d /srv/www/html/pglite-web ]
 then
-    echo "local build"
+    echo "local ${BUILD} build"
     export PG_DIST_WEB="/srv/www/html/pglite-web"
     export LOCAL=true
 else
@@ -58,11 +61,12 @@ mkdir -p $CONTAINER_PATH/tmp
     cat > $CONTAINER_PATH/tmp/portable.opts <<END
 export DEBUG=${DEBUG}
 export USE_ICU=${USE_ICU}
-export PG_VERSION=$PG_VERSION
-export PG_BRANCH=$PG_BRANCH
-export GETZIC=$GETZIC
-export ZIC=$ZIC
-export CI=$CI
+export PG_VERSION=${PG_VERSION}
+export PG_BRANCH=${PG_BRANCH}
+export GETZIC=${GETZIC}
+export ZIC=${ZIC}
+export CI=${CI}
+export WASI=${WASI}
 END
 
 
@@ -85,25 +89,30 @@ ${WORKSPACE}/portable/portable.sh
 
 du -hs $BUILD_PATH $PG_DIST_EXT $PG_DIST_PGLITE
 
-if [ -f ${WORKSPACE}/${BUILD_PATH}/libpgcore.a ]
+if $WASI
 then
-    echo "found postgres core static libraries in ${WORKSPACE}/${BUILD_PATH}"
+    echo "TODO: wasi post link"
 else
-    echo "failed to build libpgcore static at ${WORKSPACE}/postgresql-${PG_BRANCH}/${BUILD_PATH}/libpgcore.a"
-    exit 85
-fi
 
-if $LOCAL
-then
-    cp -f pglite/packages/pglite/dist/*.tar.gz $PG_DIST_WEB/
-    cp -f pglite/packages/pglite/dist/pglite.* $PG_DIST_WEB/
-    mv -v pglite/packages/pglite/release/pglite.html $PG_DIST_WEB/
-    echo "TODO: start test server"
-else
-    # gh pages
-    mkdir -p /tmp/web
-    cp -f pglite/packages/pglite/dist/*.tar.gz /tmp/web/
-    cp -f pglite/packages/pglite/dist/pglite.* /tmp/web/
-    mv -v pglite/packages/pglite/release/pglite.html /tmp/web/index.html
-fi
+    if [ -f ${WORKSPACE}/${BUILD_PATH}/libpgcore.a ]
+    then
+        echo "found postgres core static libraries in ${WORKSPACE}/${BUILD_PATH}"
+    else
+        echo "failed to build libpgcore static at ${WORKSPACE}/postgresql-${PG_BRANCH}/${BUILD_PATH}/libpgcore.a"
+        exit 85
+    fi
 
+    if $LOCAL
+    then
+        cp -f pglite/packages/pglite/dist/*.tar.gz $PG_DIST_WEB/
+        cp -f pglite/packages/pglite/dist/pglite.* $PG_DIST_WEB/
+        mv -v pglite/packages/pglite/release/pglite.html $PG_DIST_WEB/
+        echo "TODO: start test server"
+    else
+        # gh pages
+        mkdir -p /tmp/web
+        cp -f pglite/packages/pglite/dist/*.tar.gz /tmp/web/
+        cp -f pglite/packages/pglite/dist/pglite.* /tmp/web/
+        mv -v pglite/packages/pglite/release/pglite.html /tmp/web/index.html
+    fi
+fi

portable/portable.sh

@@ -4,6 +4,7 @@ export PG_BRANCH=${PG_BRANCH:-REL_17_4_WASM}
 export PORTABLE=$(realpath $(dirname $0))
 export ROOT=$(realpath $(pwd))
 export SDKROOT=${SDKROOT:-/tmp/sdk}
+export WASI=${WASI:-false}
 
 echo "
 ==================================================================================================
@@ -16,6 +17,7 @@ PG_BRANCH=$PG_BRANCH
 SDKROOT=$SDKROOT
 DEBUG=$DEBUG
 USE_ICU=$USE_ICU
+WASI=$WASI
 
 ==================================================================================================
 ==================================================================================================
@@ -24,7 +26,6 @@ USE_ICU=$USE_ICU
 
 
 
-
 export PATH=$PORTABLE:$PATH
 export WORKDIR=${ROOT}
 export CONTAINER_PATH=${CONTAINER_PATH:-/tmp/fs}

portable/wasi-sdk-25.tar.xz

@@ -39,8 +39,11 @@ export PGUSER=${PGUSER:-postgres}
 [ -f /tmp/portable.opts ] && . /tmp/portable.opts
 [ -f /tmp/portable.dev ] && . /tmp/portable.dev
 
-# can override from cmdl line
+# can override from cmd line
 export WASI=${WASI:-false}
+export WASI_SDK=${WASI_SDK:-25.0}
+export PYBUILD=${PYBUILD:-3.13}
+
 
 
 if $WASI
@@ -73,12 +76,13 @@ export BUILD_PATH=${PG_BUILD}/postgres-${BUILD}
 export PGDATA=${PGROOT}/base
 export PGPATCH=${WORKSPACE}/patches
 
-chmod +x ${PORTABLE}/*.sh ${PORTABLE}/extra/*.sh
-
-# exit on error
-EOE=false
+chmod +x ${PORTABLE}/*.sh
+[ -d ${PORTABLE}/extra ] && ${PORTABLE}/extra/*.sh
 
 
+# this was set to false on 16.4 to skip some harmless exceptions without messing with core code.
+# exit on error
+EOE=true
 
 
 # default to user writeable paths in /tmp/ .
@@ -126,11 +130,9 @@ System node/pnpm ( may interfer) :
 
 if ${WASI}
 then
-    echo "Wasi build (experimental)"
-    export WASI_SDK=25.0
-    export WASI_SDK_PREFIX=${SDKROOT}/wasisdk/wasi-sdk-${WASI_SDK}-x86_64-linux
-    #export WASI_SDK_PREFIX=${SDKROOT}/wasisdk/upstream
-    export WASI_SYSROOT=${WASI_SDK_PREFIX}/share/wasi-sysroot
+    pushd ${SDKROOT}
+     . wasisdk/wasisdk_env.sh
+    popd
 
     if [ -f ${WASI_SYSROOT}/extra ]
     then
@@ -148,20 +150,6 @@ then
         touch ${WASI_SYSROOT}/extra
     fi
 
-
-    if false
-    then
-        . ${SDKROOT}/wasisdk/wasisdk_env.sh
-        env|grep WASI
-        export CC=${WASI_SDK_DIR}/bin/clang
-        export CPP=${WASI_SDK_DIR}/bin/clang-cpp
-        export CXX=${WASI_SDK_DIR}/bin/clang++
-        export CFLAGS="-D_WASI_EMULATED_SIGNAL"
-        export LDFLAGS="-lwasi-emulated-signal"
-    else
-        . ${SDKROOT}/wasm32-wasi-shell.sh
-    fi
-
     # wasi does not use -sGLOBAL_BASE
     CC_PGLITE="-DCMA_MB=${CMA_MB}"