Skip to content

Commit 93fe8c3

Browse files
jsm174jsm174
authored
misc: use explicit filenames instead of wildcards for third-party libs (#62)
1 parent 04cde19 commit 93fe8c3

File tree

10 files changed

+56
-54
lines changed

10 files changed

+56
-54
lines changed

‎platforms/android/arm64-v8a/external.sh‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,10 @@
22

33
set -e
44

5-
LIBZEDMD_SHA=893e59cc2f671be17455a68837f4618936006785
5+
LIBZEDMD_SHA=ae3243fe2d31139c7a09755d7503c8f69c5f079d
66
LIBSERUM_SHA=b0cc2a871d9d5b6395658c56c65402ae388eb78c
77
LIBPUPDMD_SHA=124f45e5ddd59ceb339591de88fcca72f8c54612
88

9-
if [[ $(uname) == "Linux" ]]; then
10-
NUM_PROCS=$(nproc)
11-
elif [[ $(uname) == "Darwin" ]]; then
12-
NUM_PROCS=$(sysctl -n hw.ncpu)
13-
else
14-
NUM_PROCS=1
15-
fi
16-
179
echo "Building libraries..."
1810
echo " LIBZEDMD_SHA: ${LIBZEDMD_SHA}"
1911
echo " LIBSERUM_SHA: ${LIBSERUM_SHA}"
@@ -25,6 +17,14 @@ if [ -z "${BUILD_TYPE}" ]; then
2517
BUILD_TYPE="Release"
2618
fi
2719

20+
if [[ $(uname) == "Linux" ]]; then
21+
NUM_PROCS=$(nproc)
22+
elif [[ $(uname) == "Darwin" ]]; then
23+
NUM_PROCS=$(sysctl -n hw.ncpu)
24+
else
25+
NUM_PROCS=1
26+
fi
27+
2828
echo "Build type: ${BUILD_TYPE}"
2929
echo "Procs: ${NUM_PROCS}"
3030
echo ""
@@ -53,7 +53,7 @@ cmake --build build -- -j${NUM_PROCS}
5353
cp src/ZeDMD.h ../../third-party/include/
5454
cp -r third-party/include/sockpp ../../third-party/include/
5555
cp third-party/include/FrameUtil.h ../../third-party/include/
56-
cp -a third-party/runtime-libs/android/arm64-v8a/*.so ../../third-party/runtime-libs/android/arm64-v8a/
56+
cp third-party/runtime-libs/android/arm64-v8a/libsockpp.so ../../third-party/runtime-libs/android/arm64-v8a/
5757
cp build/libzedmd.so ../../third-party/runtime-libs/android/arm64-v8a/
5858
cp -r test ../../
5959
cd ..

‎platforms/ios-simulator/arm64/external.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,10 @@
22

33
set -e
44

5-
LIBZEDMD_SHA=893e59cc2f671be17455a68837f4618936006785
5+
LIBZEDMD_SHA=ae3243fe2d31139c7a09755d7503c8f69c5f079d
66
LIBSERUM_SHA=b0cc2a871d9d5b6395658c56c65402ae388eb78c
77
LIBPUPDMD_SHA=124f45e5ddd59ceb339591de88fcca72f8c54612
88

9-
NUM_PROCS=$(sysctl -n hw.ncpu)
10-
119
echo "Building libraries..."
1210
echo " LIBZEDMD_SHA: ${LIBZEDMD_SHA}"
1311
echo " LIBSERUM_SHA: ${LIBSERUM_SHA}"
@@ -18,6 +16,8 @@ if [ -z "${BUILD_TYPE}" ]; then
1816
BUILD_TYPE="Release"
1917
fi
2018

19+
NUM_PROCS=$(sysctl -n hw.ncpu)
20+
2121
echo "Build type: ${BUILD_TYPE}"
2222
echo "Procs: ${NUM_PROCS}"
2323
echo ""
@@ -46,7 +46,7 @@ cmake --build build -- -j${NUM_PROCS}
4646
cp src/ZeDMD.h ../../third-party/include/
4747
cp -r third-party/include/sockpp ../../third-party/include/
4848
cp third-party/include/FrameUtil.h ../../third-party/include/
49-
cp -a third-party/build-libs/ios-simulator/arm64/*.a ../../third-party/build-libs/ios-simulator/arm64/
49+
cp -a third-party/build-libs/ios-simulator/arm64/libsockpp.a ../../third-party/build-libs/ios-simulator/arm64/
5050
cp build/libzedmd.a ../../third-party/build-libs/ios-simulator/arm64/
5151
cp -r test ../../
5252
cd ..

‎platforms/ios/arm64/external.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,10 @@
22

33
set -e
44

5-
LIBZEDMD_SHA=893e59cc2f671be17455a68837f4618936006785
5+
LIBZEDMD_SHA=ae3243fe2d31139c7a09755d7503c8f69c5f079d
66
LIBSERUM_SHA=b0cc2a871d9d5b6395658c56c65402ae388eb78c
77
LIBPUPDMD_SHA=124f45e5ddd59ceb339591de88fcca72f8c54612
88

9-
NUM_PROCS=$(sysctl -n hw.ncpu)
10-
119
echo "Building libraries..."
1210
echo " LIBZEDMD_SHA: ${LIBZEDMD_SHA}"
1311
echo " LIBSERUM_SHA: ${LIBSERUM_SHA}"
@@ -18,6 +16,8 @@ if [ -z "${BUILD_TYPE}" ]; then
1816
BUILD_TYPE="Release"
1917
fi
2018

19+
NUM_PROCS=$(sysctl -n hw.ncpu)
20+
2121
echo "Build type: ${BUILD_TYPE}"
2222
echo "Procs: ${NUM_PROCS}"
2323
echo ""
@@ -46,7 +46,7 @@ cmake --build build -- -j${NUM_PROCS}
4646
cp src/ZeDMD.h ../../third-party/include/
4747
cp -r third-party/include/sockpp ../../third-party/include/
4848
cp third-party/include/FrameUtil.h ../../third-party/include/
49-
cp -a third-party/build-libs/ios/arm64/*.a ../../third-party/build-libs/ios/arm64/
49+
cp -a third-party/build-libs/ios/arm64/libsockpp.a ../../third-party/build-libs/ios/arm64/
5050
cp build/libzedmd.a ../../third-party/build-libs/ios/arm64/
5151
cp -r test ../../
5252
cd ..

‎platforms/linux/aarch64/external.sh‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,10 @@
22

33
set -e
44

5-
LIBZEDMD_SHA=893e59cc2f671be17455a68837f4618936006785
5+
LIBZEDMD_SHA=ae3243fe2d31139c7a09755d7503c8f69c5f079d
66
LIBSERUM_SHA=b0cc2a871d9d5b6395658c56c65402ae388eb78c
77
LIBPUPDMD_SHA=124f45e5ddd59ceb339591de88fcca72f8c54612
88

9-
NUM_PROCS=$(nproc)
10-
119
echo "Building libraries..."
1210
echo " LIBZEDMD_SHA: ${LIBZEDMD_SHA}"
1311
echo " LIBSERUM_SHA: ${LIBSERUM_SHA}"
@@ -18,6 +16,8 @@ if [ -z "${BUILD_TYPE}" ]; then
1816
BUILD_TYPE="Release"
1917
fi
2018

19+
NUM_PROCS=$(nproc)
20+
2121
echo "Build type: ${BUILD_TYPE}"
2222
echo "Procs: ${NUM_PROCS}"
2323
echo ""
@@ -48,8 +48,10 @@ cp third-party/include/libserialport.h ../../third-party/include/
4848
cp third-party/include/cargs.h ../../third-party/include/
4949
cp -r third-party/include/sockpp ../../third-party/include/
5050
cp third-party/include/FrameUtil.h ../../third-party/include/
51-
cp -a third-party/runtime-libs/linux/aarch64/*.{so,so.*} ../../third-party/runtime-libs/linux/aarch64/
52-
cp -a build/*.{so,so.*} ../../third-party/runtime-libs/linux/aarch64/
51+
cp third-party/runtime-libs/linux/aarch64/libcargs.so ../../third-party/runtime-libs/linux/aarch64/
52+
cp -a third-party/runtime-libs/linux/aarch64/libserialport.{so,so.*} ../../third-party/runtime-libs/linux/aarch64/
53+
cp -a third-party/runtime-libs/linux/aarch64/libsockpp.{so,so.*} ../../third-party/runtime-libs/linux/aarch64/
54+
cp -a build/libzedmd.{so,so.*} ../../third-party/runtime-libs/linux/aarch64/
5355
cp -r test ../../
5456
cd ..
5557

@@ -71,7 +73,6 @@ cmake \
7173
cmake --build build -- -j${NUM_PROCS}
7274
cp src/serum.h ../../third-party/include/
7375
cp src/serum-decode.h ../../third-party/include/
74-
7576
cp -a build/libserum.{so,so.*} ../../third-party/runtime-libs/linux/aarch64/
7677
cd ..
7778

‎platforms/linux/x64/external.sh‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,10 @@
22

33
set -e
44

5-
LIBZEDMD_SHA=893e59cc2f671be17455a68837f4618936006785
5+
LIBZEDMD_SHA=ae3243fe2d31139c7a09755d7503c8f69c5f079d
66
LIBSERUM_SHA=b0cc2a871d9d5b6395658c56c65402ae388eb78c
77
LIBPUPDMD_SHA=124f45e5ddd59ceb339591de88fcca72f8c54612
88

9-
NUM_PROCS=$(nproc)
10-
119
echo "Building libraries..."
1210
echo " LIBZEDMD_SHA: ${LIBZEDMD_SHA}"
1311
echo " LIBSERUM_SHA: ${LIBSERUM_SHA}"
@@ -18,6 +16,8 @@ if [ -z "${BUILD_TYPE}" ]; then
1816
BUILD_TYPE="Release"
1917
fi
2018

19+
NUM_PROCS=$(nproc)
20+
2121
echo "Build type: ${BUILD_TYPE}"
2222
echo "Procs: ${NUM_PROCS}"
2323
echo ""
@@ -48,8 +48,10 @@ cp third-party/include/libserialport.h ../../third-party/include/
4848
cp third-party/include/cargs.h ../../third-party/include/
4949
cp -r third-party/include/sockpp ../../third-party/include/
5050
cp third-party/include/FrameUtil.h ../../third-party/include/
51-
cp -a third-party/runtime-libs/linux/x64/*.{so,so.*} ../../third-party/runtime-libs/linux/x64/
52-
cp -a build/*.{so,so.*} ../../third-party/runtime-libs/linux/x64/
51+
cp third-party/runtime-libs/linux/x64/libcargs.so ../../third-party/runtime-libs/linux/x64/
52+
cp -a third-party/runtime-libs/linux/x64/libserialport.{so,so.*} ../../third-party/runtime-libs/linux/x64/
53+
cp -a third-party/runtime-libs/linux/x64/libsockpp.{so,so.*} ../../third-party/runtime-libs/linux/x64/
54+
cp -a build/libzedmd.{so,so.*} ../../third-party/runtime-libs/linux/x64/
5355
cp -r test ../../
5456
cd ..
5557

‎platforms/macos/arm64/external.sh‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,10 @@
22

33
set -e
44

5-
LIBZEDMD_SHA=893e59cc2f671be17455a68837f4618936006785
5+
LIBZEDMD_SHA=ae3243fe2d31139c7a09755d7503c8f69c5f079d
66
LIBSERUM_SHA=b0cc2a871d9d5b6395658c56c65402ae388eb78c
77
LIBPUPDMD_SHA=124f45e5ddd59ceb339591de88fcca72f8c54612
88

9-
NUM_PROCS=$(sysctl -n hw.ncpu)
10-
119
echo "Building libraries..."
1210
echo " LIBZEDMD_SHA: ${LIBZEDMD_SHA}"
1311
echo " LIBSERUM_SHA: ${LIBSERUM_SHA}"
@@ -18,6 +16,8 @@ if [ -z "${BUILD_TYPE}" ]; then
1816
BUILD_TYPE="Release"
1917
fi
2018

19+
NUM_PROCS=$(sysctl -n hw.ncpu)
20+
2121
echo "Build type: ${BUILD_TYPE}"
2222
echo "Procs: ${NUM_PROCS}"
2323
echo ""
@@ -48,8 +48,10 @@ cp third-party/include/libserialport.h ../../third-party/include/
4848
cp third-party/include/cargs.h ../../third-party/include/
4949
cp -r third-party/include/sockpp ../../third-party/include/
5050
cp third-party/include/FrameUtil.h ../../third-party/include/
51-
cp -a third-party/runtime-libs/macos/arm64/*.dylib ../../third-party/runtime-libs/macos/arm64/
52-
cp -a build/*.dylib ../../third-party/runtime-libs/macos/arm64/
51+
cp third-party/runtime-libs/macos/arm64/libcargs.dylib ../../third-party/runtime-libs/macos/arm64/
52+
cp -a third-party/runtime-libs/macos/arm64/libserialport.{dylib,*.dylib} ../../third-party/runtime-libs/macos/arm64/
53+
cp -a third-party/runtime-libs/macos/arm64/libsockpp.{dylib,*.dylib} ../../third-party/runtime-libs/macos/arm64/
54+
cp -a build/libzedmd.{dylib,*.dylib} ../../third-party/runtime-libs/macos/arm64/
5355
cp -r test ../../
5456
cd ..
5557

@@ -71,8 +73,7 @@ cmake \
7173
cmake --build build -- -j${NUM_PROCS}
7274
cp src/serum.h ../../third-party/include/
7375
cp src/serum-decode.h ../../third-party/include/
74-
75-
cp -a build/*.dylib ../../third-party/runtime-libs/macos/arm64/
76+
cp -a build/libserum.{dylib,*.dylib} ../../third-party/runtime-libs/macos/arm64/
7677
cd ..
7778

7879
#
@@ -92,5 +93,5 @@ cmake \
9293
-B build
9394
cmake --build build -- -j${NUM_PROCS}
9495
cp src/pupdmd.h ../../third-party/include/
95-
cp -a build/*.dylib ../../third-party/runtime-libs/macos/arm64/
96+
cp -a build/libpupdmd.{dylib,*.dylib} ../../third-party/runtime-libs/macos/arm64/
9697
cd ..

‎platforms/macos/x64/external.sh‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,10 @@
22

33
set -e
44

5-
LIBZEDMD_SHA=893e59cc2f671be17455a68837f4618936006785
5+
LIBZEDMD_SHA=ae3243fe2d31139c7a09755d7503c8f69c5f079d
66
LIBSERUM_SHA=b0cc2a871d9d5b6395658c56c65402ae388eb78c
77
LIBPUPDMD_SHA=124f45e5ddd59ceb339591de88fcca72f8c54612
88

9-
NUM_PROCS=$(sysctl -n hw.ncpu)
10-
119
echo "Building libraries..."
1210
echo " LIBZEDMD_SHA: ${LIBZEDMD_SHA}"
1311
echo " LIBSERUM_SHA: ${LIBSERUM_SHA}"
@@ -18,6 +16,8 @@ if [ -z "${BUILD_TYPE}" ]; then
1816
BUILD_TYPE="Release"
1917
fi
2018

19+
NUM_PROCS=$(sysctl -n hw.ncpu)
20+
2121
echo "Build type: ${BUILD_TYPE}"
2222
echo "Procs: ${NUM_PROCS}"
2323
echo ""
@@ -48,8 +48,10 @@ cp third-party/include/libserialport.h ../../third-party/include/
4848
cp third-party/include/cargs.h ../../third-party/include/
4949
cp -r third-party/include/sockpp ../../third-party/include/
5050
cp third-party/include/FrameUtil.h ../../third-party/include/
51-
cp -a third-party/runtime-libs/macos/x64/*.dylib ../../third-party/runtime-libs/macos/x64/
52-
cp -a build/*.dylib ../../third-party/runtime-libs/macos/x64/
51+
cp third-party/runtime-libs/macos/x64/libcargs.dylib ../../third-party/runtime-libs/macos/x64/
52+
cp -a third-party/runtime-libs/macos/x64/libserialport.{dylib,*.dylib} ../../third-party/runtime-libs/macos/x64/
53+
cp -a third-party/runtime-libs/macos/x64/libsockpp.{dylib,*.dylib} ../../third-party/runtime-libs/macos/x64/
54+
cp -a build/libzedmd.{dylib,*.dylib} ../../third-party/runtime-libs/macos/x64/
5355
cp -r test ../../
5456
cd ..
5557

@@ -71,8 +73,7 @@ cmake \
7173
cmake --build build -- -j${NUM_PROCS}
7274
cp src/serum.h ../../third-party/include/
7375
cp src/serum-decode.h ../../third-party/include/
74-
75-
cp -a build/*.dylib ../../third-party/runtime-libs/macos/x64/
76+
cp -a build/libserum.{dylib,*.dylib} ../../third-party/runtime-libs/macos/x64/
7677
cd ..
7778

7879
#
@@ -92,5 +93,5 @@ cmake \
9293
-B build
9394
cmake --build build -- -j${NUM_PROCS}
9495
cp src/pupdmd.h ../../third-party/include/
95-
cp -a build/*.dylib ../../third-party/runtime-libs/macos/x64/
96+
cp -a build/libpupdmd.{dylib,*.dylib} ../../third-party/runtime-libs/macos/x64/
9697
cd ..

‎platforms/tvos/arm64/external.sh‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,10 @@
22

33
set -e
44

5-
LIBZEDMD_SHA=893e59cc2f671be17455a68837f4618936006785
5+
LIBZEDMD_SHA=ae3243fe2d31139c7a09755d7503c8f69c5f079d
66
LIBSERUM_SHA=b0cc2a871d9d5b6395658c56c65402ae388eb78c
77
LIBPUPDMD_SHA=124f45e5ddd59ceb339591de88fcca72f8c54612
88

9-
NUM_PROCS=$(sysctl -n hw.ncpu)
10-
119
echo "Building libraries..."
1210
echo " LIBZEDMD_SHA: ${LIBZEDMD_SHA}"
1311
echo " LIBSERUM_SHA: ${LIBSERUM_SHA}"
@@ -18,6 +16,8 @@ if [ -z "${BUILD_TYPE}" ]; then
1816
BUILD_TYPE="Release"
1917
fi
2018

19+
NUM_PROCS=$(sysctl -n hw.ncpu)
20+
2121
echo "Build type: ${BUILD_TYPE}"
2222
echo "Procs: ${NUM_PROCS}"
2323
echo ""
@@ -46,7 +46,7 @@ cmake --build build -- -j${NUM_PROCS}
4646
cp src/ZeDMD.h ../../third-party/include/
4747
cp -r third-party/include/sockpp ../../third-party/include/
4848
cp third-party/include/FrameUtil.h ../../third-party/include/
49-
cp -a third-party/build-libs/tvos/arm64/*.a ../../third-party/build-libs/tvos/arm64/
49+
cp -a third-party/build-libs/tvos/arm64/libsockpp.a ../../third-party/build-libs/tvos/arm64/
5050
cp build/libzedmd.a ../../third-party/build-libs/tvos/arm64/
5151
cp -r test ../../
5252
cd ..
@@ -69,7 +69,6 @@ cmake \
6969
cmake --build build -- -j${NUM_PROCS}
7070
cp src/serum.h ../../third-party/include/
7171
cp src/serum-decode.h ../../third-party/include/
72-
7372
cp build/libserum.a ../../third-party/build-libs/tvos/arm64/
7473
cd ..
7574

‎platforms/win/x64/external.sh‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
set -e
44

5-
LIBZEDMD_SHA=893e59cc2f671be17455a68837f4618936006785
5+
LIBZEDMD_SHA=ae3243fe2d31139c7a09755d7503c8f69c5f079d
66
LIBSERUM_SHA=b0cc2a871d9d5b6395658c56c65402ae388eb78c
77
LIBPUPDMD_SHA=124f45e5ddd59ceb339591de88fcca72f8c54612
88

@@ -74,7 +74,6 @@ cmake \
7474
cmake --build build --config ${BUILD_TYPE}
7575
cp src/serum.h ../../third-party/include/
7676
cp src/serum-decode.h ../../third-party/include/
77-
7877
cp build/${BUILD_TYPE}/serum64.lib ../../third-party/build-libs/win/x64/
7978
cp build/${BUILD_TYPE}/serum64.dll ../../third-party/runtime-libs/win/x64/
8079
cd ..

‎platforms/win/x86/external.sh‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
set -e
44

5-
LIBZEDMD_SHA=893e59cc2f671be17455a68837f4618936006785
5+
LIBZEDMD_SHA=ae3243fe2d31139c7a09755d7503c8f69c5f079d
66
LIBSERUM_SHA=b0cc2a871d9d5b6395658c56c65402ae388eb78c
77
LIBPUPDMD_SHA=124f45e5ddd59ceb339591de88fcca72f8c54612
88

@@ -76,7 +76,6 @@ cmake \
7676
cmake --build build --config ${BUILD_TYPE}
7777
cp src/serum.h ../../third-party/include/
7878
cp src/serum-decode.h ../../third-party/include/
79-
8079
cp build/${BUILD_TYPE}/serum.lib ../../third-party/build-libs/win/x86/
8180
cp build/${BUILD_TYPE}/serum.dll ../../third-party/runtime-libs/win/x86/
8281
cd ..

0 commit comments

Comments
 (0)