From 624cf694b1069f7f87306638a16d2dfb559841f4 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Fri, 29 Sep 2023 13:10:18 +0200 Subject: [PATCH] Simulators are not found --- companion/src/CMakeLists.txt | 2 + tools/build-companion-nightly.sh | 144 +++++++++++++++---------------- 2 files changed, 74 insertions(+), 72 deletions(-) diff --git a/companion/src/CMakeLists.txt b/companion/src/CMakeLists.txt index c54c9a527..718e32a59 100644 --- a/companion/src/CMakeLists.txt +++ b/companion/src/CMakeLists.txt @@ -438,6 +438,8 @@ elseif(WIN32) # Add installer command to execute windeployqt message(STATUS "windeployqt command: ${QT_BIN_DIR}/windeployqt.exe ${wdqtopts}") + install(CODE "execute_process(COMMAND pwd)") + install(CODE "execute_process(COMMAND ls *)") install(CODE "execute_process(COMMAND \"${QT_BIN_DIR}/windeployqt.exe\" ${wdqtopts})") # SDL dll diff --git a/tools/build-companion-nightly.sh b/tools/build-companion-nightly.sh index 1022d0b88..d8310cba3 100755 --- a/tools/build-companion-nightly.sh +++ b/tools/build-companion-nightly.sh @@ -50,101 +50,101 @@ rm -rf build mkdir build cd build -cmake ${COMMON_OPTIONS} -DPCB=AR9X ${SRCDIR} -make -j${JOBS} libsimulator -rm CMakeCache.txt +# cmake ${COMMON_OPTIONS} -DPCB=AR9X ${SRCDIR} +# make -j${JOBS} libsimulator +# rm CMakeCache.txt -cmake ${COMMON_OPTIONS} -DPCB=SKY9X ${SRCDIR} -make -j${JOBS} libsimulator -rm CMakeCache.txt +# cmake ${COMMON_OPTIONS} -DPCB=SKY9X ${SRCDIR} +# make -j${JOBS} libsimulator +# rm CMakeCache.txt -cmake ${COMMON_OPTIONS} -DPCB=9XRPRO ${SRCDIR} -make -j${JOBS} libsimulator -rm CMakeCache.txt +# cmake ${COMMON_OPTIONS} -DPCB=9XRPRO ${SRCDIR} +# make -j${JOBS} libsimulator +# rm CMakeCache.txt -cmake ${COMMON_OPTIONS} -DPCB=X9LITE ${SRCDIR} -make -j${JOBS} libsimulator -rm CMakeCache.txt +# cmake ${COMMON_OPTIONS} -DPCB=X9LITE ${SRCDIR} +# make -j${JOBS} libsimulator +# rm CMakeCache.txt -cmake ${COMMON_OPTIONS} -DPCB=X9LITES ${SRCDIR} -make -j${JOBS} libsimulator -rm CMakeCache.txt +# cmake ${COMMON_OPTIONS} -DPCB=X9LITES ${SRCDIR} +# make -j${JOBS} libsimulator +# rm CMakeCache.txt -cmake ${COMMON_OPTIONS} -DPCB=X7 ${SRCDIR} -make -j${JOBS} libsimulator -rm CMakeCache.txt +# cmake ${COMMON_OPTIONS} -DPCB=X7 ${SRCDIR} +# make -j${JOBS} libsimulator +# rm CMakeCache.txt -cmake ${COMMON_OPTIONS} -DPCB=X7 -DPCBREV=ACCESS ${SRCDIR} -make -j${JOBS} libsimulator -rm CMakeCache.txt +# cmake ${COMMON_OPTIONS} -DPCB=X7 -DPCBREV=ACCESS ${SRCDIR} +# make -j${JOBS} libsimulator +# rm CMakeCache.txt -cmake ${COMMON_OPTIONS} -DPCB=X7 -DPCBREV=T12 ${SRCDIR} -make -j${JOBS} libsimulator -rm CMakeCache.txt +# cmake ${COMMON_OPTIONS} -DPCB=X7 -DPCBREV=T12 ${SRCDIR} +# make -j${JOBS} libsimulator +# rm CMakeCache.txt -cmake ${COMMON_OPTIONS} -DPCB=X7 -DPCBREV=TX12 ${SRCDIR} -make -j${JOBS} libsimulator -rm CMakeCache.txt +# cmake ${COMMON_OPTIONS} -DPCB=X7 -DPCBREV=TX12 ${SRCDIR} +# make -j${JOBS} libsimulator +# rm CMakeCache.txt -cmake ${COMMON_OPTIONS} -DPCB=X7 -DPCBREV=ZORRO ${SRCDIR} -make -j${JOBS} libsimulator -rm CMakeCache.txt +# cmake ${COMMON_OPTIONS} -DPCB=X7 -DPCBREV=ZORRO ${SRCDIR} +# make -j${JOBS} libsimulator +# rm CMakeCache.txt -cmake ${COMMON_OPTIONS} -DPCB=X7 -DPCBREV=T8 ${SRCDIR} -make -j${JOBS} libsimulator -rm CMakeCache.txt +# cmake ${COMMON_OPTIONS} -DPCB=X7 -DPCBREV=T8 ${SRCDIR} +# make -j${JOBS} libsimulator +# rm CMakeCache.txt -cmake ${COMMON_OPTIONS} -DPCB=X7 -DPCBREV=TLITE ${SRCDIR} -make -j${JOBS} libsimulator -rm CMakeCache.txt +# cmake ${COMMON_OPTIONS} -DPCB=X7 -DPCBREV=TLITE ${SRCDIR} +# make -j${JOBS} libsimulator +# rm CMakeCache.txt -cmake ${COMMON_OPTIONS} -DPCB=X7 -DPCBREV=TPRO ${SRCDIR} -make -j${JOBS} libsimulator -rm CMakeCache.txt +# cmake ${COMMON_OPTIONS} -DPCB=X7 -DPCBREV=TPRO ${SRCDIR} +# make -j${JOBS} libsimulator +# rm CMakeCache.txt -cmake ${COMMON_OPTIONS} -DPCB=X9D ${SRCDIR} -make -j${JOBS} libsimulator -rm CMakeCache.txt +# cmake ${COMMON_OPTIONS} -DPCB=X9D ${SRCDIR} +# make -j${JOBS} libsimulator +# rm CMakeCache.txt -cmake ${COMMON_OPTIONS} -DPCB=X9D+ ${SRCDIR} -make -j${JOBS} libsimulator -rm CMakeCache.txt +# cmake ${COMMON_OPTIONS} -DPCB=X9D+ ${SRCDIR} +# make -j${JOBS} libsimulator +# rm CMakeCache.txt -cmake ${COMMON_OPTIONS} -DPCB=X9D+ -DPCBREV=2019 ${SRCDIR} -make -j${JOBS} libsimulator -rm CMakeCache.txt +# cmake ${COMMON_OPTIONS} -DPCB=X9D+ -DPCBREV=2019 ${SRCDIR} +# make -j${JOBS} libsimulator +# rm CMakeCache.txt -cmake ${COMMON_OPTIONS} -DPCB=XLITE ${SRCDIR} -make -j${JOBS} libsimulator -rm CMakeCache.txt +# cmake ${COMMON_OPTIONS} -DPCB=XLITE ${SRCDIR} +# make -j${JOBS} libsimulator +# rm CMakeCache.txt -cmake ${COMMON_OPTIONS} -DPCB=XLITES ${SRCDIR} -make -j${JOBS} libsimulator -rm CMakeCache.txt +# cmake ${COMMON_OPTIONS} -DPCB=XLITES ${SRCDIR} +# make -j${JOBS} libsimulator +# rm CMakeCache.txt -cmake ${COMMON_OPTIONS} -DPCB=X9E ${SRCDIR} -make -j${JOBS} libsimulator -rm CMakeCache.txt +# cmake ${COMMON_OPTIONS} -DPCB=X9E ${SRCDIR} +# make -j${JOBS} libsimulator +# rm CMakeCache.txt -cmake ${COMMON_OPTIONS} -DPCB=X10 ${SRCDIR} -make -j${JOBS} libsimulator -rm CMakeCache.txt +# cmake ${COMMON_OPTIONS} -DPCB=X10 ${SRCDIR} +# make -j${JOBS} libsimulator +# rm CMakeCache.txt -cmake ${COMMON_OPTIONS} -DPCB=X10 -DPCBREV=T16 -DINTERNAL_MODULE_MULTI=YES ${SRCDIR} -make -j${JOBS} libsimulator -rm CMakeCache.txt +# cmake ${COMMON_OPTIONS} -DPCB=X10 -DPCBREV=T16 -DINTERNAL_MODULE_MULTI=YES ${SRCDIR} +# make -j${JOBS} libsimulator +# rm CMakeCache.txt -cmake ${COMMON_OPTIONS} -DPCB=X10 -DPCBREV=TX16S ${SRCDIR} -make -j${JOBS} libsimulator -rm CMakeCache.txt +# cmake ${COMMON_OPTIONS} -DPCB=X10 -DPCBREV=TX16S ${SRCDIR} +# make -j${JOBS} libsimulator +# rm CMakeCache.txt -cmake ${COMMON_OPTIONS} -DPCB=X10 -DPCBREV=T18 ${SRCDIR} -make -j${JOBS} libsimulator -rm CMakeCache.txt +# cmake ${COMMON_OPTIONS} -DPCB=X10 -DPCBREV=T18 ${SRCDIR} +# make -j${JOBS} libsimulator +# rm CMakeCache.txt -cmake ${COMMON_OPTIONS} -DPCB=X10 -DPCBREV=EXPRESS ${SRCDIR} -make -j${JOBS} libsimulator -rm CMakeCache.txt +# cmake ${COMMON_OPTIONS} -DPCB=X10 -DPCBREV=EXPRESS ${SRCDIR} +# make -j${JOBS} libsimulator +# rm CMakeCache.txt cmake ${COMMON_OPTIONS} -DPCB=X12S ${SRCDIR} make -j${JOBS} libsimulator