Skip to content

Commit

Permalink
build for Mac and iOS
Browse files Browse the repository at this point in the history
  • Loading branch information
pippocao committed Sep 7, 2024
1 parent 61ccc76 commit 359e6b2
Show file tree
Hide file tree
Showing 60 changed files with 2,579 additions and 2,667 deletions.
Binary file modified bin/tools/mac/MinSizeRel/BqLog_LogDecoder
View file
Binary file not shown.
Binary file modified bin/tools/mac/RelWithDebInfo/BqLog_LogDecoder
View file
Binary file not shown.
6 changes: 6 additions & 0 deletions build/lib/android/Mac_Build_Dynamic_Lib.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,12 @@ do
-DANDROID_STL=none

$ANDROID_NDK_ROOT/prebuilt/darwin-x86_64/bin/make VERBOSE=1 -j$(sysctl -n hw.logicalcpu)
if [ $? -eq 0 ]; then
echo "Build succeeded."
else
echo "Build failed."
exit 1
fi
$ANDROID_NDK_ROOT/prebuilt/darwin-x86_64/bin/make install
mv -f ../../../../../dist/dynamic_lib/android/$build_target/$build_type/libBqLog.so ../../../../../dist/dynamic_lib/android/$build_target/$build_type/libBqLog_Symbol.so
$ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-strip -s ../../../../../dist/dynamic_lib/android/$build_target/$build_type/libBqLog_Symbol.so -o ../../../../../dist/dynamic_lib/android/$build_target/$build_type/libBqLog.so
Expand Down
6 changes: 6 additions & 0 deletions build/lib/ios/MacGenerator.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,12 @@ BUILD_TYPE=(Debug MinSizeRel Release RelWithDebInfo)
for build_type in ${BUILD_TYPE[@]}
do
cmake --build . --config $build_type
if [ $? -eq 0 ]; then
echo "Build succeeded."
else
echo "Build failed."
exit 1
fi
cmake --install . --config $build_type

if [ -d "../../../../artifacts/dynamic_lib/ios/${build_type}/BqLog.framework.dSYM" ]; then
Expand Down
6 changes: 6 additions & 0 deletions build/lib/linux/Dont_Execute_This.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@ do
-DCMAKE_BUILD_TYPE=$config_type \
-DBUILD_TYPE=$BUILD_TYPE
make;
if [ $? -eq 0 ]; then
echo "Build succeeded."
else
echo "Build failed."
exit 1
fi
make install;
cd ../..
done
Expand Down
6 changes: 6 additions & 0 deletions build/lib/mac/Dont_Execute_This.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,12 @@ do

cmake -DTARGET_PLATFORM:STRING=mac -DJAVA_SUPPORT=ON -DBUILD_TYPE:STRING=$BUILD_TYPE -DAPPLE_LIB_FORMAT:STRING=$APPLE_FORMAT ../../../../src -G "Xcode"
xcodebuild -project BqLog.xcodeproj -scheme ALL_BUILD -configuration $config_type
if [ $? -eq 0 ]; then
echo "Build succeeded."
else
echo "Build failed."
exit 1
fi
cmake --install . --config $config_type
cd ..
done
Expand Down
6 changes: 6 additions & 0 deletions build/lib/unix_like/Dont_Execute_This.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,12 @@ for config_type in $CONFIG_TYPE; do
-DCMAKE_BUILD_TYPE=$config_type \
-DBUILD_TYPE=$BUILD_TYPE
make
if [ $? -eq 0 ]; then
echo "Build succeeded."
else
echo "Build failed."
exit 1
fi
make install
cd ../..
done
Expand Down
Binary file modified dist/dynamic_lib/ios/Debug/BqLog.framework.dSYM/Contents/Resources/DWARF/BqLog
View file
Binary file not shown.
2,663 changes: 1,332 additions & 1,331 deletions ...namic_lib/ios/Debug/BqLog.framework.dSYM/Contents/Resources/Relocations/aarch64/BqLog.yml
View file

Large diffs are not rendered by default.

Binary file modified dist/dynamic_lib/ios/Debug/BqLog.framework/BqLog
View file
Binary file not shown.
6 changes: 1 addition & 5 deletions dist/dynamic_lib/ios/Debug/BqLog.framework/Headers/bq_common/misc/assert.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,6 @@
// Created by Yu Cao on 2022/9/17.
//

#ifdef NDEBUG
#undef NDEBUG
#include <assert.h>
#define NDEBUG
#else
#ifndef BQ_SRC
#include <assert.h>
#endif
Binary file modified dist/dynamic_lib/ios/MinSizeRel/BqLog.framework/BqLog
View file
Binary file not shown.
6 changes: 1 addition & 5 deletions dist/dynamic_lib/ios/MinSizeRel/BqLog.framework/Headers/bq_common/misc/assert.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,6 @@
// Created by Yu Cao on 2022/9/17.
//

