dual build

Author: pmp-p

.github/workflows/CI.yml

@@ -25,7 +25,7 @@ jobs:
       USE_ICU: false
       PG_VERSION: 17.5
       PG_BRANCH: REL_17_5_WASM
-      PGL_BRANCH: extra/pg_ivm
+      PGL_BRANCH: main
       ZIC: /usr/sbin/zic
       GETZIC: false
 

ci-alpine-proot.sh

@@ -96,12 +96,12 @@ else
     git clone --no-tags --depth 1 --single-branch --branch $PGL_BRANCH https://github.com/electric-sql/pglite pglite
 fi
 
-rm -f ${WORKSPACE}/done
+rm -f ${WORKSPACE}/${BUILD}.done
 
 # execute prooted build
 ${WORKSPACE}/portable/portable.sh
 
-if [ -f ${WORKSPACE}/done ]
+if [ -f ${WORKSPACE}/${BUILD}.done ]
 then
     if $LOCAL
     then

pglite-REL_17_4_WASM/build.sh

@@ -36,7 +36,7 @@ if $WASI
 then
 
 
-echo "
+    echo "
 _______________________ PG_BRANCH=${PG_BRANCH} _____________________
 
 wasi : $(which wasi-c) $(wasi-c -v)
@@ -139,12 +139,15 @@ END
             fi
         else
             echo "linking libpglite ${BUILD} failed in $(pwd)"
+            exit 142
         fi
     else
         echo "${BUILD} compilation of libpglite ${PG_BRANCH} failed"
-        exit 106
+        exit 146
     fi
 
+    touch ${WORKSPACE}/${BUILD}.done
+
 else
     . ${SDKROOT:-/opt/python-wasm-sdk}/wasm32-bi-emscripten-shell.sh
 
@@ -165,17 +168,14 @@ else
     EXPORTED_FUNCTIONS="_main,_use_wire,_pgl_initdb,_pgl_backend,_pgl_shutdown,_interactive_write,_interactive_read,_interactive_one"
     EXPORTED_FUNCTIONS="$EXPORTED_FUNCTIONS,_get_channel,_get_buffer_size,_get_buffer_addr"
 
-#    EXPORTED_RUNTIME_METHODS="MEMFS,IDBFS,FS,FS_mount,FS_syncfs,FS_analyzePath,setValue,getValue,UTF8ToString,stringToNewUTF8,stringToUTF8OnStack"
     EXPORTED_RUNTIME_METHODS="MEMFS,IDBFS,FS,setValue,getValue,UTF8ToString,stringToNewUTF8,stringToUTF8OnStack"
 
 
-
     if $DEBUG
     then
         # FULL
         LINKER="-sMAIN_MODULE=1 -sEXPORTED_FUNCTIONS=${EXPORTED_FUNCTIONS}"
         unset EMCC_FORCE_STDLIBS
-#        LINKER="-sMAIN_MODULE=2 -sEXPORTED_FUNCTIONS=@${PGL_DIST_LINK}/exports/pglite"
     else
         # min
         # LINKER="-sMAIN_MODULE=2"
@@ -255,7 +255,7 @@ ________________________________________________________
             ./wasm-build/linkimports.sh
         else
             echo "
-    *   linking node raw version of pglite failed"; exit 250
+    *   linking node raw version of pglite failed"; exit 261
 
         fi
 
@@ -293,13 +293,13 @@ ________________________________________________________
          -lnodefs.js -lidbfs.js -lxml2 -lz
         then
             du -hs du -hs ${PG_DIST}/*
-            touch ${WORKSPACE}/done
+            touch ${WORKSPACE}/${BUILD}.done
         else
             echo "
-    * linking web version of pglite failed"; exit 272
+    * linking web version of pglite failed"; exit 302
         fi
     else
-        echo "compilation of libpglite ${PG_BRANCH} failed"; exit 275
+        echo "compilation of libpglite ${PG_BRANCH} failed"; exit 305
     fi
 fi
 

pglite-REL_17_4_WASM/repl.html

@@ -137,7 +137,11 @@
 
         vm.FS.unlink(vm.PGDATA + "/postgresql.conf")
         vm.FS.writeFile( vm.PGDATA + "/postgresql.conf", lines.join("\n") )
-        vm.FS.syncfs(false, (e) => { if (e) console.error("pgl_conf:", e)})
+        try {
+            vm.FS.syncfs(false, (e) => { /* if (e) console.error("pgl_conf:", e) */ })
+        } catch (x) {
+            console.error("pgl_conf: exception", x)
+        }
 
         console.log("Config file written at :", vm.PGDATA + "/postgresql.conf" )
     }
