Skip to content
Snippets Groups Projects
Commit 5b2c9ed3 authored by Aleksandr Vodianov's avatar Aleksandr Vodianov
Browse files

fixed deploy and compilation

parent d3a2a854
No related branches found
No related tags found
No related merge requests found
...@@ -51,18 +51,18 @@ if [[ $ARCH_VERSION == "arm" ]]; then ...@@ -51,18 +51,18 @@ if [[ $ARCH_VERSION == "arm" ]]; then
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH_ARM64 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH_ARM64
${CMAKE_PATH}cmake -DCMAKE_C_COMPILER=$ARM64_C_COMPILER -DCMAKE_CXX_COMPLIER=$ARM64_CXX_COMPILER -DCMAKE_TARGET_ARCH="arm64" .. && make -j$(nproc) && \ ${CMAKE_PATH}cmake -DCMAKE_C_COMPILER=$ARM64_C_COMPILER -DCMAKE_CXX_COMPLIER=$ARM64_CXX_COMPILER -DCMAKE_TARGET_ARCH="arm64" .. && make -j$(nproc) && \
${CMAKE_PATH}cpack && repack *.deb && mv -v *.deb ../packages/ && rm -r * && \ ${CMAKE_PATH}cpack && repack *.deb && mv -v *.deb ../packages/ && rm -r * && \
${CMAKE_PATH}cmake -DCMAKE_BUILD_TYPE=Debug ../ && make -j$(nproc) && ${CMAKE_PATH}cpack && repack *.deb && mv -v *.deb ../packages/ && rm -r * || error=$? ${CMAKE_PATH}cmake -DCMAKE_C_COMPILER=$ARM64_C_COMPILER -DCMAKE_CXX_COMPLIER=$ARM64_CXX_COMPILER -DCMAKE_TARGET_ARCH="arm64" -DCMAKE_BUILD_TYPE=Debug ../ && make -j$(nproc) && ${CMAKE_PATH}cpack && repack *.deb && mv -v *.deb ../packages/ && rm -r * || error=$?
unset LD_LIBRARY_PATH unset LD_LIBRARY_PATH
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH_ARMHF export LD_LIBRARY_PATH=$LD_LIBRARY_PATH_ARMHF
${CMAKE_PATH}cmake -DCMAKE_C_COMPILER=$ARMHF_C_COMPILER -DCMAKE_CXX_COMPLIER=$ARMHF_CXX_COMPILER -DCMAKE_TARGET_ARCH="armhf" .. && make -j$(nproc) && \ ${CMAKE_PATH}cmake -DCMAKE_C_COMPILER=$ARMHF_C_COMPILER -DCMAKE_CXX_COMPLIER=$ARMHF_CXX_COMPILER -DCMAKE_TARGET_ARCH="armhf" .. && make -j$(nproc) && \
${CMAKE_PATH}cpack && repack *.deb && mv -v *.deb ../packages/ && rm -r * && \ ${CMAKE_PATH}cpack && repack *.deb && mv -v *.deb ../packages/ && rm -r * && \
${CMAKE_PATH}cmake -DCMAKE_BUILD_TYPE=Debug ../ && make -j$(nproc) && ${CMAKE_PATH}cpack && repack *.deb && mv -v *.deb ../packages/ && rm -r * || error=$? ${CMAKE_PATH}cmake -DCMAKE_C_COMPILER=$ARMHF_C_COMPILER -DCMAKE_CXX_COMPLIER=$ARMHF_CXX_COMPILER -DCMAKE_TARGET_ARCH="armhf" -DCMAKE_BUILD_TYPE=Debug ../ && make -j$(nproc) && ${CMAKE_PATH}cpack && repack *.deb && mv -v *.deb ../packages/ && rm -r * || error=$?
unset LD_LIBRARY_PATH unset LD_LIBRARY_PATH
fi fi
if [[ $ARCH_VERSION == "amd64" ]]; then if [[ $ARCH_VERSION == "amd64" ]]; then
sed -i 's/target_link_libraries(${NODE_TARGET} ${NODE_LIBRARIES} pthread )/target_link_libraries(${NODE_TARGET} ${NODE_LIBRARIES} pthread z util expat )/' ../CMakeLists.txt || error=$? sed -i 's/target_link_libraries(${NODE_TARGET} ${NODE_LIBRARIES} pthread )/target_link_libraries(${NODE_TARGET} ${NODE_LIBRARIES} pthread z util expat )/' ../CMakeLists.txt || error=$?cd
${CMAKE_PATH}cmake ../ && make -j$(nproc) && ${CMAKE_PATH}cpack && repack *.deb && mv -v *.deb ../packages/ && rm -r * \ ${CMAKE_PATH}cmake ../ && make -j$(nproc) && ${CMAKE_PATH}cpack && repack *.deb && mv -v *.deb ../packages/ && rm -r * \
&& ${CMAKE_PATH}cmake -DCMAKE_BUILD_TYPE=Debug ../ && make -j$(nproc) && ${CMAKE_PATH}cpack && repack *.deb && mv -v *.deb ../packages/ && rm -r * || error=$? && ${CMAKE_PATH}cmake -DCMAKE_BUILD_TYPE=Debug ../ && make -j$(nproc) && ${CMAKE_PATH}cpack && repack *.deb && mv -v *.deb ../packages/ && rm -r * || error=$?
......
...@@ -29,7 +29,7 @@ for pkgfile in $PKGFILES; do ...@@ -29,7 +29,7 @@ for pkgfile in $PKGFILES; do
CELLFRAME_FILESERVER_PATH=$CELLFRAME_PVT_PATH CELLFRAME_FILESERVER_PATH=$CELLFRAME_PVT_PATH
fi fi
pkgname=$(echo $pkgfile | sed 's/.deb$//') pkgname=$(echo $pkgfile | sed 's/.deb$//')
pkgname_public=$(echo $pkgname | cut -d '-' -f1-4,7-) #cutting away Debian-9.12 pkgname_public=$(echo $pkgname | cut -d '-' -f1-4,7,9-) #cutting away Debian-9.12
pkgname_weblink="$(echo $pkgname | cut -d '-' -f2,8 )-latest" #leaving only necessary entries pkgname_weblink="$(echo $pkgname | cut -d '-' -f2,8 )-latest" #leaving only necessary entries
echo "Package name for public is $pkgname_public" echo "Package name for public is $pkgname_public"
mv $pkgfile $wd/$PACKAGE_PATH/$pkgname.deb || { echo "[ERR] Something went wrong in publishing the package. Now aborting."; exit -4; } mv $pkgfile $wd/$PACKAGE_PATH/$pkgname.deb || { echo "[ERR] Something went wrong in publishing the package. Now aborting."; exit -4; }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment