16.x support

.github/workflows/emsdk.yml

@@ -18,7 +18,7 @@ jobs:
   build:
     runs-on: ubuntu-22.04
     env:
-        PGVERSION: 16.2
+        PGVERSION: 16.3
         SDK_VERSION: 3.1.62.0bi
         SDK_ARCHIVE: python3.12-wasm-sdk-Ubuntu-22.04.tar.lz4
         SDKROOT: /opt/python-wasm-sdk

cibuild.sh

@@ -127,8 +127,12 @@ END
     # to get same path for wasm-shared link tool in the path
     # for extensions building.
     # we always symlink in-tree build to "postgresql" folder
-    . cibuild/pg-$PGVERSION.sh
-
+    if echo $PGVERSION|grep -q ^16
+    then
+        . cibuild/pg-16.x.sh
+    else
+        . cibuild/pg-git.sh
+    fi
 fi
 
 # put wasm-shared the pg extension linker from build dir in the path
@@ -162,12 +166,16 @@ then
         PG_CONFIG=${PGROOT}/bin/pg_config emmake make OPTFLAGS="" install
         cp sql/vector.sql sql/vector--0.7.2.sql ${PGROOT}/share/postgresql/extension
         rm ${PGROOT}/share/postgresql/extension/vector--?.?.?--?.?.?.sql ${PGROOT}/share/postgresql/extension/vector.sql
-        read
         popd
 
     popd
 fi
 
+if echo "$*"|grep " postgis"
+then
+    echo "================================================="
+    PG_LINK=em++ echo "WIP - requires latests python-wasm-sdk, not just emsdk"
+fi
 
 if echo "$*"|grep " quack"
 then

cibuild/pg-16.2.sh → cibuild/pg-16.x.sh

@@ -1,8 +1,8 @@
 ARCHIVE=postgresql-${PGVERSION}.tar.bz2
 
-if [ -f postgresql-${PGVERSION}/patched ]
+if [ -f postgresql/postgresql-${PGVERSION}.patched ]
 then
-    echo patch stage already done
+    echo version already selected and patch stage already done
 else
     [ -f ${ARCHIVE} ] || wget -q -c https://ftp.postgresql.org/pub/source/v${PGVERSION}/${ARCHIVE}
 
@@ -15,15 +15,16 @@ else
         > ./src/include/port/emscripten.h
         > ./src/makefiles/Makefile.emscripten
         for patchdir in \
-            postgresql-emscripten postgresql-${PGVERSION}-wasm \
-            postgresql-pglite postgresql-${PGVERSION}-pglite
+            postgresql-emscripten \
+            postgresql-wasm postgresql-wasm-${PGVERSION} \
+            postgresql-pglite postgresql-pglite-${PGVERSION}
         do
             if [ -d ../patches/$patchdir ]
             then
                 cat ../patches/$patchdir/*.diff | patch -p1 || exit 18
             fi
         done
-        touch patched
+        touch postgresql-${PGVERSION}.patched
         popd
     fi
 
@@ -33,7 +34,6 @@ else
     rm postgresql 2>/dev/null
     ln -s postgresql-${PGVERSION} postgresql
 
-
 fi
 
 export PGSRC=$(realpath postgresql-${PGVERSION})