Skip to content

misc: use explicit filenames instead of wildcards for third-party libs #62

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jsm174 merged 1 commit into from
Feb 18, 2025
Merged

misc: use explicit filenames instead of wildcards for third-party libs #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions platforms/android/arm64-v8a/external.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,10 @@

set -e

LIBZEDMD_SHA=893e59cc2f671be17455a68837f4618936006785
LIBZEDMD_SHA=ae3243fe2d31139c7a09755d7503c8f69c5f079d
LIBSERUM_SHA=b0cc2a871d9d5b6395658c56c65402ae388eb78c
LIBPUPDMD_SHA=124f45e5ddd59ceb339591de88fcca72f8c54612

if [[ $(uname) == "Linux" ]]; then
NUM_PROCS=$(nproc)
elif [[ $(uname) == "Darwin" ]]; then
NUM_PROCS=$(sysctl -n hw.ncpu)
else
NUM_PROCS=1
fi

echo "Building libraries..."
echo " LIBZEDMD_SHA: ${LIBZEDMD_SHA}"
echo " LIBSERUM_SHA: ${LIBSERUM_SHA}"
Expand All @@ -25,6 +17,14 @@ if [ -z "${BUILD_TYPE}" ]; then
BUILD_TYPE="Release"
fi

if [[ $(uname) == "Linux" ]]; then
NUM_PROCS=$(nproc)
elif [[ $(uname) == "Darwin" ]]; then
NUM_PROCS=$(sysctl -n hw.ncpu)
else
NUM_PROCS=1
fi

