From 2f9b1edfcce28c6ae81424648b8c65960ec938d7 Mon Sep 17 00:00:00 2001 From: Pork Chop Date: Tue, 12 Mar 2024 20:13:59 +1100 Subject: [PATCH] Fix linux build, general cleanups --- autobuild.xml | 9 ++++++--- build-cmd.sh | 45 +++++++++++++++++++++++---------------------- 2 files changed, 29 insertions(+), 25 deletions(-) mode change 100644 => 100755 build-cmd.sh diff --git a/autobuild.xml b/autobuild.xml index 9b07f39..9648e7a 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -40,7 +40,7 @@ manifest - LICENSES/openexr.txt + LICENSES/OpenEXR.txt include lib @@ -96,12 +96,15 @@ default + manifest + + name - darwin + linux64 source_directory - lua + openexr source_type git version_file diff --git a/build-cmd.sh b/build-cmd.sh old mode 100644 new mode 100755 index 406794f..bca0f33 --- a/build-cmd.sh +++ b/build-cmd.sh @@ -21,31 +21,27 @@ fi top="$(pwd)" stage="$(pwd)/stage" - -echo $top -echo $stage - -# load autobuild provided shell functions and variables -source_environment_tempfile="$stage/source_environment.sh" -"$autobuild" source_environment > "$source_environment_tempfile" -. "$source_environment_tempfile" +srcdir="$top/openexr" +builddir="$top/build" # remove_cxxstd source "$(dirname "$AUTOBUILD_VARIABLES_FILE")/functions" -build=${AUTOBUILD_BUILD_ID:=0} +mkdir -p "$stage/include" "$stage/lib/release" $builddir -mkdir -p "$stage/include/OpenEXR" -mkdir -p "$stage/lib/release" - -srcdir="$top/openexr" -builddir="$top/build" +build=${AUTOBUILD_BUILD_ID:=0} +version=$(cat VERSION.txt) +echo "${version}.${build}" > "${stage}/VERSION.txt" -mkdir -p $builddir -mkdir -p $stage +# load autobuild provided shell functions and variables +source_environment_tempfile="$stage/source_environment.sh" +"$autobuild" source_environment > "$source_environment_tempfile" +. "$source_environment_tempfile" pushd $builddir +#exit + case "$AUTOBUILD_PLATFORM" in windows*) cmake .. -DCMAKE_INSTALL_PREFIX=../release @@ -53,19 +49,24 @@ case "$AUTOBUILD_PLATFORM" in cp -v ../release/lib/*.lib "$stage/lib/release/" cp -rv ../release/bin/*.dll "$stage/bin" ;; -darwin*|linux64*) - +darwin*) cmake .. --install-prefix ../release cmake --build . --target install --config Release cp -v ../release/lib/*.a "$stage/lib/release/" ;; -esac +linux64) + cmake "$top/openexr" -DOPENEXR_LIB_SUFFIX= -DBUILD_SHARED_LIBS=OFF --install-prefix "$top/release" + cmake --build . -j$(nproc) --target install --config Release + cp -a $top/release/lib/{libIex.a,libIlmThread.a,libOpenEXR.a,libOpenEXRCore.a,libOpenEXRUtil.a} "$stage/lib/release/" +;; -cp -rv ../release/include/OpenEXR "$stage/include/OpenEXR" -cp -rv ../release/include/Imath "$stage/include/Imath" +esac popd +cp -ra "release/include/OpenEXR" "$stage/include" +cp -ra "release/include/Imath" "$stage/include" + mkdir -p "$stage/LICENSES" -cp "$top/LICENSE" "$stage/LICENSES/openexr.txt" +cp LICENSE "$stage/LICENSES/OpenEXR.txt"