#ifdef NDEBUG
#undef NDEBUG
#include <assert.h>
#define NDEBUG
#else
#ifndef BQ_SRC
#include <assert.h>
#endif
Binary file modified dist/dynamic_lib/ios/RelWithDebInfo/BqLog.framework.dSYM/Contents/Resources/DWARF/BqLog
View file
Binary file not shown.
2,454 changes: 1,190 additions & 1,264 deletions .../ios/RelWithDebInfo/BqLog.framework.dSYM/Contents/Resources/Relocations/aarch64/BqLog.yml
View file

Large diffs are not rendered by default.

Binary file modified dist/dynamic_lib/ios/RelWithDebInfo/BqLog.framework/BqLog
View file
Binary file not shown.
6 changes: 1 addition & 5 deletions dist/dynamic_lib/ios/RelWithDebInfo/BqLog.framework/Headers/bq_common/misc/assert.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,6 @@
// Created by Yu Cao on 2022/9/17.
//

#ifdef NDEBUG
#undef NDEBUG
#include <assert.h>
#define NDEBUG
#else
#ifndef BQ_SRC
#include <assert.h>
#endif
Binary file modified dist/dynamic_lib/ios/Release/BqLog.framework/BqLog
View file
Binary file not shown.
6 changes: 1 addition & 5 deletions dist/dynamic_lib/ios/Release/BqLog.framework/Headers/bq_common/misc/assert.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,6 @@
// Created by Yu Cao on 2022/9/17.
//

#ifdef NDEBUG
#undef NDEBUG
#include <assert.h>
#define NDEBUG
#else
#ifndef BQ_SRC
#include <assert.h>
#endif
Binary file modified dist/dynamic_lib/mac/Debug/BqLog.framework/Versions/1.0.0/BqLog
View file
Binary file not shown.
6 changes: 1 addition & 5 deletions dist/dynamic_lib/mac/Debug/BqLog.framework/Versions/1.0.0/Headers/bq_common/misc/assert.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,6 @@
// Created by Yu Cao on 2022/9/17.
//

#ifdef NDEBUG
#undef NDEBUG
#include <assert.h>
#define NDEBUG
#else
#ifndef BQ_SRC
#include <assert.h>
#endif
2 changes: 1 addition & 1 deletion dist/dynamic_lib/mac/Debug/BqLog.framework/Versions/1.0.0/_CodeSignature/CodeResources
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<dict>
<key>hash2</key>
<data>
YxjDvsiNrrVPQb4/YqMkBwC6yGwhnGSirsF7rIl0zw8=
Md97vzH20+MxK7TNpowwq8da/nrTU6s2lDB2GGHgQlk=
</data>
</dict>
<key>Headers/bq_common/platform/build_type.h</key>
Expand Down
Binary file modified dist/dynamic_lib/mac/Debug/libBqLog.dylib
View file
Binary file not shown.
Binary file modified dist/dynamic_lib/mac/MinSizeRel/BqLog.framework/Versions/1.0.0/BqLog
View file
Binary file not shown.
6 changes: 1 addition & 5 deletions ...dynamic_lib/mac/MinSizeRel/BqLog.framework/Versions/1.0.0/Headers/bq_common/misc/assert.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,6 @@
// Created by Yu Cao on 2022/9/17.
//

#ifdef NDEBUG
#undef NDEBUG
#include <assert.h>
#define NDEBUG
#else
#ifndef BQ_SRC
#include <assert.h>
#endif
2 changes: 1 addition & 1 deletion dist/dynamic_lib/mac/MinSizeRel/BqLog.framework/Versions/1.0.0/_CodeSignature/CodeResources
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<dict>
<key>hash2</key>
<data>
YxjDvsiNrrVPQb4/YqMkBwC6yGwhnGSirsF7rIl0zw8=
Md97vzH20+MxK7TNpowwq8da/nrTU6s2lDB2GGHgQlk=
</data>
</dict>
<key>Headers/bq_common/platform/build_type.h</key>
Expand Down
Binary file modified dist/dynamic_lib/mac/MinSizeRel/libBqLog.dylib
View file
Binary file not shown.
Binary file modified dist/dynamic_lib/mac/RelWithDebInfo/BqLog.framework/Versions/1.0.0/BqLog
View file
Binary file not shown.
6 changes: 1 addition & 5 deletions ...mic_lib/mac/RelWithDebInfo/BqLog.framework/Versions/1.0.0/Headers/bq_common/misc/assert.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,6 @@
// Created by Yu Cao on 2022/9/17.
//