echo "Build type: ${BUILD_TYPE}"
echo "Procs: ${NUM_PROCS}"
echo ""
Expand Down Expand Up @@ -53,7 +53,7 @@ cmake --build build -- -j${NUM_PROCS}
cp src/ZeDMD.h ../../third-party/include/
cp -r third-party/include/sockpp ../../third-party/include/
cp third-party/include/FrameUtil.h ../../third-party/include/
cp -a third-party/runtime-libs/android/arm64-v8a/*.so ../../third-party/runtime-libs/android/arm64-v8a/
cp third-party/runtime-libs/android/arm64-v8a/libsockpp.so ../../third-party/runtime-libs/android/arm64-v8a/
cp build/libzedmd.so ../../third-party/runtime-libs/android/arm64-v8a/
cp -r test ../../
cd ..
Expand Down
8 changes: 4 additions & 4 deletions platforms/ios-simulator/arm64/external.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,10 @@

set -e

LIBZEDMD_SHA=893e59cc2f671be17455a68837f4618936006785
LIBZEDMD_SHA=ae3243fe2d31139c7a09755d7503c8f69c5f079d
LIBSERUM_SHA=b0cc2a871d9d5b6395658c56c65402ae388eb78c
LIBPUPDMD_SHA=124f45e5ddd59ceb339591de88fcca72f8c54612

NUM_PROCS=$(sysctl -n hw.ncpu)

echo "Building libraries..."
echo " LIBZEDMD_SHA: ${LIBZEDMD_SHA}"
echo " LIBSERUM_SHA: ${LIBSERUM_SHA}"
Expand All @@ -18,6 +16,8 @@ if [ -z "${BUILD_TYPE}" ]; then
BUILD_TYPE="Release"
fi

NUM_PROCS=$(sysctl -n hw.ncpu)

echo "Build type: ${BUILD_TYPE}"
echo "Procs: ${NUM_PROCS}"
echo ""
Expand Down Expand Up @@ -46,7 +46,7 @@ cmake --build build -- -j${NUM_PROCS}
cp src/ZeDMD.h ../../third-party/include/
cp -r third-party/include/sockpp ../../third-party/include/
cp third-party/include/FrameUtil.h ../../third-party/include/
cp -a third-party/build-libs/ios-simulator/arm64/*.a ../../third-party/build-libs/ios-simulator/arm64/
cp -a third-party/build-libs/ios-simulator/arm64/libsockpp.a ../../third-party/build-libs/ios-simulator/arm64/
cp build/libzedmd.a ../../third-party/build-libs/ios-simulator/arm64/
cp -r test ../../
cd ..
Expand Down
8 changes: 4 additions & 4 deletions platforms/ios/arm64/external.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,10 @@

set -e

LIBZEDMD_SHA=893e59cc2f671be17455a68837f4618936006785
LIBZEDMD_SHA=ae3243fe2d31139c7a09755d7503c8f69c5f079d
LIBSERUM_SHA=b0cc2a871d9d5b6395658c56c65402ae388eb78c
LIBPUPDMD_SHA=124f45e5ddd59ceb339591de88fcca72f8c54612

NUM_PROCS=$(sysctl -n hw.ncpu)

echo "Building libraries..."
echo " LIBZEDMD_SHA: ${LIBZEDMD_SHA}"
echo " LIBSERUM_SHA: ${LIBSERUM_SHA}"
Expand All @@ -18,6 +16,8 @@ if [ -z "${BUILD_TYPE}" ]; then
BUILD_TYPE="Release"
fi

NUM_PROCS=$(sysctl -n hw.ncpu)

echo "Build type: ${BUILD_TYPE}"
echo "Procs: ${NUM_PROCS}"
echo ""
Expand Down Expand Up @@ -46,7 +46,7 @@ cmake --build build -- -j${NUM_PROCS}
cp src/ZeDMD.h ../../third-party/include/
cp -r third-party/include/sockpp ../../third-party/include/
cp third-party/include/FrameUtil.h ../../third-party/include/
cp -a third-party/build-libs/ios/arm64/*.a ../../third-party/build-libs/ios/arm64/
cp -a third-party/build-libs/ios/arm64/libsockpp.a ../../third-party/build-libs/ios/arm64/
cp build/libzedmd.a ../../third-party/build-libs/ios/arm64/
cp -r test ../../
cd ..
Expand Down
13 changes: 7 additions & 6 deletions platforms/linux/aarch64/external.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,10 @@

set -e

LIBZEDMD_SHA=893e59cc2f671be17455a68837f4618936006785
LIBZEDMD_SHA=ae3243fe2d31139c7a09755d7503c8f69c5f079d
LIBSERUM_SHA=b0cc2a871d9d5b6395658c56c65402ae388eb78c
LIBPUPDMD_SHA=124f45e5ddd59ceb339591de88fcca72f8c54612

NUM_PROCS=$(nproc)

echo "Building libraries..."
echo " LIBZEDMD_SHA: ${LIBZEDMD_SHA}"
echo " LIBSERUM_SHA: ${LIBSERUM_SHA}"
Expand All @@ -18,6 +16,8 @@ if [ -z "${BUILD_TYPE}" ]; then
BUILD_TYPE="Release"
fi

NUM_PROCS=$(nproc)

echo "Build type: ${BUILD_TYPE}"
echo "Procs: ${NUM_PROCS}"
echo ""
Expand Down Expand Up @@ -48,8 +48,10 @@ cp third-party/include/libserialport.h ../../third-party/include/
cp third-party/include/cargs.h ../../third-party/include/
cp -r third-party/include/sockpp ../../third-party/include/
cp third-party/include/FrameUtil.h ../../third-party/include/
cp -a third-party/runtime-libs/linux/aarch64/*.{so,so.*} ../../third-party/runtime-libs/linux/aarch64/
cp -a build/*.{so,so.*} ../../third-party/runtime-libs/linux/aarch64/
cp third-party/runtime-libs/linux/aarch64/libcargs.so ../../third-party/runtime-libs/linux/aarch64/
cp -a third-party/runtime-libs/linux/aarch64/libserialport.{so,so.*} ../../third-party/runtime-libs/linux/aarch64/
cp -a third-party/runtime-libs/linux/aarch64/libsockpp.{so,so.*} ../../third-party/runtime-libs/linux/aarch64/
cp -a build/libzedmd.{so,so.*} ../../third-party/runtime-libs/linux/aarch64/
cp -r test ../../
cd ..

Expand All @@ -71,7 +73,6 @@ cmake \
cmake --build build -- -j${NUM_PROCS}
cp src/serum.h ../../third-party/include/
cp src/serum-decode.h ../../third-party/include/

cp -a build/libserum.{so,so.*} ../../third-party/runtime-libs/linux/aarch64/
cd ..

Expand Down
12 changes: 7 additions & 5 deletions platforms/linux/x64/external.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,10 @@

set -e

LIBZEDMD_SHA=893e59cc2f671be17455a68837f4618936006785
LIBZEDMD_SHA=ae3243fe2d31139c7a09755d7503c8f69c5f079d
LIBSERUM_SHA=b0cc2a871d9d5b6395658c56c65402ae388eb78c
LIBPUPDMD_SHA=124f45e5ddd59ceb339591de88fcca72f8c54612

NUM_PROCS=$(nproc)

echo "Building libraries..."
echo " LIBZEDMD_SHA: ${LIBZEDMD_SHA}"
echo " LIBSERUM_SHA: ${LIBSERUM_SHA}"
Expand All @@ -18,6 +16,8 @@ if [ -z "${BUILD_TYPE}" ]; then
BUILD_TYPE="Release"
fi

NUM_PROCS=$(nproc)

echo "Build type: ${BUILD_TYPE}"
echo "Procs: ${NUM_PROCS}"
echo ""
Expand Down Expand Up @@ -48,8 +48,10 @@ cp third-party/include/libserialport.h ../../third-party/include/
cp third-party/include/cargs.h ../../third-party/include/
cp -r third-party/include/sockpp ../../third-party/include/
cp third-party/include/FrameUtil.h ../../third-party/include/
cp -a third-party/runtime-libs/linux/x64/*.{so,so.*} ../../third-party/runtime-libs/linux/x64/
cp -a build/*.{so,so.*} ../../third-party/runtime-libs/linux/x64/
cp third-party/runtime-libs/linux/x64/libcargs.so ../../third-party/runtime-libs/linux/x64/
cp -a third-party/runtime-libs/linux/x64/libserialport.{so,so.*} ../../third-party/runtime-libs/linux/x64/
cp -a third-party/runtime-libs/linux/x64/libsockpp.{so,so.*} ../../third-party/runtime-libs/linux/x64/
cp -a build/libzedmd.{so,so.*} ../../third-party/runtime-libs/linux/x64/
cp -r test ../../
cd ..

Expand Down
17 changes: 9 additions & 8 deletions platforms/macos/arm64/external.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,10 @@

set -e

LIBZEDMD_SHA=893e59cc2f671be17455a68837f4618936006785
LIBZEDMD_SHA=ae3243fe2d31139c7a09755d7503c8f69c5f079d
LIBSERUM_SHA=b0cc2a871d9d5b6395658c56c65402ae388eb78c
LIBPUPDMD_SHA=124f45e5ddd59ceb339591de88fcca72f8c54612

NUM_PROCS=$(sysctl -n hw.ncpu)

echo "Building libraries..."
echo " LIBZEDMD_SHA: ${LIBZEDMD_SHA}"
echo " LIBSERUM_SHA: ${LIBSERUM_SHA}"
Expand All @@ -18,6 +16,8 @@ if [ -z "${BUILD_TYPE}" ]; then
BUILD_TYPE="Release"
fi

NUM_PROCS=$(sysctl -n hw.ncpu)

echo "Build type: ${BUILD_TYPE}"
echo "Procs: ${NUM_PROCS}"
echo ""
Expand Down Expand Up @@ -48,8 +48,10 @@ cp third-party/include/libserialport.h ../../third-party/include/
cp third-party/include/cargs.h ../../third-party/include/
cp -r third-party/include/sockpp ../../third-party/include/
cp third-party/include/FrameUtil.h ../../third-party/include/
cp -a third-party/runtime-libs/macos/arm64/*.dylib ../../third-party/runtime-libs/macos/arm64/
cp -a build/*.dylib ../../third-party/runtime-libs/macos/arm64/
cp third-party/runtime-libs/macos/arm64/libcargs.dylib ../../third-party/runtime-libs/macos/arm64/
cp -a third-party/runtime-libs/macos/arm64/libserialport.{dylib,*.dylib} ../../third-party/runtime-libs/macos/arm64/
cp -a third-party/runtime-libs/macos/arm64/libsockpp.{dylib,*.dylib} ../../third-party/runtime-libs/macos/arm64/
cp -a build/libzedmd.{dylib,*.dylib} ../../third-party/runtime-libs/macos/arm64/
cp -r test ../../
cd ..

Expand All @@ -71,8 +73,7 @@ cmake \
cmake --build build -- -j${NUM_PROCS}
cp src/serum.h ../../third-party/include/
cp src/serum-decode.h ../../third-party/include/

cp -a build/*.dylib ../../third-party/runtime-libs/macos/arm64/
cp -a build/libserum.{dylib,*.dylib} ../../third-party/runtime-libs/macos/arm64/
cd ..

#
Expand All @@ -92,5 +93,5 @@ cmake \
-B build
cmake --build build -- -j${NUM_PROCS}
cp src/pupdmd.h ../../third-party/include/
cp -a build/*.dylib ../../third-party/runtime-libs/macos/arm64/
cp -a build/libpupdmd.{dylib,*.dylib} ../../third-party/runtime-libs/macos/arm64/
cd ..
17 changes: 9 additions & 8 deletions platforms/macos/x64/external.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,10 @@

set -e

LIBZEDMD_SHA=893e59cc2f671be17455a68837f4618936006785
LIBZEDMD_SHA=ae3243fe2d31139c7a09755d7503c8f69c5f079d
LIBSERUM_SHA=b0cc2a871d9d5b6395658c56c65402ae388eb78c
LIBPUPDMD_SHA=124f45e5ddd59ceb339591de88fcca72f8c54612

NUM_PROCS=$(sysctl -n hw.ncpu)

echo "Building libraries..."
echo " LIBZEDMD_SHA: ${LIBZEDMD_SHA}"
echo " LIBSERUM_SHA: ${LIBSERUM_SHA}"
Expand All @@ -18,6 +16,8 @@ if [ -z "${BUILD_TYPE}" ]; then
BUILD_TYPE="Release"
fi

NUM_PROCS=$(sysctl -n hw.ncpu)

echo "Build type: ${BUILD_TYPE}"
echo "Procs: ${NUM_PROCS}"
echo ""
Expand Down Expand Up @@ -48,8 +48,10 @@ cp third-party/include/libserialport.h ../../third-party/include/
cp third-party/include/cargs.h ../../third-party/include/
cp -r third-party/include/sockpp ../../third-party/include/
cp third-party/include/FrameUtil.h ../../third-party/include/
cp -a third-party/runtime-libs/macos/x64/*.dylib ../../third-party/runtime-libs/macos/x64/
cp -a build/*.dylib ../../third-party/runtime-libs/macos/x64/
cp third-party/runtime-libs/macos/x64/libcargs.dylib ../../third-party/runtime-libs/macos/x64/
cp -a third-party/runtime-libs/macos/x64/libserialport.{dylib,*.dylib} ../../third-party/runtime-libs/macos/x64/
cp -a third-party/runtime-libs/macos/x64/libsockpp.{dylib,*.dylib} ../../third-party/runtime-libs/macos/x64/
cp -a build/libzedmd.{dylib,*.dylib} ../../third-party/runtime-libs/macos/x64/
cp -r test ../../
cd ..

Expand All @@ -71,8 +73,7 @@ cmake \
cmake --build build -- -j${NUM_PROCS}
cp src/serum.h ../../third-party/include/
cp src/serum-decode.h ../../third-party/include/

cp -a build/*.dylib ../../third-party/runtime-libs/macos/x64/
cp -a build/libserum.{dylib,*.dylib} ../../third-party/runtime-libs/macos/x64/
cd ..

#
Expand All @@ -92,5 +93,5 @@ cmake \
-B build
cmake --build build -- -j${NUM_PROCS}
cp src/pupdmd.h ../../third-party/include/
cp -a build/*.dylib ../../third-party/runtime-libs/macos/x64/
cp -a build/libpupdmd.{dylib,*.dylib} ../../third-party/runtime-libs/macos/x64/
cd ..
9 changes: 4 additions & 5 deletions platforms/tvos/arm64/external.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,10 @@

set -e

LIBZEDMD_SHA=893e59cc2f671be17455a68837f4618936006785
LIBZEDMD_SHA=ae3243fe2d31139c7a09755d7503c8f69c5f079d
LIBSERUM_SHA=b0cc2a871d9d5b6395658c56c65402ae388eb78c
LIBPUPDMD_SHA=124f45e5ddd59ceb339591de88fcca72f8c54612

NUM_PROCS=$(sysctl -n hw.ncpu)

echo "Building libraries..."
echo " LIBZEDMD_SHA: ${LIBZEDMD_SHA}"
echo " LIBSERUM_SHA: ${LIBSERUM_SHA}"
Expand All @@ -18,6 +16,8 @@ if [ -z "${BUILD_TYPE}" ]; then
BUILD_TYPE="Release"
fi

NUM_PROCS=$(sysctl -n hw.ncpu)

echo "Build type: ${BUILD_TYPE}"
echo "Procs: ${NUM_PROCS}"
echo ""
Expand Down Expand Up @@ -46,7 +46,7 @@ cmake --build build -- -j${NUM_PROCS}
cp src/ZeDMD.h ../../third-party/include/
cp -r third-party/include/sockpp ../../third-party/include/
cp third-party/include/FrameUtil.h ../../third-party/include/
cp -a third-party/build-libs/tvos/arm64/*.a ../../third-party/build-libs/tvos/arm64/
cp -a third-party/build-libs/tvos/arm64/libsockpp.a ../../third-party/build-libs/tvos/arm64/
cp build/libzedmd.a ../../third-party/build-libs/tvos/arm64/
cp -r test ../../
cd ..
Expand All @@ -69,7 +69,6 @@ cmake \
cmake --build build -- -j${NUM_PROCS}
cp src/serum.h ../../third-party/include/
cp src/serum-decode.h ../../third-party/include/

cp build/libserum.a ../../third-party/build-libs/tvos/arm64/
cd ..

Expand Down
3 changes: 1 addition & 2 deletions platforms/win/x64/external.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

set -e

LIBZEDMD_SHA=893e59cc2f671be17455a68837f4618936006785
LIBZEDMD_SHA=ae3243fe2d31139c7a09755d7503c8f69c5f079d
LIBSERUM_SHA=b0cc2a871d9d5b6395658c56c65402ae388eb78c
LIBPUPDMD_SHA=124f45e5ddd59ceb339591de88fcca72f8c54612

Expand Down Expand Up @@ -74,7 +74,6 @@ cmake \
cmake --build build --config ${BUILD_TYPE}
cp src/serum.h ../../third-party/include/
cp src/serum-decode.h ../../third-party/include/

cp build/${BUILD_TYPE}/serum64.lib ../../third-party/build-libs/win/x64/
cp build/${BUILD_TYPE}/serum64.dll ../../third-party/runtime-libs/win/x64/
cd ..
Expand Down
3 changes: 1 addition & 2 deletions platforms/win/x86/external.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

set -e

LIBZEDMD_SHA=893e59cc2f671be17455a68837f4618936006785
LIBZEDMD_SHA=ae3243fe2d31139c7a09755d7503c8f69c5f079d
LIBSERUM_SHA=b0cc2a871d9d5b6395658c56c65402ae388eb78c
LIBPUPDMD_SHA=124f45e5ddd59ceb339591de88fcca72f8c54612

Expand Down Expand Up @@ -76,7 +76,6 @@ cmake \
cmake --build build --config ${BUILD_TYPE}
cp src/serum.h ../../third-party/include/
cp src/serum-decode.h ../../third-party/include/

cp build/${BUILD_TYPE}/serum.lib ../../third-party/build-libs/win/x86/
cp build/${BUILD_TYPE}/serum.dll ../../third-party/runtime-libs/win/x86/
cd ..
Expand Down