Skip to content

Commit 0eeb049

Browse files
pippocaopippocao
committed
add 32bits and 64bits binary outputs for linux and unix
1 parent 87bff55 commit 0eeb049

File tree

16 files changed

+203
-31
lines changed

16 files changed

+203
-31
lines changed

‎.github/workflows/build.yml

+155-6
Original file line numberDiff line numberDiff line change
@@ -214,9 +214,9 @@ jobs:
214214
- name: Upload Artifacts
215215
uses: actions/upload-artifact@v4
216216
with:
217-
name: linux_static_artifact
217+
name: linux64_static_artifact
218218
path: |
219-
dist/static_lib/linux/
219+
dist/static_lib/linux64/
220220
dist/static_lib/include/
221221
222222
build_ubuntu_dynamic_lib_Clang:
@@ -241,9 +241,9 @@ jobs:
241241
- name: Upload Artifacts
242242
uses: actions/upload-artifact@v4
243243
with:
244-
name: linux_dynamic_artifact
244+
name: linux64_dynamic_artifact
245245
path: |
246-
dist/dynamic_lib/linux/
246+
dist/dynamic_lib/linux64/
247247
dist/dynamic_lib/include/
248248
249249
build_ubuntu_static_lib_GCC:
@@ -309,8 +309,8 @@ jobs:
309309
- name: Upload Artifacts
310310
uses: actions/upload-artifact@v4
311311
with:
312-
name: linux_tools_artifact
313-
path: bin/tools/linux
312+
name: linux64_tools_artifact
313+
path: bin/tools/linux64
314314

315315
build_ubuntu_tools_GCC:
316316
runs-on: ubuntu-latest
@@ -519,6 +519,155 @@ jobs:
519519
chmod +x *.sh
520520
./GenerateExecutable_GCC.sh
521521
522+
#linux-debian i386
523+
build_debian_i386_static_lib_GCC:
524+
runs-on: ubuntu-latest
525+
container:
526+
image: ghcr.io/pippocao/bqlog/i386_debian:latest
527+
steps:
528+
- name: Checkout repository
529+
uses: actions/checkout@v4
530+
531+
- name: Set up Java
532+
run: |
533+
export JAVA_HOME=/usr/lib/jvm/java-17-openjdk-i386
534+
echo "JAVA_HOME=/usr/lib/jvm/java-17-openjdk-i386" >> $GITHUB_ENV
535+
536+
- name: Build for Debian
537+
run: |
538+
cd build/lib/linux
539+
chmod +x *.sh
540+
./GenerateStaticLib_GCC.sh
541+
542+
- name: Upload Artifacts
543+
uses: actions/upload-artifact@v4
544+
with:
545+
name: linux32_static_artifact
546+
path: |
547+
dist/static_lib/linux32/
548+
dist/static_lib/include/
549+
550+
build_debian_i386_dynamic_lib_GCC:
551+
runs-on: ubuntu-latest
552+
container:
553+
image: ghcr.io/pippocao/bqlog/i386_debian:latest
554+
steps:
555+
- name: Checkout repository
556+
uses: actions/checkout@v4
557+
558+
- name: Set up Java
559+
run: |
560+
export JAVA_HOME=/usr/lib/jvm/java-17-openjdk-i386
561+
echo "JAVA_HOME=/usr/lib/jvm/java-17-openjdk-i386" >> $GITHUB_ENV
562+
563+
- name: Build for Debian
564+
run: |
565+
cd build/lib/linux
566+
chmod +x *.sh
567+
./GenerateDynamicLib_GCC.sh
568+
569+
- name: Upload Artifacts
570+
uses: actions/upload-artifact@v4
571+
with:
572+
name: linux32_dynamic_artifact
573+
path: |
574+
dist/static_lib/linux32/
575+
dist/static_lib/include/
576+
577+
build_debian_i386_static_lib_Clang:
578+
runs-on: ubuntu-latest
579+
container:
580+
image: ghcr.io/pippocao/bqlog/i386_debian:latest
581+
steps:
582+
- name: Checkout repository
583+
uses: actions/checkout@v4
584+
585+
- name: Set up Java
586+
run: |
587+
export JAVA_HOME=/usr/lib/jvm/java-17-openjdk-i386
588+
echo "JAVA_HOME=/usr/lib/jvm/java-17-openjdk-i386" >> $GITHUB_ENV
589+
590+
- name: Build for Debian
591+
run: |
592+
cd build/lib/linux
593+
chmod +x *.sh
594+
./GenerateStaticLib_Clang.sh
595+
596+
build_debian_i386_dynamic_lib_Clang:
597+
runs-on: ubuntu-latest
598+
container:
599+
image: ghcr.io/pippocao/bqlog/i386_debian:latest
600+
steps:
601+
- name: Checkout repository
602+
uses: actions/checkout@v4
603+
604+
- name: Set up Java
605+
run: |
606+
export JAVA_HOME=/usr/lib/jvm/java-17-openjdk-i386
607+
echo "JAVA_HOME=/usr/lib/jvm/java-17-openjdk-i386" >> $GITHUB_ENV
608+
609+
- name: Build for Debian
610+
run: |
611+
cd build/lib/linux
612+
chmod +x *.sh
613+
./GenerateDynamicLib_Clang.sh
614+
615+
build_debian_i386_tools_Clang:
616+
runs-on: ubuntu-latest
617+
container:
618+
image: ghcr.io/pippocao/bqlog/i386_debian:latest
619+
steps:
620+
- name: Checkout repository
621+
uses: actions/checkout@v4
622+
623+
- name: Set up Java
624+
run: |
625+
export JAVA_HOME=/usr/lib/jvm/java-17-openjdk-i386
626+
echo "JAVA_HOME=/usr/lib/jvm/java-17-openjdk-i386" >> $GITHUB_ENV
627+
628+
- name: Build log_decoder for Debian
629+
run: |
630+
cd build/tools/log_decoder/linux
631+
chmod +x *.sh
632+
./GenerateExecutable_Clang.sh
633+
634+
- name: Build category_log_generator for Debian
635+
run: |
636+
cd build/tools/category_log_generator/linux
637+
chmod +x *.sh
638+
./GenerateExecutable_Clang.sh
639+
640+
- name: Upload Artifacts
641+
uses: actions/upload-artifact@v4
642+
with:
643+
name: linux32_tools_artifact
644+
path: bin/tools/linux32
645+
646+
build_debian_i386_tools_GCC:
647+
runs-on: ubuntu-latest
648+
container:
649+
image: ghcr.io/pippocao/bqlog/i386_debian:latest
650+
steps:
651+
- name: Checkout repository
652+
uses: actions/checkout@v4
653+
654+
- name: Set up Java
655+
run: |
656+
export JAVA_HOME=/usr/lib/jvm/java-17-openjdk-i386
657+
echo "JAVA_HOME=/usr/lib/jvm/java-17-openjdk-i386" >> $GITHUB_ENV
658+
659+
- name: Build log_decoder for Debian
660+
run: |
661+
cd build/tools/log_decoder/linux
662+
chmod +x *.sh
663+
./GenerateExecutable_GCC.sh
664+
665+
- name: Build category_log_generator for Debian
666+
run: |
667+
cd build/tools/category_log_generator/linux
668+
chmod +x *.sh
669+
./GenerateExecutable_GCC.sh
670+
522671
523672
#Mac
524673
build_macos_all_static_libs:

‎.github/workflows/test_build_commit.yml

+18-9
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,19 @@ jobs:
2626
- name: Clear Output Folders
2727
run: |
2828
rm -rf bin/tools/win64
29-
rm -rf bin/tools/linux
29+
rm -rf bin/tools/linux32
30+
rm -rf bin/tools/linux64
3031
rm -rf bin/tools/mac
3132
rm -rf dist/dynamic_lib/include
3233
rm -rf dist/dynamic_lib/android
3334
rm -rf dist/dynamic_lib/ios
34-
rm -rf dist/dynamic_lib/linux
35+
rm -rf dist/dynamic_lib/linux32
36+
rm -rf dist/dynamic_lib/linux64
3537
rm -rf dist/dynamic_lib/mac
3638
rm -rf dist/dynamic_lib/win64
3739
rm -rf dist/static_lib/include
38-
rm -rf dist/static_lib/linux
40+
rm -rf dist/static_lib/linux32
41+
rm -rf dist/static_lib/linux64
3942
rm -rf dist/static_lib/mac
4043
rm -rf dist/static_lib/win64
4144
@@ -51,9 +54,12 @@ jobs:
5154
mkdir -p dist/dynamic_lib/win64
5255
mkdir -p bin/tools/win64/
5356
mkdir -p dist/dynamic_lib/android/
54-
mkdir -p dist/static_lib/linux/
55-
mkdir -p dist/dynamic_lib/linux/
56-
mkdir -p bin/tools/linux/
57+
mkdir -p dist/static_lib/linux32/
58+
mkdir -p dist/dynamic_lib/linux32/
59+
mkdir -p bin/tools/linux32/
60+
mkdir -p dist/static_lib/linux64/
61+
mkdir -p dist/dynamic_lib/linux64/
62+
mkdir -p bin/tools/linux64/
5763
mkdir -p dist/static_lib/mac/
5864
mkdir -p dist/dynamic_lib/mac/
5965
mkdir -p bin/tools/mac/
@@ -62,9 +68,12 @@ jobs:
6268
cp -r artifacts/win64_dynamic_artifact/* dist/dynamic_lib/win64
6369
cp -r artifacts/win64_tools_artifact/* bin/tools/win64/
6470
cp -r artifacts/win64_android_artifact/* dist/dynamic_lib/android/
65-
cp -r artifacts/linux_static_artifact/* dist/static_lib/
66-
cp -r artifacts/linux_dynamic_artifact/* dist/dynamic_lib/
67-
cp -r artifacts/linux_tools_artifact/* bin/tools/linux/
71+
cp -r artifacts/linux32_static_artifact/* dist/static_lib/
72+
cp -r artifacts/linux32_dynamic_artifact/* dist/dynamic_lib/
73+
cp -r artifacts/linux32_tools_artifact/* bin/tools/linux/
74+
cp -r artifacts/linux64_static_artifact/* dist/static_lib/
75+
cp -r artifacts/linux64_dynamic_artifact/* dist/dynamic_lib/
76+
cp -r artifacts/linux64_tools_artifact/* bin/tools/linux/
6877
cp -r artifacts/mac_static_artifact/* dist/static_lib/mac/
6978
cp -r artifacts/mac_dynamic_artifact/* dist/dynamic_lib/mac/
7079
cp -r artifacts/mac_tools_artifact/* bin/tools/mac/

‎CMake_utils.txt

+15-1
Original file line numberDiff line numberDiff line change
@@ -72,4 +72,18 @@ foreach(FILE ${src_list})
7272
set(GROUP "${root_folder_name}${GROUP}")
7373
source_group("${GROUP}" FILES "${FILE}")
7474
endforeach()
75-
endfunction(GROUP_FOR_IDE)
75+
endfunction(GROUP_FOR_IDE)
76+
77+
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
78+
message(STATUS "64-bit system detected")
79+
if(TARGET_PLATFORM STREQUAL "linux" OR TARGET_PLATFORM STREQUAL "unix")
80+
message(STATUS "set platform suffix to 64")
81+
set(BITS_SUFFIX "64")
82+
endif()
83+
else()
84+
message(STATUS "32-bit system detected")
85+
if(TARGET_PLATFORM STREQUAL "linux" OR TARGET_PLATFORM STREQUAL "unix")
86+
message(STATUS "set platform suffix to 32")
87+
set(BITS_SUFFIX "32")
88+
endif()
89+
endif()

‎bin/tools/linux/BqLog_CategoryLogGenerator

-2.19 MB
Binary file not shown.

‎bin/tools/linux/BqLog_LogDecoder

-1.85 MB
Binary file not shown.

‎dist/dynamic_lib/linux/Debug/libBqLog.so

-1.99 MB
Binary file not shown.

‎dist/dynamic_lib/linux/MinSizeRel/libBqLog.so

-322 KB
Binary file not shown.

‎dist/dynamic_lib/linux/RelWithDebInfo/libBqLog.so

-1.85 MB
Binary file not shown.

‎dist/dynamic_lib/linux/Release/libBqLog.so

-348 KB
Binary file not shown.

‎dist/static_lib/linux/Debug/libBqLog.a

-4.98 MB
Binary file not shown.

‎dist/static_lib/linux/MinSizeRel/libBqLog.a

-739 KB
Binary file not shown.

‎dist/static_lib/linux/RelWithDebInfo/libBqLog.a

-3.34 MB
Binary file not shown.

‎dist/static_lib/linux/Release/libBqLog.a

-788 KB
Binary file not shown.

‎src/CMakeLists.txt

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
11
cmake_minimum_required(VERSION 3.22)
22

3-
if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/../submodules/BqCommon/CMake_utils.txt")
4-
include(${CMAKE_CURRENT_SOURCE_DIR}/../submodules/BqCommon/CMake_utils.txt)
5-
elseif(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/../CMake_utils.txt")
6-
include(${CMAKE_CURRENT_SOURCE_DIR}/../CMake_utils.txt)
7-
endif()
8-
93
set(TARGET_PLATFORM "win64" CACHE STRING "Choose the target platform")
104
set_property(CACHE TARGET_PLATFORM PROPERTY STRINGS "win64" "mac" "ios" "android" "linux" "unix")
115

@@ -21,6 +15,12 @@ OPTION(JAVA_SUPPORT "Support Java" OFF)
2115

2216

2317
project(BqLog)
18+
if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/../submodules/BqCommon/CMake_utils.txt")
19+
include(${CMAKE_CURRENT_SOURCE_DIR}/../submodules/BqCommon/CMake_utils.txt)
20+
elseif(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/../CMake_utils.txt")
21+
include(${CMAKE_CURRENT_SOURCE_DIR}/../CMake_utils.txt)
22+
endif()
23+
2424
set(CMAKE_CXX_STANDARD 17)
2525
set(CMAKE_CXX_STANDARD_REQUIRED True)
2626
set(CMAKE_CXX_VISIBILITY_PRESET hidden)
@@ -86,11 +86,11 @@ if(TARGET_PLATFORM STREQUAL "android")
8686
set(DIST_SUB_DIR "${TARGET_PLATFORM}/${ANDROID_ABI}")
8787
else()
8888
if(TARGET_PLATFORM STREQUAL "linux" OR TARGET_PLATFORM STREQUAL "unix")
89-
set(ARTIFACTS_SUB_DIR "${TARGET_PLATFORM}/${CMAKE_BUILD_TYPE}")
89+
set(ARTIFACTS_SUB_DIR "${TARGET_PLATFORM}${BITS_SUFFIX}/${CMAKE_BUILD_TYPE}")
9090
else()
91-
set(ARTIFACTS_SUB_DIR "${TARGET_PLATFORM}")
91+
set(ARTIFACTS_SUB_DIR "${TARGET_PLATFORM}${BITS_SUFFIX}")
9292
endif()
93-
set(DIST_SUB_DIR "${TARGET_PLATFORM}")
93+
set(DIST_SUB_DIR "${TARGET_PLATFORM}${BITS_SUFFIX}")
9494
if(JAVA_SUPPORT)
9595
if(DEFINED ENV{JAVA_HOME})
9696
message("JAVA_HOME: $ENV{JAVA_HOME}")

‎tools/category_log_generator/CMakeLists.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
cmake_minimum_required(VERSION 3.22)
2+
3+
project(BqLog_CategoryLogGenerator)
24
if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/../../submodules/BqCommon/CMake_utils.txt")
35
include(${CMAKE_CURRENT_SOURCE_DIR}/../../submodules/BqCommon/CMake_utils.txt)
46
elseif(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/../../CMake_utils.txt")
57
include(${CMAKE_CURRENT_SOURCE_DIR}/../../CMake_utils.txt)
68
endif()
7-
8-
project(BqLog_CategoryLogGenerator)
99
set(CMAKE_CXX_STANDARD 17)
1010
set(CMAKE_CXX_STANDARD_REQUIRED True)
1111
set_property(GLOBAL PROPERTY USE_FOLDERS ON)
@@ -53,7 +53,7 @@ include_directories(
5353
${ALL_INC_DIRS}
5454
)
5555

56-
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../../bin/tools/${TARGET_PLATFORM})
56+
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../../bin/tools/${TARGET_PLATFORM}${BITS_SUFFIX})
5757

5858
# generate executable
5959
add_executable(BqLog_CategoryLogGenerator

‎tools/log_decoder/CMakeLists.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
cmake_minimum_required(VERSION 3.5)
2+
3+
project(BqLog_LogDecoder)
24
if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/../../submodules/BqCommon/CMake_utils.txt")
35
include(${CMAKE_CURRENT_SOURCE_DIR}/../../submodules/BqCommon/CMake_utils.txt)
46
elseif(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/../../CMake_utils.txt")
57
include(${CMAKE_CURRENT_SOURCE_DIR}/../../CMake_utils.txt)
68
endif()
7-
8-
project(BqLog_LogDecoder)
99
set(CMAKE_CXX_STANDARD 17)
1010
set(CMAKE_CXX_STANDARD_REQUIRED True)
1111
set_property(GLOBAL PROPERTY USE_FOLDERS ON)
@@ -55,7 +55,7 @@ include_directories(
5555
${ALL_INC_DIRS}
5656
)
5757

58-
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../../bin/tools/${TARGET_PLATFORM})
58+
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../../bin/tools/${TARGET_PLATFORM}${BITS_SUFFIX})
5959

6060
# generate executable
6161
add_executable(BqLog_LogDecoder

0 commit comments

Comments
 (0)