#ifdef NDEBUG
#undef NDEBUG
#include <assert.h>
#define NDEBUG
#else
#ifndef BQ_SRC
#include <assert.h>
#endif
2 changes: 1 addition & 1 deletion ...ynamic_lib/mac/RelWithDebInfo/BqLog.framework/Versions/1.0.0/_CodeSignature/CodeResources
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<dict>
<key>hash2</key>
<data>
YxjDvsiNrrVPQb4/YqMkBwC6yGwhnGSirsF7rIl0zw8=
Md97vzH20+MxK7TNpowwq8da/nrTU6s2lDB2GGHgQlk=
</data>
</dict>
<key>Headers/bq_common/platform/build_type.h</key>
Expand Down
Binary file modified dist/dynamic_lib/mac/RelWithDebInfo/libBqLog.dylib
View file
Binary file not shown.
Binary file modified dist/dynamic_lib/mac/Release/BqLog.framework/Versions/1.0.0/BqLog
View file
Binary file not shown.
6 changes: 1 addition & 5 deletions dist/dynamic_lib/mac/Release/BqLog.framework/Versions/1.0.0/Headers/bq_common/misc/assert.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,6 @@
// Created by Yu Cao on 2022/9/17.
//

#ifdef NDEBUG
#undef NDEBUG
#include <assert.h>
#define NDEBUG
#else
#ifndef BQ_SRC
#include <assert.h>
#endif
2 changes: 1 addition & 1 deletion dist/dynamic_lib/mac/Release/BqLog.framework/Versions/1.0.0/_CodeSignature/CodeResources
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<dict>
<key>hash2</key>
<data>
YxjDvsiNrrVPQb4/YqMkBwC6yGwhnGSirsF7rIl0zw8=
Md97vzH20+MxK7TNpowwq8da/nrTU6s2lDB2GGHgQlk=
</data>
</dict>
<key>Headers/bq_common/platform/build_type.h</key>
Expand Down
Binary file modified dist/dynamic_lib/mac/Release/libBqLog.dylib
View file
Binary file not shown.
Binary file modified dist/static_lib/mac/Debug/BqLog.framework/Versions/1.0.0/BqLog
View file
Binary file not shown.
6 changes: 1 addition & 5 deletions dist/static_lib/mac/Debug/BqLog.framework/Versions/1.0.0/Headers/bq_common/misc/assert.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,6 @@
// Created by Yu Cao on 2022/9/17.
//

#ifdef NDEBUG
#undef NDEBUG
#include <assert.h>
#define NDEBUG
#else
#ifndef BQ_SRC
#include <assert.h>
#endif
Binary file modified dist/static_lib/mac/Debug/BqLog.framework/Versions/1.0.0/_CodeSignature/CodeDirectory
View file
Binary file not shown.
Binary file modified dist/static_lib/mac/Debug/BqLog.framework/Versions/1.0.0/_CodeSignature/CodeRequirements-1
View file
Binary file not shown.
4 changes: 2 additions & 2 deletions dist/static_lib/mac/Debug/BqLog.framework/Versions/1.0.0/_CodeSignature/CodeResources
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@
<dict>
<key>hash</key>
<data>
6XplOOUYVzKascT11MVoryMh6I8=
0xl9gu0pqM8SIYioR5KmXyGM7lI=
</data>
<key>hash2</key>
<data>
YxjDvsiNrrVPQb4/YqMkBwC6yGwhnGSirsF7rIl0zw8=
Md97vzH20+MxK7TNpowwq8da/nrTU6s2lDB2GGHgQlk=
</data>
</dict>
<key>Headers/bq_common/platform/build_type.h</key>
Expand Down
Binary file modified dist/static_lib/mac/Debug/libBqLog.a
View file
Binary file not shown.
Binary file modified dist/static_lib/mac/MinSizeRel/BqLog.framework/Versions/1.0.0/BqLog
View file
Binary file not shown.
6 changes: 1 addition & 5 deletions .../static_lib/mac/MinSizeRel/BqLog.framework/Versions/1.0.0/Headers/bq_common/misc/assert.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,6 @@
// Created by Yu Cao on 2022/9/17.
//

