WIP

Author: sgallou

…er-image-raspberrypi-extract-sysroot.yml …e-raspberrypi-extract-sysroot.yml.notyet.github/workflows/docker-image-raspberrypi-extract-sysroot.yml renamed to .github/workflows/docker-image-raspberrypi-extract-sysroot.yml.notyet .github/workflows/docker-image-raspberrypi-extract-sysroot.yml renamed to .github/workflows/docker-image-raspberrypi-extract-sysroot.yml.notyet

@@ -77,16 +77,16 @@ RUN	rm -Rf boost_$boost_version \
 #############################################################
 #TODO tester version plus récente (voire installée par apt-get)
 ARG openssl_version=1.1.1k
-WORKDIR ${WORK_DIR}
-RUN wget --no-check-certificate --no-verbose https://www.openssl.org/source/openssl-1.1.1k.tar.gz \
-    && tar xzf openssl-${openssl_version}.tar.gz
-WORKDIR ${WORK_DIR}/openssl-${openssl_version}
-RUN ./Configure linux-x86_64 -fPIC --prefix=${YADOMS_DEPS}/openssl
-RUN make -j$(nproc)
-RUN make install
-WORKDIR ${WORK_DIR}
-RUN rm -Rf openssl-${openssl_version} \
-	&& rm openssl-${openssl_version}.tar.gz
+# WORKDIR ${WORK_DIR}
+# RUN wget --no-check-certificate --no-verbose https://www.openssl.org/source/openssl-1.1.1k.tar.gz \
+#     && tar xzf openssl-${openssl_version}.tar.gz
+# WORKDIR ${WORK_DIR}/openssl-${openssl_version}
+# RUN ./Configure linux-x86_64 -fPIC --prefix=${YADOMS_DEPS}/openssl
+# RUN make -j$(nproc)
+# RUN make install
+# WORKDIR ${WORK_DIR}
+# RUN rm -Rf openssl-${openssl_version} \
+# 	&& rm openssl-${openssl_version}.tar.gz
 
 
 

build-linux/Dockerfile

@@ -5,8 +5,8 @@ cd /work
 
 echo "Create makefile"
 cmake -S sources \
-    -B projects-linux \
-    -DYADOMS_BINARY_DIR=bin-linux \
+    -B projects-Linux \
+    -DYADOMS_BINARY_DIR=bin-Linux \
     -DCMAKE_BUILD_TYPE=Release \
     -DCOTIRE_USE=ON \
     -DCOTIRE_USE_UNITY=ON \
@@ -28,43 +28,18 @@ cmake -S sources \
     # -DOPENCV_ROOT="$YADOMS_DEPS/opencv-rpi2-armhf" \
     # -DLIBUDEV_ROOT="$YADOMS_DEPS/libudev"
 
-#TODO utiliser ou faire le ménage de COTIRE_USE et COTIRE_USE_UNITY
+#TODO utiliser ou faire le ménage de COTIRE_USE et COTIRE_USE_UNITY (voir ce que ça donne avec --target all_unity )
 echo "Build Yadoms"
-cmake --build projects-linux \
+cmake --build projects-Linux \
     -j$(nproc)
 
-# echo "Build Yadoms package"
-# cmake --build projects-linux --target package -j$(nproc)
-
-# echo "Build Yadoms update package"
-# cd update
-# sh make_package.sh RaspberryPI
-# cd -
-
-
-##TODO virer
-####################################################################################
-# #!/bin/bash
-# set -e
-
-# cd /work
-
-# echo "Copy build config file"
-# cp $YADOMS_DEPS_PATH/CMakeListsUserConfig.txt sources/
-
-# echo "Display config content"
-# cat sources/CMakeListsUserConfig.txt
-
-# echo "Create makefile"
-# sh cmake_linux.sh r
+echo "Build Yadoms package"
+cmake --build projects-Linux \
+    --target package \
+    -j$(nproc)
 
-# echo "Build Yadoms"
-# cd projects
-# make all_unity
-# echo "Build Yadoms package"
-# make package
-# cd -
+echo "Build Yadoms update package"
+cd update
+sh make_package.sh Linux
+cd -
 
-# echo "Build Yadoms update package"
-# cd update
-# sh make_package.sh Linux

build-linux/entrypoint_docker.sh

@@ -5,8 +5,8 @@ cd /work
 
 echo "Create makefile"
 cmake -S sources \
-    -B projects-rpi \
-    -DYADOMS_BINARY_DIR=bin-rpi \
+    -B projects-RaspberryPI \
+    -DYADOMS_BINARY_DIR=bin-RaspberryPI \
     -DCMAKE_TOOLCHAIN_FILE=$YADOMS_DEPS/toolchain-rpi2.cmake \
     -DCMAKE_BUILD_TYPE=Release \
     -DCOTIRE_USE=ON \
@@ -27,15 +27,17 @@ cmake -S sources \
     -DOPENCV_ROOT="$YADOMS_DEPS/opencv-rpi2-armhf" \
     -DLIBUDEV_ROOT="$YADOMS_DEPS/libudev"
 
-#TODO utiliser ou faire le ménage de COTIRE_USE et COTIRE_USE_UNITY
+#TODO utiliser ou faire le ménage de COTIRE_USE et COTIRE_USE_UNITY (voir ce que ça donne avec --target all_unity )
 echo "Build Yadoms"
-cmake --build projects-rpi \
+cmake --build projects-RaspberryPI \
     -j$(nproc)
 
-# echo "Build Yadoms package"
-# cmake --build projects-rpi --target package -j$(nproc)
+echo "Build Yadoms package"
+cmake --build projects-RaspberryPI \
+    --target package \
+    -j$(nproc)
 
-# echo "Build Yadoms update package"
-# cd update
-# sh make_package.sh RaspberryPI
-# cd -
+echo "Build Yadoms update package"
+cd update
+sh make_package.sh RaspberryPI
+cd -