@@ -305,7 +309,9 @@
             return text_codec.decode(  new Uint8Array(ary) )
         }
         window.b_utf8 = b_utf8
+
 //  /tmp/pglite/base/postgresql.conf
+
         function test_drive(step) {
             var data = null
             switch (test_step) {

portable/portable.sh

@@ -513,7 +513,6 @@ Fatal: failed to apply patch : $one
             * Done setup emsdk+wasi sdk from $SDK_URL
 
 "
-        read
     fi
 
 

wasm-build.sh

@@ -76,11 +76,16 @@ else
             # dev debug
             export COPTS="-O2 -g3 --no-wasm-opt"
             export LOPTS=${LOPTS:-"-O2 -g3 --no-wasm-opt -sASSERTIONS=1"}
+
         else
             # docker debug ( exepected to be ide friendly )
             export COPTS="-g3 --no-wasm-opt"
             export LOPTS=${LOPTS:-"-g3 --no-wasm-opt -sASSERTIONS=1"}
         fi
+
+        export COPTS="-O2 -sDEMANGLE_SUPPORT=1 -frtti -g4 --no-wasm-opt"
+        export LOPTS=${LOPTS:-"-O1 -sDEMANGLE_SUPPORT=1 -frtti -g4 --no-wasm-opt -sASSERTIONS=1"}
+
     else
         # DO NOT CHANGE COPTS - optimized wasm corruption fix
         export COPTS="-O2 -g3 --no-wasm-opt"
@@ -178,7 +183,7 @@ pushd ${SDKROOT}
             echo "$PORTABLE : sdk check passed (emscripten)"
         else
             echo emsdk failed
-            exit 176
+            exit 181
         fi
 
 
@@ -278,7 +283,7 @@ END
     ERROR: $(which wasm-objdump) not working properly ( is wasmtime ok ? )
 
 "
-            exit 262
+            exit 281
         fi
     fi
 fi
@@ -451,8 +456,25 @@ then
     if $WASI
     then
         echo "
-    * WASI build : skipping FS building
+        * WASI build : TODO: FS building
+        * WASI build : TODO: ext linking
 "
+        cat > pglite-link.sh <<END
+. ${PGROOT}/pgopts.sh
+. ${SDKROOT}/wasm32-bi-emscripten-shell.sh
+if ./pglite-${PG_BRANCH}/build.sh
+then
+    echo "TODO: tests"
+fi
+END
+
+        chmod +x pglite-link.sh
+
+        if ./pglite-link.sh
+        then
+            echo "TODO: extensions fs packing"
+        fi
+
     else
 
         # this is for initial emscripten MEMFS
@@ -464,16 +486,11 @@ then
 --preload-file placeholder@${PGROOT}/bin/postgres \
 --preload-file placeholder@${PGROOT}/bin/initdb\
 "
-    fi
 
-    echo "
-    * building + linking pglite-wasm (initdb/loop/transport/repl/backend)
+        echo "
+    * emsdk: building + linking pglite-wasm (initdb/loop/transport/repl/backend)
 "
 
-    if $WASI
-    then
-        echo "TODO: wasi pack/tests"
-    else
         cat > pglite-link.sh <<END
 . ${PGROOT}/pgopts.sh
 . ${SDKROOT}/wasm32-bi-emscripten-shell.sh
@@ -492,10 +509,15 @@ then
 
         cp ${PGL_DIST_WEB}/pglite.* pglite/packages/pglite/release/
         pushd pglite
-            export HOME=$PG_BUILD
-            export PNPM_HOME=$PG_BUILD
-            export PATH=$(echo -n ${SDKROOT}/emsdk/node/*.*.*/bin):$PNPM_HOME:$PATH
-            which pnpm || npm install -g pnpm
+            export PNPM_HOME=\$(echo -n $SDKROOT/emsdk/node/*.*.*/bin)
+            export PATH=\$PNPM_HOME:\$PATH
+
+            if which pnpm
+            then
+                echo -n
+            else
+                npm install -g pnpm@latest-10
+            fi
             pnpm install -g npm vitest
             pnpm install
             pnpm run ts:build
@@ -507,7 +529,7 @@ then
         else
             if $CI
             then
-                ./runtests.sh || exit 580
+                ./runtests.sh || exit 515
             fi
         fi
     fi
@@ -531,7 +553,7 @@ END
                 done
             fi
         else
-            exit 676
+            exit 539
         fi
     fi
 else

wasm-build/build-ext.sh

@@ -1,72 +1,82 @@
+
+mkdir -p ${PGL_DIST_LINK}/exports ${PGL_DIST_LINK}/imports
+cd ${WORKSPACE}
+
+
 if $WASI
 then
     echo "
 
-    * WASI: skipping contrib extensions build
+    * WASI: skipping some contrib extensions build
 
     "
-else
-    mkdir -p ${PGL_DIST_LINK}/exports ${PGL_DIST_LINK}/imports
-    cd ${WORKSPACE}
-
-    if $WASI
-    then
         echo " ========= TODO WASI openssl ============== "
         SKIP="\
  [\
  sslinfo bool_plperl hstore_plperl hstore_plpython jsonb_plperl jsonb_plpython\
  ltree_plpython sepgsql bool_plperl start-scripts\
  pgcrypto uuid-ossp xml2\
  ]"
-    else
-        # TEMP FIX for SDK
-        SSL_INCDIR=$EMSDK/upstream/emscripten/cache/sysroot/include/openssl
-        [ -f $SSL_INCDIR/evp.h ] || ln -s $PREFIX/include/openssl $SSL_INCDIR
-        SKIP="\
+
+else
+
+    # TEMP FIX for SDK
+    SSL_INCDIR=$EMSDK/upstream/emscripten/cache/sysroot/include/openssl
+    [ -f $SSL_INCDIR/evp.h ] || ln -s $PREFIX/include/openssl $SSL_INCDIR
+    SKIP="\
  [\
  sslinfo bool_plperl hstore_plperl hstore_plpython jsonb_plperl jsonb_plpython\
  ltree_plpython sepgsql bool_plperl start-scripts\
  ]"
-    fi
 
-    for extdir in postgresql-${PG_BRANCH}/contrib/*
-    do
+fi
+
+# common wasi/emsdk contrib build
 
-        if [ -d "$extdir" ]
+for extdir in postgresql-${PG_BRANCH}/contrib/*
+do
+
+    if [ -d "$extdir" ]
+    then
+        ext=$(echo -n $extdir|cut -d/ -f3)
+        if echo -n $SKIP|grep -q "$ext "
         then
-            ext=$(echo -n $extdir|cut -d/ -f3)
-            if echo -n $SKIP|grep -q "$ext "
+            echo "
+
+    skipping extension $ext
+
+            "
+        else
+            echo "
+
+    Building contrib extension : $ext : begin
+
+            "
+            pushd ${BUILD_PATH}/contrib/$ext
+            if PATH=$PREFIX/bin:$PATH emmake make install 2>&1 >/dev/null
             then
-                echo skipping extension $ext
-            else
                 echo "
 
-        Building contrib extension : $ext : begin
+    Building contrib extension : $ext : end
 
-                "
-                pushd ${BUILD_PATH}/contrib/$ext
-                if PATH=$PREFIX/bin:$PATH emmake make install 2>&1 >/dev/null
-                then
-                    echo "
-        Building contrib extension : $ext : end
-                "
-                else
-                    echo "
+            "
+            else
+                echo "
 
-        Extension $ext from $extdir failed to build
+    Extension $ext from $extdir failed to build
 
-                    "
-                    exit 216
-                fi
-                popd
+                "
+                exit 69
+            fi
+            popd
 
-                python3 ${PORTABLE}/pack_extension.py 2>&1 >/dev/null
+            python3 ${PORTABLE}/pack_extension.py 2>&1 >/dev/null
 
-            fi
         fi
-    done
+    fi
+done
+
 
-fi
 
 
 echo "

wasm-build/sdk.sh

@@ -4,6 +4,10 @@ WASI=${WASI:-false}
 SDKROOT=${SDKROOT:-/tmp/sdk}
 mkdir -p ${SDKROOT}
 
+if [ -f /alpine ]
+then
+    cp -f /usr/bin/node ${SDKROOT}/emsdk/node/*.*.*/bin/
+fi
 
 # always install wasmtime because wasm-objdump needs it.
 if [ -f ${SDKROOT}/devices/$(arch)/usr/bin/wasmtime ]