Skip to content
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

use libframeutil instead of copied code #38

Merged
merged 6 commits into from
Apr 3, 2024
Merged

use libframeutil instead of copied code #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
aac8c81
use libframeutil instead of copied code
mkalkbrenner Apr 2, 2024
c267522
libframeutil update
mkalkbrenner Apr 2, 2024
a010a13
ilibframeutil 0.2.0
mkalkbrenner Apr 2, 2024
ba77dcc
misc: move Frameutil.h into third-party for portability
jsm174 Apr 3, 2024
4c21bde
still fetch libframeutil in case an update is required
mkalkbrenner Apr 3, 2024
b92627f
inew lib versions
mkalkbrenner Apr 3, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/libdmdutil.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ jobs:
zip -r libdmdutil-${{ needs.version.outputs.tag }}-win-x64.zip libdmdutil-${{ needs.version.outputs.tag }}-win-x64
zip -r libdmdutil-${{ needs.version.outputs.tag }}-win-x86.zip libdmdutil-${{ needs.version.outputs.tag }}-win-x86
- name: Release
uses: softprops/action-gh-release@v1
uses: softprops/action-gh-release@v2
if: startsWith(github.ref, 'refs/tags/')
with:
draft: true
Expand Down
8 changes: 7 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,11 @@ external.sh
external
third-party/runtime-libs
third-party/build-libs
third-party/include
third-party/include/sockpp
third-party/include/cargs.h
third-party/include/*.hpp
third-party/include/libserialport.h
third-party/include/pupdmd.h
third-party/include/serum-decode.h
third-party/include/ZeDMD.h
.DS_Store
1 change: 0 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ set(DMDUTIL_SOURCES
src/ConsoleDMD.cpp
src/Logger.cpp
src/AlphaNumeric.cpp
src/FrameUtil.cpp
src/Serum.cpp
)

Expand Down
17 changes: 15 additions & 2 deletions platforms/android/arm64-v8a/external.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@
set -e

CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251
LIBZEDMD_SHA=42d95ed6f1fe2065ecbd247502d177d7e5eb7e4c
LIBZEDMD_SHA=984ac9b14824d3924455c64f36c512e5b35852b7
LIBSERUM_SHA=b69d2b436bc93570a2e7e78d0946cd3c43f7aed5
SOCKPP_SHA=e6c4688a576d95f42dd7628cefe68092f6c5cd0f
LIBPUPDMD_SHA=8dedc8c81ded2f6b8ca4614752d395aae0332c6c
LIBPUPDMD_SHA=c640ea2cec94097e8baefee9dab39266970e4405
LIBFRAMEUTIL_SHA=d9bde3069786f1a33d2021afe19566d812e873f5

if [[ $(uname) == "Linux" ]]; then
NUM_PROCS=$(nproc)
Expand All @@ -22,6 +23,8 @@ echo " LIBZEDMD_SHA: ${LIBZEDMD_SHA}"
echo " LIBSERUM_SHA: ${LIBSERUM_SHA}"
echo " SOCKPP_SHA: ${SOCKPP_SHA}"
echo " LIBPUPDMD_SHA: ${LIBPUPDMD_SHA}"
echo " LIBFRAMEUTIL_SHA: ${LIBFRAMEUTIL_SHA}"
echo " NUM_PROCS: ${NUM_PROCS}"
echo ""

if [ -z "${BUILD_TYPE}" ]; then
Expand Down Expand Up @@ -137,3 +140,13 @@ cmake --build build -- -j${NUM_PROCS}
cp src/pupdmd.h ../../third-party/include/
cp build/libpupdmd.so ../../third-party/runtime-libs/android/arm64-v8a/
cd ..

#
# copy libframeutil
#

curl -sL https://github.com/ppuc/libframeutil/archive/${LIBFRAMEUTIL_SHA}.zip -o libframeutil.zip
unzip libframeutil.zip
cd libframeutil-$LIBFRAMEUTIL_SHA
cp include/* ../../third-party/include
cd ..
16 changes: 14 additions & 2 deletions platforms/ios/arm64/external.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@
set -e

CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251
LIBZEDMD_SHA=42d95ed6f1fe2065ecbd247502d177d7e5eb7e4c
LIBZEDMD_SHA=984ac9b14824d3924455c64f36c512e5b35852b7
LIBSERUM_SHA=b69d2b436bc93570a2e7e78d0946cd3c43f7aed5
SOCKPP_SHA=e6c4688a576d95f42dd7628cefe68092f6c5cd0f
LIBPUPDMD_SHA=8dedc8c81ded2f6b8ca4614752d395aae0332c6c
LIBPUPDMD_SHA=c640ea2cec94097e8baefee9dab39266970e4405
LIBFRAMEUTIL_SHA=d9bde3069786f1a33d2021afe19566d812e873f5

NUM_PROCS=$(sysctl -n hw.ncpu)

Expand All @@ -16,6 +17,7 @@ echo " LIBZEDMD_SHA: ${LIBZEDMD_SHA}"
echo " LIBSERUM_SHA: ${LIBSERUM_SHA}"
echo " SOCKPP_SHA: ${SOCKPP_SHA}"
echo " LIBPUPDMD_SHA: ${LIBPUPDMD_SHA}"
echo " LIBFRAMEUTIL_SHA: ${LIBFRAMEUTIL_SHA}"
echo ""

if [ -z "${BUILD_TYPE}" ]; then
Expand Down Expand Up @@ -123,3 +125,13 @@ cmake --build build -- -j${NUM_PROCS}
cp src/pupdmd.h ../../third-party/include/
cp build/libpupdmd.a ../../third-party/build-libs/ios/arm64/
cd ..

#
# copy libframeutil
#

curl -sL https://github.com/ppuc/libframeutil/archive/${LIBFRAMEUTIL_SHA}.zip -o libframeutil.zip
unzip libframeutil.zip
cd libframeutil-$LIBFRAMEUTIL_SHA
cp include/* ../../third-party/include
cd ..
17 changes: 15 additions & 2 deletions platforms/linux/aarch64/external.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@
set -e

CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251
LIBZEDMD_SHA=42d95ed6f1fe2065ecbd247502d177d7e5eb7e4c
LIBZEDMD_SHA=984ac9b14824d3924455c64f36c512e5b35852b7
LIBSERUM_SHA=b69d2b436bc93570a2e7e78d0946cd3c43f7aed5
SOCKPP_SHA=e6c4688a576d95f42dd7628cefe68092f6c5cd0f
LIBPUPDMD_SHA=8dedc8c81ded2f6b8ca4614752d395aae0332c6c
LIBPUPDMD_SHA=c640ea2cec94097e8baefee9dab39266970e4405
LIBFRAMEUTIL_SHA=d9bde3069786f1a33d2021afe19566d812e873f5

NUM_PROCS=$(nproc)

Expand All @@ -16,6 +17,7 @@ echo " LIBZEDMD_SHA: ${LIBZEDMD_SHA}"
echo " LIBSERUM_SHA: ${LIBSERUM_SHA}"
echo " SOCKPP_SHA: ${SOCKPP_SHA}"
echo " LIBPUPDMD_SHA: ${LIBPUPDMD_SHA}"
echo " LIBFRAMEUTIL_SHA: ${LIBFRAMEUTIL_SHA}"
echo ""

if [ -z "${BUILD_TYPE}" ]; then
Expand Down Expand Up @@ -64,6 +66,7 @@ cmake \
cmake --build build -- -j${NUM_PROCS}
cp src/ZeDMD.h ../../third-party/include/
cp third-party/include/libserialport.h ../../third-party/include/
cp third-party/include/FrameUtil.h ../../third-party/include/
ln -s $(ls -v third-party/runtime-libs/linux/aarch64/libserialport.so.* | tail -n 1 | xargs basename) third-party/runtime-libs/linux/aarch64/libserialport.so
cp -a third-party/runtime-libs/linux/aarch64/libserialport.{so,so.*} ../../third-party/runtime-libs/linux/aarch64/
cp -a build/libzedmd.{so,so.*} ../../third-party/runtime-libs/linux/aarch64/
Expand Down Expand Up @@ -122,3 +125,13 @@ cmake --build build -- -j${NUM_PROCS}
cp src/pupdmd.h ../../third-party/include/
cp -a build/libpupdmd.{so,so.*} ../../third-party/runtime-libs/linux/aarch64/
cd ..

#
# copy libframeutil
#

curl -sL https://github.com/ppuc/libframeutil/archive/${LIBFRAMEUTIL_SHA}.zip -o libframeutil.zip
unzip libframeutil.zip
cd libframeutil-$LIBFRAMEUTIL_SHA
cp include/* ../../third-party/include
cd ..
17 changes: 15 additions & 2 deletions platforms/linux/x64/external.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@
set -e

CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251
LIBZEDMD_SHA=42d95ed6f1fe2065ecbd247502d177d7e5eb7e4c
LIBZEDMD_SHA=984ac9b14824d3924455c64f36c512e5b35852b7
LIBSERUM_SHA=b69d2b436bc93570a2e7e78d0946cd3c43f7aed5
SOCKPP_SHA=e6c4688a576d95f42dd7628cefe68092f6c5cd0f
LIBPUPDMD_SHA=8dedc8c81ded2f6b8ca4614752d395aae0332c6c
LIBPUPDMD_SHA=c640ea2cec94097e8baefee9dab39266970e4405
LIBFRAMEUTIL_SHA=d9bde3069786f1a33d2021afe19566d812e873f5

NUM_PROCS=$(nproc)

Expand All @@ -16,6 +17,7 @@ echo " LIBZEDMD_SHA: ${LIBZEDMD_SHA}"
echo " LIBSERUM_SHA: ${LIBSERUM_SHA}"
echo " SOCKPP_SHA: ${SOCKPP_SHA}"
echo " LIBPUPDMD_SHA: ${LIBPUPDMD_SHA}"
echo " LIBFRAMEUTIL_SHA: ${LIBFRAMEUTIL_SHA}"
echo ""

if [ -z "${BUILD_TYPE}" ]; then
Expand Down Expand Up @@ -64,6 +66,7 @@ cmake \
cmake --build build -- -j${NUM_PROCS}
cp src/ZeDMD.h ../../third-party/include/
cp third-party/include/libserialport.h ../../third-party/include/
cp third-party/include/FrameUtil.h ../../third-party/include/
ln -s $(ls -v third-party/runtime-libs/linux/x64/libserialport.so.* | tail -n 1 | xargs basename) third-party/runtime-libs/linux/x64/libserialport.so
cp -a third-party/runtime-libs/linux/x64/libserialport.{so,so.*} ../../third-party/runtime-libs/linux/x64/
cp -a build/libzedmd.{so,so.*} ../../third-party/runtime-libs/linux/x64/
Expand Down Expand Up @@ -122,3 +125,13 @@ cmake --build build -- -j${NUM_PROCS}
cp src/pupdmd.h ../../third-party/include/
cp -a build/libpupdmd.{so,so.*} ../../third-party/runtime-libs/linux/x64/
cd ..

#
# copy libframeutil
#

curl -sL https://github.com/ppuc/libframeutil/archive/${LIBFRAMEUTIL_SHA}.zip -o libframeutil.zip
unzip libframeutil.zip
cd libframeutil-$LIBFRAMEUTIL_SHA
cp include/* ../../third-party/include
cd ..
16 changes: 14 additions & 2 deletions platforms/macos/arm64/external.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@
set -e

CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251
LIBZEDMD_SHA=42d95ed6f1fe2065ecbd247502d177d7e5eb7e4c
LIBZEDMD_SHA=984ac9b14824d3924455c64f36c512e5b35852b7
LIBSERUM_SHA=b69d2b436bc93570a2e7e78d0946cd3c43f7aed5
SOCKPP_SHA=e6c4688a576d95f42dd7628cefe68092f6c5cd0f
LIBPUPDMD_SHA=8dedc8c81ded2f6b8ca4614752d395aae0332c6c
LIBPUPDMD_SHA=c640ea2cec94097e8baefee9dab39266970e4405
LIBFRAMEUTIL_SHA=d9bde3069786f1a33d2021afe19566d812e873f5

NUM_PROCS=$(sysctl -n hw.ncpu)

Expand All @@ -16,6 +17,7 @@ echo " LIBZEDMD_SHA: ${LIBZEDMD_SHA}"
echo " LIBSERUM_SHA: ${LIBSERUM_SHA}"
echo " SOCKPP_SHA: ${SOCKPP_SHA}"
echo " LIBPUPDMD_SHA: ${LIBPUPDMD_SHA}"
echo " LIBFRAMEUTIL_SHA: ${LIBFRAMEUTIL_SHA}"
echo ""

if [ -z "${BUILD_TYPE}" ]; then
Expand Down Expand Up @@ -127,3 +129,13 @@ cmake --build build -- -j${NUM_PROCS}
cp src/pupdmd.h ../../third-party/include/
cp -a build/*.dylib ../../third-party/runtime-libs/macos/arm64/
cd ..

#
# copy libframeutil
#

curl -sL https://github.com/ppuc/libframeutil/archive/${LIBFRAMEUTIL_SHA}.zip -o libframeutil.zip
unzip libframeutil.zip
cd libframeutil-$LIBFRAMEUTIL_SHA
cp include/* ../../third-party/include
cd ..
16 changes: 14 additions & 2 deletions platforms/macos/x64/external.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@
set -e

CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251
LIBZEDMD_SHA=42d95ed6f1fe2065ecbd247502d177d7e5eb7e4c
LIBZEDMD_SHA=984ac9b14824d3924455c64f36c512e5b35852b7
LIBSERUM_SHA=b69d2b436bc93570a2e7e78d0946cd3c43f7aed5
SOCKPP_SHA=e6c4688a576d95f42dd7628cefe68092f6c5cd0f
LIBPUPDMD_SHA=8dedc8c81ded2f6b8ca4614752d395aae0332c6c
LIBPUPDMD_SHA=c640ea2cec94097e8baefee9dab39266970e4405
LIBFRAMEUTIL_SHA=d9bde3069786f1a33d2021afe19566d812e873f5

NUM_PROCS=$(sysctl -n hw.ncpu)

Expand All @@ -16,6 +17,7 @@ echo " LIBZEDMD_SHA: ${LIBZEDMD_SHA}"
echo " LIBSERUM_SHA: ${LIBSERUM_SHA}"
echo " SOCKPP_SHA: ${SOCKPP_SHA}"
echo " LIBPUPDMD_SHA: ${LIBPUPDMD_SHA}"
echo " LIBFRAMEUTIL_SHA: ${LIBFRAMEUTIL_SHA}"
echo ""

if [ -z "${BUILD_TYPE}" ]; then
Expand Down Expand Up @@ -127,3 +129,13 @@ cmake --build build -- -j${NUM_PROCS}
cp src/pupdmd.h ../../third-party/include/
cp -a build/*.dylib ../../third-party/runtime-libs/macos/x64/
cd ..

#
# copy libframeutil
#

curl -sL https://github.com/ppuc/libframeutil/archive/${LIBFRAMEUTIL_SHA}.zip -o libframeutil.zip
unzip libframeutil.zip
cd libframeutil-$LIBFRAMEUTIL_SHA
cp include/* ../../third-party/include
cd ..
16 changes: 14 additions & 2 deletions platforms/tvos/arm64/external.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@
set -e

CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251
LIBZEDMD_SHA=42d95ed6f1fe2065ecbd247502d177d7e5eb7e4c
LIBZEDMD_SHA=984ac9b14824d3924455c64f36c512e5b35852b7
LIBSERUM_SHA=b69d2b436bc93570a2e7e78d0946cd3c43f7aed5
SOCKPP_SHA=e6c4688a576d95f42dd7628cefe68092f6c5cd0f
LIBPUPDMD_SHA=8dedc8c81ded2f6b8ca4614752d395aae0332c6c
LIBPUPDMD_SHA=c640ea2cec94097e8baefee9dab39266970e4405
LIBFRAMEUTIL_SHA=d9bde3069786f1a33d2021afe19566d812e873f5

NUM_PROCS=$(sysctl -n hw.ncpu)

Expand All @@ -16,6 +17,7 @@ echo " LIBZEDMD_SHA: ${LIBZEDMD_SHA}"
echo " LIBSERUM_SHA: ${LIBSERUM_SHA}"
echo " SOCKPP_SHA: ${SOCKPP_SHA}"
echo " LIBPUPDMD_SHA: ${LIBPUPDMD_SHA}"
echo " LIBFRAMEUTIL_SHA: ${LIBFRAMEUTIL_SHA}"
echo ""

if [ -z "${BUILD_TYPE}" ]; then
Expand Down Expand Up @@ -123,3 +125,13 @@ cmake --build build -- -j${NUM_PROCS}
cp src/pupdmd.h ../../third-party/include/
cp build/libpupdmd.a ../../third-party/build-libs/tvos/arm64/
cd ..

#
# copy libframeutil
#

curl -sL https://github.com/ppuc/libframeutil/archive/${LIBFRAMEUTIL_SHA}.zip -o libframeutil.zip
unzip libframeutil.zip
cd libframeutil-$LIBFRAMEUTIL_SHA
cp include/* ../../third-party/include
cd ..
16 changes: 14 additions & 2 deletions platforms/win/x64/external.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,19 @@
set -e

CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251
LIBZEDMD_SHA=42d95ed6f1fe2065ecbd247502d177d7e5eb7e4c
LIBZEDMD_SHA=984ac9b14824d3924455c64f36c512e5b35852b7
LIBSERUM_SHA=b69d2b436bc93570a2e7e78d0946cd3c43f7aed5
SOCKPP_SHA=e6c4688a576d95f42dd7628cefe68092f6c5cd0f
LIBPUPDMD_SHA=8dedc8c81ded2f6b8ca4614752d395aae0332c6c
LIBPUPDMD_SHA=c640ea2cec94097e8baefee9dab39266970e4405
LIBFRAMEUTIL_SHA=d9bde3069786f1a33d2021afe19566d812e873f5

echo "Building libraries..."
echo " CARGS_SHA: ${CARGS_SHA}"
echo " LIBZEDMD_SHA: ${LIBZEDMD_SHA}"
echo " LIBSERUM_SHA: ${LIBSERUM_SHA}"
echo " SOCKPP_SHA: ${SOCKPP_SHA}"
echo " LIBPUPDMD_SHA: ${LIBPUPDMD_SHA}"
echo " LIBFRAMEUTIL_SHA: ${LIBFRAMEUTIL_SHA}"
echo ""

if [ -z "${BUILD_TYPE}" ]; then
Expand Down Expand Up @@ -126,3 +128,13 @@ cp src/pupdmd.h ../../third-party/include/
cp build/${BUILD_TYPE}/pupdmd64.lib ../../third-party/build-libs/win/x64/
cp build/${BUILD_TYPE}/pupdmd64.dll ../../third-party/runtime-libs/win/x64/
cd ..

#
# copy libframeutil
#

curl -sL https://github.com/ppuc/libframeutil/archive/${LIBFRAMEUTIL_SHA}.zip -o libframeutil.zip
unzip libframeutil.zip
cd libframeutil-$LIBFRAMEUTIL_SHA
cp include/* ../../third-party/include
cd ..
16 changes: 14 additions & 2 deletions platforms/win/x86/external.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,19 @@
set -e

CARGS_SHA=5949a20a926e902931de4a32adaad9f19c76f251
LIBZEDMD_SHA=42d95ed6f1fe2065ecbd247502d177d7e5eb7e4c
LIBZEDMD_SHA=984ac9b14824d3924455c64f36c512e5b35852b7
LIBSERUM_SHA=b69d2b436bc93570a2e7e78d0946cd3c43f7aed5
SOCKPP_SHA=e6c4688a576d95f42dd7628cefe68092f6c5cd0f
LIBPUPDMD_SHA=8dedc8c81ded2f6b8ca4614752d395aae0332c6c
LIBPUPDMD_SHA=c640ea2cec94097e8baefee9dab39266970e4405
LIBFRAMEUTIL_SHA=d9bde3069786f1a33d2021afe19566d812e873f5

echo "Building libraries..."
echo " CARGS_SHA: ${CARGS_SHA}"
echo " LIBZEDMD_SHA: ${LIBZEDMD_SHA}"
echo " LIBSERUM_SHA: ${LIBSERUM_SHA}"
echo " SOCKPP_SHA: ${SOCKPP_SHA}"
echo " LIBPUPDMD_SHA: ${LIBPUPDMD_SHA}"
echo " LIBFRAMEUTIL_SHA: ${LIBFRAMEUTIL_SHA}"
echo ""

if [ -z "${BUILD_TYPE}" ]; then
Expand Down Expand Up @@ -129,3 +131,13 @@ cp src/pupdmd.h ../../third-party/include/
cp build/${BUILD_TYPE}/pupdmd.lib ../../third-party/build-libs/win/x86/
cp build/${BUILD_TYPE}/pupdmd.dll ../../third-party/runtime-libs/win/x86/
cd ..

#
# copy libframeutil
#

curl -sL https://github.com/ppuc/libframeutil/archive/${LIBFRAMEUTIL_SHA}.zip -o libframeutil.zip
unzip libframeutil.zip
cd libframeutil-$LIBFRAMEUTIL_SHA
cp include/* ../../third-party/include
cd ..
Loading