Merge pull request #23 from yougotwill/fix/no-ref/zstd_cmake_min

 Release v0.4.30

Author: Bilb

.github/workflows/test.yml

@@ -44,16 +44,15 @@ jobs:
         uses: microsoft/setup-msbuild@v1.3.1
         if: runner.os == 'Windows'
 
-        # Note: we will be able to get rid of this once the whole tree of submodules has the latest fetch of oxen-logging
+        # Note: we will be able to get rid of this once the whole tree of submodules has the latest version of oxen-logging
         # We'd need oxen-libquic to be updated to have the commit `bc7167f90e71643b43c2ea9cf7d1fefa5045f8d4`, but we don't want to
         # update libquic that late.
         # We will soon, though :tm:
-      - name: sed it
+      - name: Apply patches
         if: runner.os == 'Windows'
         shell: bash
         run: |
-          yarn dirty_sed
-          cat libsession-util/external/oxen-libquic/external/oxen-logging/CMakeLists.txt
+          yarn naughty-patch
 
       - name: generate fake src/version.h so we can try to build
         shell: bash

.gitignore

@@ -12,5 +12,6 @@
 .yarn/
 *.cjs
 *.mjs
+.venv
 
 /src/version.h

README.md

@@ -20,7 +20,7 @@ git clone --recursive git@github.com:session-foundation/libsession-util-nodejs.g
 ```
 
 Always do your changes in `[FOLDER_NOT_IN_SESSION_DESKTOP]/libsession-util-nodejs`, never in the one under session-desktop's `node_modules` as you might override your local changes.
-Then, you can quickly compile a non-electron build by running `yarn cmake-js` from that folder. This is a quick incremental build which can check for C++ compilation errors.
+Then, you can quickly compile a non-electron build by first running `yarn naughty-patch && yarn update_version` and then `yarn install` from that folder. You should only have to run `yarn naughty-patch && yarn update_version` manually once when you first setup the project. This is a quick incremental build which can check for C++ compilation errors.
 Once your changes are ready to be tested in the `session-desktop` you can compile an electron build using this command:
 
 ```

libsession-util

@@ -2,7 +2,7 @@
   "main": "index.js",
   "name": "libsession_util_nodejs",
   "description": "Wrappers for the Session Util Library",
-  "version": "0.4.28",
+  "version": "0.4.30",
   "license": "GPL-3.0",
   "author": {
     "name": "Oxen Project",
@@ -12,8 +12,8 @@
     "update_version": "sh update_version.sh",
     "clean": "rimraf .cache build",
     "install": "cmake-js compile --runtime=electron --runtime-version=34.2.0 --CDSUBMODULE_CHECK=OFF --CDLOCAL_MIRROR=https://oxen.rocks/deps --CDENABLE_ONIONREQ=OFF --CDWITH_TESTS=OFF",
-    "prepare_release": "sh prepare_release.sh",
-    "dirty_sed": "sed -i \"s/target_compile_options(oxen-logging-warnings INTERFACE/#target_compile_options(oxen-logging-warnings INTERFACE/\" libsession-util/external/oxen-libquic/external/oxen-logging/CMakeLists.txt"
+    "naughty-patch": "git apply patches/oxen-libquic.patch",
+    "prepare_release": "sh prepare_release.sh"
   },
   "devDependencies": {
     "clang-format": "^1.8.0",

package.json

@@ -0,0 +1,16 @@
+Submodule libsession-util contains modified content
+Submodule external/oxen-libquic contains modified content
+Submodule external/oxen-logging contains modified content
+diff --git a/libsession-util/external/oxen-libquic/external/oxen-logging/CMakeLists.txt b/libsession-util/external/oxen-libquic/external/oxen-logging/CMakeLists.txt
+index c8d0960..3b2d573 100644
+--- a/libsession-util/external/oxen-libquic/external/oxen-logging/CMakeLists.txt
++++ b/libsession-util/external/oxen-libquic/external/oxen-logging/CMakeLists.txt
+@@ -91,7 +91,7 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL GNU AND CMAKE_CXX_COMPILER_VERSION VERSION_GRE
+ endif()
+ 
+ add_library(oxen-logging-warnings INTERFACE)
+-target_compile_options(oxen-logging-warnings INTERFACE "$<$<OR:$<COMPILE_LANGUAGE:CXX>,$<COMPILE_LANGUAGE:C>>:${warning_flags}>")
++#target_compile_options(oxen-logging-warnings INTERFACE "$<$<OR:$<COMPILE_LANGUAGE:CXX>,$<COMPILE_LANGUAGE:C>>:${warning_flags}>")
+ target_link_libraries(oxen-logging INTERFACE oxen-logging-warnings)
+ 
+ set(oxen_logging_source_roots "" CACHE INTERNAL "")

patches/oxen-libquic.patch

@@ -10,9 +10,11 @@ read_char() {
 
 
 rm -f ./libsession_util_nodejs*.tar.gz
-virtualenv venv
-. venv/bin/activate
+python -m venv .venv
+. .venv/bin/activate
 pip install git-archive-all
+# see .github/workflows/test.yml for more info
+yarn naughty-patch || true
 PACKAGE_VERSION=$(node -p "require('./package.json').version")
 yarn update_version
 echo "PACKAGE_VERSION: $PACKAGE_VERSION"
@@ -25,8 +27,6 @@ esac
 
 
 echo "Continuing..."
-# see test.yml for explanation of this sed command
-yarn dirty_sed
 
 echo "Building tar archive of source..."
 python3 build_release_archive.py libsession_util_nodejs-v$PACKAGE_VERSION.tar.gz --include src/version.h