From 3f543a7c36f503f8b8d10c9885d2ece81a955ff5 Mon Sep 17 00:00:00 2001 From: dec05eba Date: Sat, 29 Sep 2018 22:49:01 +0200 Subject: Update readme, project.conf and install script for mac --- README.md | 8 ++++---- install.sh | 13 ++++++++++--- project.conf | 4 ++-- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 4879d33..3b50194 100644 --- a/README.md +++ b/README.md @@ -16,14 +16,14 @@ List of packages can be found at https://gitlab.com/DEC05EBA/sibs_packages/raw/m ### Supported platforms |Linux|Windows|MacOS |... | |-----|-------|-----------|-----------| -|✓ |✓ |In progress|TBD* | +|✓ |✓ |✓ |TBD* | \* Sibs is intended to work on as many platforms as possible, you can help by porting sibs to another platform. Should only be minor changes if the platform is unix-like. Linux is the primary platform, the platform which master branch is guaranteed to compile on. # Installation Newest version of sibs builds itself. If you don't already have sibs installed and you are using Windows then you can find prebuilt binary under msvc folder. -On Linux you need to build from source by running install.sh under cmake directory. +On Linux and Mac you need to build from source by running install.sh under cmake directory. After you've installed sibs once, you can install new versions by running install.sh (or use `sibs.exe build --release` if you are on windows, and sibs binary will be located under sibs-build/release/sibs.exe). For easiest usage of sibs under windows, add msvc subdirectory to PATH environment variable. msvc subdirectory also contains additional libraries and software that is needed for sibs to run with the only missing software being cmake. @@ -44,7 +44,7 @@ If your project contains a sub directory called "tests" then that directory will name = "packageName" type = "library" version = "0.1.0" -platforms = ["linux32", "linux64", "win32", "win64"] +platforms = ["linux32", "linux64", "win32", "win64", "macos32", "macos64"] authors = ["DEC05EBA <0xdec05eba@gmail.com>"] [dependencies] @@ -99,7 +99,7 @@ Required. Should be one of: "executable", "static", "dynamic", "library" ### version Required. Version string has to be in the format of "xxx.yyy.zzz" where xxx is major, yyy is minor and zzz is patch ### platforms -Required. A list of platforms the package supports. Can contain the following values: "any", "linux32", "linux64", "win32", "win64". +Required. A list of platforms the package supports. Can contain the following values: "any", "linux32", "linux64", "win32", "win64", "macos32", "macos64". If platforms contains "any", then other there is no need to specify other platforms ### authors Optional. A list of authors diff --git a/install.sh b/install.sh index 775fa6b..d144215 100755 --- a/install.sh +++ b/install.sh @@ -3,9 +3,16 @@ set -e case "$(uname -s)" in - Linux*) bin_dir="/usr/bin" ;; - Darwin*) bin_dir="/usr/local/bin" ;; - *) echo "The install file can only be run on linux and mac" && exit 1 ;; + Linux*) + bin_dir="/usr/bin" + ;; + Darwin*) + bin_dir="/usr/local/bin" + export PKG_CONFIG_PATH="/usr/local/opt/libarchive/lib/pkgconfig/" + ;; + *) + echo "The install file can only be run on linux and mac" && exit 1 + ;; esac project_dir=`dirname $0` diff --git a/project.conf b/project.conf index 48b19f4..73eed20 100644 --- a/project.conf +++ b/project.conf @@ -9,6 +9,6 @@ platforms = ["linux32", "linux64", "win64", "macos32", "macos64"] ignore_dirs = ["cmake", "cmake-build-debug", "build", "distribute", "examples", "msvc", "cmake_msvc"] [dependencies] -libcurl = "7.57.0" -libarchive = "3.3.2" +libcurl = "7" +libarchive = "3.3.0" libgit2 = "0.26.0" -- cgit v1.2.3