diff --git a/.github/workflows/macOS-build.yml b/.github/workflows/macOS-build.yml new file mode 100644 index 0000000..e382f8b --- /dev/null +++ b/.github/workflows/macOS-build.yml @@ -0,0 +1,33 @@ +name: MacOS build + +on: + push: + workflow_dispatch: + +jobs: + build: + runs-on: macos-11 + + steps: + - uses: actions/checkout@v2 + with: + submodules: true + + - name: Install dependencies + run: | + brew install \ + cmake \ + curl \ + gtkmm3 \ + ninja + + - name: Build + run: | + mkdir build && cd build + cmake -G Ninja .. + ninja + + #xcodebuild \ + # -project "libreweb-browser.xcodeproj" \ + # -scheme libreweb-browser \ + # -configuration Debug diff --git a/go-ipfs/LICENSE b/go-ipfs/LICENSE deleted file mode 100644 index 7b5f88c..0000000 --- a/go-ipfs/LICENSE +++ /dev/null @@ -1,8 +0,0 @@ -This project is transitioning from an MIT-only license to a dual MIT/Apache-2.0 license. -Unless otherwise noted, all code contributed prior to 2019-05-06 and not contributed by -a user listed in [this signoff issue](https://github.com/ipfs/go-ipfs/issues/6302) is -licensed under MIT-only. All new contributions (and past contributions since 2019-05-06) -are licensed under a dual MIT/Apache-2.0 license. - -MIT: https://www.opensource.org/licenses/mit -Apache-2.0: https://www.apache.org/licenses/license-2.0 diff --git a/go-ipfs/LICENSE-APACHE b/go-ipfs/LICENSE-APACHE deleted file mode 100644 index 14478a3..0000000 --- a/go-ipfs/LICENSE-APACHE +++ /dev/null @@ -1,5 +0,0 @@ -Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. diff --git a/go-ipfs/LICENSE-MIT b/go-ipfs/LICENSE-MIT deleted file mode 100644 index 72dc60d..0000000 --- a/go-ipfs/LICENSE-MIT +++ /dev/null @@ -1,19 +0,0 @@ -The MIT License (MIT) - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. diff --git a/go-ipfs/README.md b/go-ipfs/README.md deleted file mode 100644 index f541482..0000000 --- a/go-ipfs/README.md +++ /dev/null @@ -1,28 +0,0 @@ -# ipfs commandline tool - -This is the [ipfs](http://ipfs.io) commandline tool. It contains a full ipfs node. - -## Install - -To install it, move the binary somewhere in your `$PATH`: - -```sh -sudo mv ipfs /usr/local/bin/ipfs -``` - -Or run `sudo ./install.sh` which does this for you. - -## Usage - -First, you must initialize your local ipfs node: - -```sh -ipfs init -``` - -This will give you directions to get started with ipfs. -You can always get help with: - -```sh -ipfs --help -``` diff --git a/go-ipfs/install.sh b/go-ipfs/install.sh deleted file mode 100755 index 34c5d59..0000000 --- a/go-ipfs/install.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh -# -# Installation script for ipfs. It tries to move $bin in one of the -# directories stored in $binpaths. - -INSTALL_DIR=$(dirname $0) - -bin="$INSTALL_DIR/ipfs" -binpaths="/usr/local/bin /usr/bin" - -# This variable contains a nonzero length string in case the script fails -# because of missing write permissions. -is_write_perm_missing="" - -for binpath in $binpaths; do - if mv "$bin" "$binpath/ipfs" ; then - echo "Moved $bin to $binpath" - exit 0 - else - if [ -d "$binpath" ] && [ ! -w "$binpath" ]; then - is_write_perm_missing=1 - fi - fi -done - -echo "We cannot install $bin in one of the directories $binpaths" - -if [ -n "$is_write_perm_missing" ]; then - echo "It seems that we do not have the necessary write permissions." - echo "Perhaps try running this script as a privileged user:" - echo - echo " sudo $0" - echo -fi - -exit 1 diff --git a/go-ipfs/ipfs-darwin b/go-ipfs/ipfs-darwin new file mode 100755 index 0000000..c31ed65 Binary files /dev/null and b/go-ipfs/ipfs-darwin differ diff --git a/scripts/get-ipfs.sh b/scripts/get-ipfs.sh index 7f6a77a..0e1dc53 100755 --- a/scripts/get-ipfs.sh +++ b/scripts/get-ipfs.sh @@ -12,15 +12,20 @@ CURRENT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" # Download & untar/zip Go-IPFS echo "INFO: Start downloading IPFS (version ${IPFS_VERSION})..." +wget --quiet "https://dist.ipfs.io/go-ipfs/v${IPFS_VERSION}/go-ipfs_v${IPFS_VERSION}_darwin-amd64.tar.gz" -O "$CURRENT_DIR/go-ipfs_darwin.tar.gz" wget --quiet "https://dist.ipfs.io/go-ipfs/v${IPFS_VERSION}/go-ipfs_v${IPFS_VERSION}_linux-amd64.tar.gz" -O "$CURRENT_DIR/go-ipfs_linux.tar.gz" wget --quiet "https://dist.ipfs.io/go-ipfs/v${IPFS_VERSION}/go-ipfs_v${IPFS_VERSION}_windows-amd64.zip" -O "$CURRENT_DIR/go-ipfs_windows.zip" # Extract on root level of the git repo echo "INFO: Extracting Go IPFS..." -tar -xzf "$CURRENT_DIR/go-ipfs_linux.tar.gz" -C "$CURRENT_DIR/../" -unzip -q -o "$CURRENT_DIR/go-ipfs_windows.zip" -d "$CURRENT_DIR/../" +tar -xzf "$CURRENT_DIR/go-ipfs_darwin.tar.gz" go-ipfs/ipfs -C "$CURRENT_DIR/../" +# rename darwin binary +mv "$CURRENT_DIR/../go-ipfs/ipfs" "$CURRENT_DIR/../go-ipfs/ipfs-darwin" +tar -xzf "$CURRENT_DIR/go-ipfs_linux.tar.gz" go-ipfs/ipfs -C "$CURRENT_DIR/../" +unzip -q -o "$CURRENT_DIR/go-ipfs_windows.zip" go-ipfs/ipfs.exe -d "$CURRENT_DIR/../" # Clean-up echo "INFO: Clean up" +rm -rf "$CURRENT_DIR/go-ipfs_darwin.tar.gz" rm -rf "$CURRENT_DIR/go-ipfs_linux.tar.gz" rm -rf "$CURRENT_DIR/go-ipfs_windows.zip"