From a5a537423e09461e9d5af755f1ec3b596f94d6a3 Mon Sep 17 00:00:00 2001 From: ading2210 Date: Sat, 3 Feb 2024 23:38:16 -0500 Subject: [PATCH] add copyright notice to libcurl js bundle --- .github/workflows/build.yaml | 4 ---- README.md | 2 +- client/build.sh | 3 ++- client/index.html | 2 +- client/javascript/copyright.js | 15 +++++++++++++++ client/javascript/main.js | 6 ++++-- client/package.json | 2 +- client/publish.sh | 1 - 8 files changed, 24 insertions(+), 11 deletions(-) create mode 100644 client/javascript/copyright.js diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 013f502..51d7a27 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -19,10 +19,6 @@ jobs: - name: run build working-directory: ./client run: ./build.sh all - - - name: run tests - working-directory: ./client - run: ./tests/run.sh - name: upload img uses: actions/upload-artifact@v4 diff --git a/README.md b/README.md index 910dee1..e9aa0d0 100644 --- a/README.md +++ b/README.md @@ -116,7 +116,7 @@ This project is licensed under the GNU AGPL v3. ### Copyright Notice: ``` -ading2210/libcurl.js - A port of libcurl to WASM for the browser. +ading2210/libcurl.js - A port of libcurl to WASM for use in the browser. Copyright (C) 2023 ading2210 This program is free software: you can redistribute it and/or modify diff --git a/client/build.sh b/client/build.sh index 5f0e7fe..be013ab 100755 --- a/client/build.sh +++ b/client/build.sh @@ -75,7 +75,7 @@ cp $JAVSCRIPT_DIR/main.js $OUT_FILE sed -i "/__emscripten_output__/r $MODULE_FILE" $OUT_FILE rm $MODULE_FILE -#set version number +#add version number and copyright notice VERSION=$(cat package.json | jq -r '.version') sed -i "s/__library_version__/$VERSION/" $OUT_FILE @@ -84,6 +84,7 @@ sed -i "/__extra_libraries__/r $WISP_CLIENT/polyfill.js" $OUT_FILE sed -i "/__extra_libraries__/r $WISP_CLIENT/wisp.js" $OUT_FILE sed -i "/__extra_libraries__/r $JAVSCRIPT_DIR/messages.js" $OUT_FILE sed -i "/__extra_libraries__/r $JAVSCRIPT_DIR/websocket.js" $OUT_FILE +sed -i "/__extra_libraries__/r $JAVSCRIPT_DIR/copyright.js" $OUT_FILE #apply patches python3 tools/patch_js.py $FRAGMENTS_DIR $OUT_FILE diff --git a/client/index.html b/client/index.html index 37c5d40..9760e4c 100644 --- a/client/index.html +++ b/client/index.html @@ -7,7 +7,7 @@ diff --git a/client/javascript/copyright.js b/client/javascript/copyright.js new file mode 100644 index 0000000..9ad6c3e --- /dev/null +++ b/client/javascript/copyright.js @@ -0,0 +1,15 @@ +const copyright_notice = `ading2210/libcurl.js - A port of libcurl to WASM for use in the browser. +Copyright (C) 2023 ading2210 + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU Affero General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Affero General Public License for more details. + +You should have received a copy of the GNU Affero General Public License +along with this program. If not, see .`; \ No newline at end of file diff --git a/client/javascript/main.js b/client/javascript/main.js index 15c3f43..9ecc78c 100644 --- a/client/javascript/main.js +++ b/client/javascript/main.js @@ -310,12 +310,14 @@ return { wisp: _wisp_connections, WebSocket: CurlWebSocket, + get copyright() {return copyright_notice}, get version() {return get_version()}, + get ready() {return wasm_ready}, + get stdout() {return out}, set stdout(callback) {out = callback}, get stderr() {return err}, - set stderr(callback) {err = callback}, - get ready() {return wasm_ready} + set stderr(callback) {err = callback} } })() \ No newline at end of file diff --git a/client/package.json b/client/package.json index 1535226..5edc336 100644 --- a/client/package.json +++ b/client/package.json @@ -1,6 +1,6 @@ { "name": "libcurl.js", - "version": "0.3.0", + "version": "0.3.1", "description": "An experimental port of libcurl to WebAssembly for use in the browser.", "main": "libcurl.mjs", "scripts": { diff --git a/client/publish.sh b/client/publish.sh index 8f601bc..2a055e0 100755 --- a/client/publish.sh +++ b/client/publish.sh @@ -3,7 +3,6 @@ #publish libcurl.js as an npm package ./build.sh all -tests/run.sh cp package.json out cp ../README.md out