#ifdef NDEBUG
#undef NDEBUG
#include <assert.h>
#define NDEBUG
#else
#ifndef BQ_SRC
#include <assert.h>
#endif
Binary file modified dist/static_lib/mac/MinSizeRel/BqLog.framework/Versions/1.0.0/_CodeSignature/CodeDirectory
View file
Binary file not shown.
Binary file modified ...tatic_lib/mac/MinSizeRel/BqLog.framework/Versions/1.0.0/_CodeSignature/CodeRequirements-1
View file
Binary file not shown.
4 changes: 2 additions & 2 deletions dist/static_lib/mac/MinSizeRel/BqLog.framework/Versions/1.0.0/_CodeSignature/CodeResources
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@
<dict>
<key>hash</key>
<data>
6XplOOUYVzKascT11MVoryMh6I8=
0xl9gu0pqM8SIYioR5KmXyGM7lI=
</data>
<key>hash2</key>
<data>
YxjDvsiNrrVPQb4/YqMkBwC6yGwhnGSirsF7rIl0zw8=
Md97vzH20+MxK7TNpowwq8da/nrTU6s2lDB2GGHgQlk=
</data>
</dict>
<key>Headers/bq_common/platform/build_type.h</key>
Expand Down
Binary file modified dist/static_lib/mac/MinSizeRel/libBqLog.a
View file
Binary file not shown.
Binary file modified dist/static_lib/mac/RelWithDebInfo/BqLog.framework/Versions/1.0.0/BqLog
View file
Binary file not shown.
6 changes: 1 addition & 5 deletions ...tic_lib/mac/RelWithDebInfo/BqLog.framework/Versions/1.0.0/Headers/bq_common/misc/assert.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,6 @@
// Created by Yu Cao on 2022/9/17.
//

#ifdef NDEBUG
#undef NDEBUG
#include <assert.h>
#define NDEBUG
#else
#ifndef BQ_SRC
#include <assert.h>
#endif
Binary file modified ...static_lib/mac/RelWithDebInfo/BqLog.framework/Versions/1.0.0/_CodeSignature/CodeDirectory
View file
Binary file not shown.
Binary file modified ...c_lib/mac/RelWithDebInfo/BqLog.framework/Versions/1.0.0/_CodeSignature/CodeRequirements-1
View file
Binary file not shown.
4 changes: 2 additions & 2 deletions ...static_lib/mac/RelWithDebInfo/BqLog.framework/Versions/1.0.0/_CodeSignature/CodeResources
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@
<dict>
<key>hash</key>
<data>
6XplOOUYVzKascT11MVoryMh6I8=
0xl9gu0pqM8SIYioR5KmXyGM7lI=
</data>
<key>hash2</key>
<data>
YxjDvsiNrrVPQb4/YqMkBwC6yGwhnGSirsF7rIl0zw8=
Md97vzH20+MxK7TNpowwq8da/nrTU6s2lDB2GGHgQlk=
</data>
</dict>
<key>Headers/bq_common/platform/build_type.h</key>
Expand Down
Binary file modified dist/static_lib/mac/RelWithDebInfo/libBqLog.a
View file
Binary file not shown.
Binary file modified dist/static_lib/mac/Release/BqLog.framework/Versions/1.0.0/BqLog
View file
Binary file not shown.
6 changes: 1 addition & 5 deletions dist/static_lib/mac/Release/BqLog.framework/Versions/1.0.0/Headers/bq_common/misc/assert.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,6 @@
// Created by Yu Cao on 2022/9/17.
//

#ifdef NDEBUG
#undef NDEBUG
#include <assert.h>
#define NDEBUG
#else
#ifndef BQ_SRC
#include <assert.h>
#endif
Binary file modified dist/static_lib/mac/Release/BqLog.framework/Versions/1.0.0/_CodeSignature/CodeDirectory
View file
Binary file not shown.
Binary file modified dist/static_lib/mac/Release/BqLog.framework/Versions/1.0.0/_CodeSignature/CodeRequirements-1
View file
Binary file not shown.
4 changes: 2 additions & 2 deletions dist/static_lib/mac/Release/BqLog.framework/Versions/1.0.0/_CodeSignature/CodeResources
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@
<dict>
<key>hash</key>
<data>
6XplOOUYVzKascT11MVoryMh6I8=
0xl9gu0pqM8SIYioR5KmXyGM7lI=
</data>
<key>hash2</key>
<data>
YxjDvsiNrrVPQb4/YqMkBwC6yGwhnGSirsF7rIl0zw8=
Md97vzH20+MxK7TNpowwq8da/nrTU6s2lDB2GGHgQlk=
</data>
</dict>
<key>Headers/bq_common/platform/build_type.h</key>
Expand Down
Binary file modified dist/static_lib/mac/Release/libBqLog.a
View file
Binary file not shown.
3 changes: 3 additions & 0 deletions src/bq_common/platform/platform_misc.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@
#if defined(BQ_MAC)
#include "bq_common/platform/mac_misc.h"
#endif
#if defined(BQ_IOS)
#include "bq_common/platform/ios_misc.h"
#endif
#if defined(BQ_PS)
#include "bq_common/platform/ps_misc.h"
#endif
Expand Down

0 comments on commit 359e6b2

Please sign in to comment.