@@ -7,72 +7,78 @@ SCRIPT_DIR="$(dirname -- "${BASH_SOURCE[0]}")"
77source " $SCRIPT_DIR /functions.sh"
88
99BUILD=" $( mktemp -d) "
10+ PKGDIR=" $( mktemp -d) "
1011ARTIFACT=" $WORKSPACE /build"
1112
12- mkdir -p " $BUILD /output"
1313mkdir -p " $ARTIFACT "
14+ mkdir -p " $BUILD "
1415
1516trap ' rm -rf ' " $BUILD " EXIT
1617
1718cd " $BUILD "
1819
1920case " ${1:- } " in
2021make)
21- cmake " $WORKSPACE "
22+ cmake " $WORKSPACE " -DSTANDALONE_MODE=ON
2223 make -j
23- copy-license " $BUILD /output"
24- copy-usage " $BUILD /output"
25- create-bundle " $ARTIFACT /lpac-$KERNEL -$MACHINE .zip" " $BUILD /output"
24+ make DESTDIR=" $PKGDIR " install
25+ copy-license " $PKGDIR /executables"
26+ copy-usage " $PKGDIR /executables"
27+ create-bundle " $ARTIFACT /lpac-$KERNEL -$MACHINE .zip" " $PKGDIR /executables"
2628 ;;
2729make-qmi)
28- cmake " $WORKSPACE " -DLPAC_WITH_APDU_QMI=ON -DLPAC_WITH_APDU_QMI_QRTR=ON -DLPAC_WITH_APDU_MBIM=ON
30+ cmake " $WORKSPACE " -DSTANDALONE_MODE=ON - DLPAC_WITH_APDU_QMI=ON -DLPAC_WITH_APDU_QMI_QRTR=ON -DLPAC_WITH_APDU_MBIM=ON
2931 make -j
30- copy-license " $BUILD /output"
31- copy-usage " $BUILD /output"
32- create-bundle " $ARTIFACT /lpac-$KERNEL -$MACHINE -with-qmi.zip" " $BUILD /output"
32+ make DESTDIR=" $PKGDIR " install
33+ copy-license " $PKGDIR /executables"
34+ copy-usage " $PKGDIR /executables"
35+ create-bundle " $ARTIFACT /lpac-$KERNEL -$MACHINE -with-qmi.zip" " $PKGDIR /executables"
3336 ;;
3437make-gbinder)
35- cmake " $WORKSPACE " -DLPAC_WITH_APDU_GBINDER=ON
38+ cmake " $WORKSPACE " -DSTANDALONE_MODE=ON - DLPAC_WITH_APDU_GBINDER=ON
3639 make -j
37- copy-license " $BUILD /output"
38- copy-usage " $BUILD /output"
39- create-bundle " $ARTIFACT /lpac-$KERNEL -$MACHINE -with-gbinder.zip" " $BUILD /output"
40+ make DESTDIR=" $PKGDIR " install
41+ copy-license " $PKGDIR /executables"
42+ copy-usage " $PKGDIR /executables"
43+ create-bundle " $ARTIFACT /lpac-$KERNEL -$MACHINE -with-gbinder.zip" " $PKGDIR /executables"
4044 ;;
4145make-without-lto)
42- cmake -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=OFF " $WORKSPACE "
46+ cmake -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=OFF -DSTANDALONE_MODE=ON " $PKGDIR /executables "
4347 make -j
44- copy-license " $BUILD /output"
45- copy-usage " $BUILD /output"
46- create-bundle " $ARTIFACT /lpac-$KERNEL -$MACHINE -without-lto.zip" " $BUILD /output"
48+ make DESTDIR=" $PKGDIR " install
49+ copy-license " $PKGDIR /executables"
50+ copy-usage " $PKGDIR /executables"
51+ create-bundle " $ARTIFACT /lpac-$KERNEL -$MACHINE -without-lto.zip" " $PKGDIR /executables"
4752 ;;
4853debian)
4954 cmake " $WORKSPACE " -DCPACK_GENERATOR=DEB
5055 make -j package
5156 cp lpac_* .deb " $ARTIFACT "
5257 ;;
5358mingw)
54- cmake " $WORKSPACE " -DCMAKE_TOOLCHAIN_FILE=./cmake/linux-mingw64.cmake
59+ cmake " $WORKSPACE " -DSTANDALONE_MODE=ON - DCMAKE_TOOLCHAIN_FILE=./cmake/linux-mingw64.cmake
5560 make -j
56- copy-license " $BUILD /output"
57- copy-curl-win " $BUILD /output"
58- copy-usage " $BUILD /output"
59- create-bundle " $ARTIFACT /lpac-windows-x86_64-mingw.zip" " $BUILD /output"
61+ make DESTDIR=" $PKGDIR " install
62+ copy-curl-win " $PKGDIR /executables"
63+ copy-license " $PKGDIR /executables"
64+ copy-usage " $PKGDIR /executables"
65+ create-bundle " $ARTIFACT /lpac-windows-x86_64-mingw.zip" " $PKGDIR /executables"
6066 ;;
6167woa-mingw)
62- cmake " $WORKSPACE " -DCMAKE_TOOLCHAIN_FILE=./cmake/linux-mingw64-woa.cmake
68+ cmake " $WORKSPACE " -DSTANDALONE_MODE=ON - DCMAKE_TOOLCHAIN_FILE=./cmake/linux-mingw64-woa.cmake
6369 make -j
64- copy-license " $BUILD /output "
65- copy-curl-woa " $BUILD /output "
66- copy-usage " $BUILD /output "
67- create-bundle " $ARTIFACT /lpac-windows-arm64-mingw.zip" " $BUILD /output "
70+ copy-curl-woa " $PKGDIR /executables "
71+ copy-license " $PKGDIR /executables "
72+ copy-usage " $PKGDIR /executables "
73+ create-bundle " $ARTIFACT /lpac-windows-arm64-mingw.zip" " $PKGDIR /executables "
6874 ;;
6975woa-zig)
70- cmake " $WORKSPACE " -DCMAKE_TOOLCHAIN_FILE=./cmake/aarch64-windows-zig.cmake
76+ cmake " $WORKSPACE " -DSTANDALONE_MODE=ON - DCMAKE_TOOLCHAIN_FILE=./cmake/aarch64-windows-zig.cmake
7177 make -j
72- copy-license " $BUILD /output "
73- copy-curl-woa " $BUILD /output "
74- copy-usage " $BUILD /output "
75- create-bundle " $ARTIFACT /lpac-windows-arm64-zig.zip" " $BUILD /output "
78+ copy-curl-woa " $PKGDIR /executables "
79+ copy-license " $PKGDIR /executables "
80+ copy-usage " $PKGDIR /executables "
81+ create-bundle " $ARTIFACT /lpac-windows-arm64-zig.zip" " $PKGDIR /executables "
7682 ;;
7783* )
7884 echo " Usage: $0 {make,debian,mingw,woa-mingw,woa-zig}"
0 commit comments