From cb445d04ded2e6b7a86af74527edacbaaeb06371 Mon Sep 17 00:00:00 2001 From: jsonch Date: Fri, 17 May 2024 11:32:49 -0400 Subject: [PATCH] typos --- Makefile | 4 ---- release/unpack.sh | 4 ++-- scripts/build_linux_release.sh | 5 +++-- scripts/build_macos_release.sh | 5 +++-- 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index b6f2a934..6adbe60a 100644 --- a/Makefile +++ b/Makefile @@ -36,13 +36,9 @@ default: cp -f _build/default/src/bin/lucidcc.exe lucidcc macos-release: - dune build src/bin/main.exe - cp -f _build/default/src/bin/main.exe dpt ./scripts/build_macos_release.sh linux-release: - dune build src/bin/main.exe - cp -f _build/default/src/bin/main.exe dpt ./scripts/build_linux_release.sh all: diff --git a/release/unpack.sh b/release/unpack.sh index 4f8363b1..b6b7d186 100755 --- a/release/unpack.sh +++ b/release/unpack.sh @@ -8,11 +8,11 @@ my_dir="$(dirname "$0")" if [ ! -f $my_dir/macos.tar.gz ]; then echo "macos.tar.gz not found -- skipping" else - tar -xvf $my_dir/macos.tar.gz + tar -xvf $my_dir/macos.tar.gz -C $my_dir fi if [ ! -f $my_dir/linux.tar.gz ]; then echo "linux.tar.gz not found -- skipping" else - tar -xvf $my_dir/linux.tar.gz + tar -xvf $my_dir/linux.tar.gz -C $my_dir fi \ No newline at end of file diff --git a/scripts/build_linux_release.sh b/scripts/build_linux_release.sh index 58b58172..d997b7ca 100755 --- a/scripts/build_linux_release.sh +++ b/scripts/build_linux_release.sh @@ -22,12 +22,12 @@ fi release_base=./release os_base=linux release_dir=$release_base/$os_base/lucid -lib_dir=$release_dir/libs +lib_dir=$release_dir/lib rm -rf $release_dir mkdir -p $lib_dir # 1. build the binary locally (in the parent directory) -# make +make # copy binary cp dpt "$release_dir"/dpt @@ -52,6 +52,7 @@ for lib in $deps; do done echo "patching binary dynamic lib paths" +chmod +w "$release_dir"/dpt patchelf --set-rpath '$ORIGIN/lib' "$release_dir"/dpt # package os release in a tarball inside of the release dir diff --git a/scripts/build_macos_release.sh b/scripts/build_macos_release.sh index 2191d892..1c5ded48 100755 --- a/scripts/build_macos_release.sh +++ b/scripts/build_macos_release.sh @@ -22,7 +22,7 @@ fi release_base=./release os_base=macos release_dir=$release_base/$os_base/lucid -lib_dir=$release_dir/libs +lib_dir=$release_dir/lib rm -rf $release_dir mkdir -p $lib_dir @@ -33,7 +33,8 @@ cp dpt $release_dir/ # run dylibbundler to bundle the dynamic libraries (mainly z3) echo "patching binary dynamic lib paths" -dylibbundler -od -b -x $release_dir/dpt -d $lib_dir -p @executable_path/libs/ +chmod +w $release_dir/dpt +dylibbundler -od -b -x $release_dir/dpt -d $lib_dir -p @executable_path/lib/ # package os release in a tarball inside of the release dir echo "Packaging release"