diff --git a/general/chroot_wrap.sh b/general/chroot_wrap.sh index dc35371cddb0f1083f1c2f46afb93f30420bc859..c1b8d102b27fe8f04b96453b0ef8e06a4ab7aef5 100755 --- a/general/chroot_wrap.sh +++ b/general/chroot_wrap.sh @@ -45,6 +45,11 @@ for platform in $PLATFORMS; do PKG_FORMAT=$(echo $PKG_FORMAT | cut -d ' ' -f2-) unexport_variables "./prod_build/$platform/conf/*" done + +if [[ $CI_COMMIT_REF_NAME == "master" ]]; then + ./prod_build/general/update_dashboard.sh +fi + #[ $(mount | grep "/run/schroot/mount") ] && sudo umount -l /run/schroot/mount && sudo rm -r /run/schroot/mount/* #Removing mountpoint odds. cd $wd diff --git a/general/update_dashboard.sh b/general/update_dashboard.sh new file mode 100755 index 0000000000000000000000000000000000000000..381b95b9b95e2d5c0b17d0febfe658e136f6a7c9 --- /dev/null +++ b/general/update_dashboard.sh @@ -0,0 +1,21 @@ +#!/bin/bash + +git clone https://${USER}:${CI_PUSH_TOKEN}@gitlab.demlabs.net/cellframe/cellframe-dashboard.git +cd cellframe-dashboard +git remote set-url origin https://${USER}:${CI_PUSH_TOKEN}@gitlab.demlabs.net/cellframe/cellframe-dashboard.git + +git checkout master + +versionPatch=$(cat config.pri | grep 'VER_PAT =' | cut -d'=' -f 2) +echo "version patch = $versionPatch" +let "versionPatch++" +echo "update version patch to $versionPatch" +sed -i "s/VER_PAT = [0-9]\+/VER_PAT = $versionPatch/g" config.pri + +#update cellframe-node + +cd cellframe-node && git checkout master && cd - + +git add config.pri cellframe-node +git commit -m 'update version patch' +git push diff --git a/linux/debian/conf/dependencies b/linux/debian/conf/dependencies index 710b2f25342a25ce8a8f26ef4414ec5a3c0d05b5..6e484949b2344ffc1e6067ce92b40ecace0c490e 100644 --- a/linux/debian/conf/dependencies +++ b/linux/debian/conf/dependencies @@ -1 +1 @@ -PKG_DEPS="cmake libjson-c-dev libsqlite3-dev libmemcached-dev libev-dev libmagic-dev libcurl4-gnutls-dev libldb-dev libtalloc-dev libtevent-dev traceroute libpython3-dev" +PKG_DEPS="libjson-c-dev libsqlite3-dev libmemcached-dev libev-dev libmagic-dev libcurl4-gnutls-dev libldb-dev libtalloc-dev libtevent-dev traceroute libpython3-dev libpq-dev" diff --git a/linux/debian/conf/publish b/linux/debian/conf/publish index 7249860bbca97ecac2706e72c52c6c5dbe893901..b8b3a21d19223b035b6f4aaa1cd7a30819636869 100644 --- a/linux/debian/conf/publish +++ b/linux/debian/conf/publish @@ -2,7 +2,7 @@ HOST_DISTR_VERSIONS="stretch buster bullseye" HOST_ARCH_VERSIONS="amd64" PACKAGE_PATH=builds/deb/ REPO_DIR_SRC=/var/tmp/repository -DISTR_CODENAME="stretch buster" +DISTR_CODENAME="stretch buster bullseye" REPO_ADDR=debian.pub.demlabs.net REPO_DIR=/var/www/html/debian.pub.demlabs.net DISTR_COMPONENT=main diff --git a/linux/debian/essentials/postinst b/linux/debian/essentials/postinst index 3580c33bdeb5ee92043304e8ecb5d85c8f6ea9b3..29e13ad5c33f5706674a2a1b4bcfafbd972d7974 100755 --- a/linux/debian/essentials/postinst +++ b/linux/debian/essentials/postinst @@ -25,7 +25,7 @@ fi cat $DAP_CFG_TPL > $DAP_CFG || true -sed -i "s/{PREFIX}/\/opt\/$DAP_APP_NAME/g" $DAP_PREFIX || true +sed -i "s/{PREFIX}/\/opt\/$DAP_APP_NAME/g" $DAP_CFG || true db_get cellframe-node/debug_mode || true sed -i "s/{DEBUG_MODE}/$RET/g" $DAP_CFG || true diff --git a/linux/debian/scripts/compile_and_pack.sh b/linux/debian/scripts/compile_and_pack.sh index 2d4fd356b40ed9cd688d6a2e0fded062fe6e4909..ad7284f597d7a1289597be1694f55ae988c25997 100755 --- a/linux/debian/scripts/compile_and_pack.sh +++ b/linux/debian/scripts/compile_and_pack.sh @@ -63,9 +63,15 @@ error=0 mkdir -p packages substitute_pkgname_postfix && mkdir -p build && cd build && cmake ../ && make -j$(nproc) && cpack && repack *.deb && mv -v *.deb ../packages/ && rm -r * \ -&& cmake -DCMAKE_BUILD_TYPE=Debug ../ && make -j$(nproc) && cpack && repack *.deb && mv -v *.deb ../packages/ && cd .. && rm -r build || error=$? +&& cmake -DCMAKE_BUILD_TYPE=Debug ../ && make -j$(nproc) && cpack && repack *.deb && mv -v *.deb ../packages/ && rm -r * || error=$? + +sed -ibak 's/#set(BUILD_WITH_GDB_DRIVER_PGSQL ON)/set(BUILD_WITH_GDB_DRIVER_PGSQL ON)/' ../CMakeLists.txt || error=$? +cmake ../ && make -j$(nproc) && cpack && repack *.deb && mv -v *.deb ../packages/ && rm -r * \ +&& cmake -DCMAKE_BUILD_TYPE=Debug ../ && make -j$(nproc) && cpack && repack *.deb && mv -v *.deb ../packages/ && cd .. && rm -r build && \ +mv -f CMakeLists.txtbak CMakeLists.txt || error=$? exit $error + ### touch /etc/apt/sources.list.d/demlabs.list deb https://debian.pub.demlabs.net/ bionic main universe multiverse ### wget https://debian.pub.demlabs.net/debian.pub.demlabs.net.gpg diff --git a/linux/debian/scripts/deploy.sh b/linux/debian/scripts/deploy.sh index 4cd6cf33253edd940e2ac604226f1e623af2ab4a..ca31c733ba2529902c986f151da12e241c480fe0 100755 --- a/linux/debian/scripts/deploy.sh +++ b/linux/debian/scripts/deploy.sh @@ -33,7 +33,9 @@ for pkgfile in $PKGFILES; do echo "REF_NAME is $CI_COMMIT_REF_NAME" ssh -i $CELLFRAME_REPO_KEY "$CELLFRAME_FILESERVER_CREDS" "mkdir -p $CELLFRAME_FILESERVER_PATH/$SUBDIR" scp -i $CELLFRAME_REPO_KEY $wd/$PACKAGE_PATH/$pkgname$MOD.deb "$CELLFRAME_FILESERVER_CREDS:$CELLFRAME_FILESERVER_PATH/$SUBDIR/$pkgname_public$MOD.deb" - scp -r -i $CELLFRAME_REPO_KEY ../prod_build/general/essentials/$pkgname_weblink "$CELLFRAME_FILESERVER_CREDS:$CELLFRAME_FILESERVER_PATH/$SUBDIR/" + if [[ $(echo $pkgname | grep "pgsql\|dbg") == "" ]]; then + scp -r -i $CELLFRAME_REPO_KEY ../prod_build/general/essentials/$pkgname_weblink "$CELLFRAME_FILESERVER_CREDS:$CELLFRAME_FILESERVER_PATH/$SUBDIR/" + fi if [[ $CI_COMMIT_REF_NAME == "master" ]]; then set -x scp -P $REPO_PORT -i $CELLFRAME_REPO_KEY $wd/$PACKAGE_PATH/$pkgname$MOD.deb "$CELLFRAME_REPO_CREDS:~/aptly/repo_update/$pkgname_public$MOD.deb" diff --git a/linux/ubuntu/conf/publish b/linux/ubuntu/conf/publish index 7da0d1b2a2a657b9eef642b1cb9b8623fce9a107..c0a7bfe66168e95136ef97cb49402c6f8dbbbf0e 100644 --- a/linux/ubuntu/conf/publish +++ b/linux/ubuntu/conf/publish @@ -2,7 +2,7 @@ HOST_DISTR_VERSIONS="bionic focal hirsute" HOST_ARCH_VERSIONS="amd64" PACKAGE_PATH=builds/deb/ REPO_DIR_SRC=/var/tmp/repository -DISTR_CODENAME="bionic" +DISTR_CODENAME="bionic focal hirsute" REPO_ADDR=debian.pub.demlabs.net REPO_DIR=/var/www/html/debian.pub.demlabs.net DISTR_COMPONENT=main diff --git a/mac/scripts/compile.sh b/mac/scripts/compile.sh index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..3ce85ac6b68dcd3c757d3098a161a938a74448d1 100755 --- a/mac/scripts/compile.sh +++ b/mac/scripts/compile.sh @@ -0,0 +1,13 @@ +#!/bin/bash + +wd=$1 + +echo "[INF] Building cellframe-node" +cd $wd + +mkdir build +cd build && + "$CROSS_COMPILE"cmake .. -DMACOS_ARCH="x86_64" \ +&& make -j$(nproc) || exit $? + +exit 0 diff --git a/windows/conf/win_libs b/windows/conf/win_libs new file mode 100644 index 0000000000000000000000000000000000000000..7b48df0cba54ec5d8e260a20c3be2dfa24ba9d19 --- /dev/null +++ b/windows/conf/win_libs @@ -0,0 +1 @@ +LIBS="KERNEL32 USER32 SHELL32 WINMM GDI32 ADVAPI32 Ole32 Version Imm32 OleAut32 Shlwapi Bcrypt Crypt32 Secur32" diff --git a/windows/scripts/compile.bat b/windows/scripts/compile.bat new file mode 100644 index 0000000000000000000000000000000000000000..476cd37244f9891bab0b88707c863912cc584e31 --- /dev/null +++ b/windows/scripts/compile.bat @@ -0,0 +1,5 @@ +IF not exist %1 ( + mkdir %1 +) +cmake -S %2 -G "MinGW Makefiles" -D CMAKE_BUILD_TYPE=Release -D CMAKE_RUNTIME_OUTPUT_DIRECTORY=%1 +mingw32-make diff --git a/windows/scripts/compile.sh b/windows/scripts/compile.sh index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..5b573a0ca78927940183a9e13335dd0a438d850d 100755 --- a/windows/scripts/compile.sh +++ b/windows/scripts/compile.sh @@ -0,0 +1,28 @@ +#!/bin/bash + +DESTDIR=$1 +wd=$2 + +echo "[INF] Building cellframe-node" +cd $wd + +. prod_build/general/pre-build.sh + +export_variables "./prod_build/windows/conf/*" + +IFS=" " +for lib in $LIBS; do + new_lib=$(echo "$lib" | tr '[:upper:]' '[:lower:]') + echo "changing $lib to $new_lib" + sed -i "s/$lib/$new_lib/g" CMakeLists.txt + sed -i "s/$lib/$new_lib/g" cellframe-sdk/CMakeLists.txt + sed -i "s/$lib/$new_lib/g" cellframe-sdk/dap-sdk/net/server/enc_server/CMakeLists.txt + sed -i "s/$lib/$new_lib/g" cellframe-sdk/dap-sdk/net/server/http_server/CMakeLists.txt + sed -i "s/$lib/$new_lib/g" python-cellframe/cellframe-sdk/CMakeLists.txt + sed -i "s/$lib/$new_lib/g" python-cellframe/cellframe-sdk/dap-sdk/net/server/enc_server/CMakeLists.txt + sed -i "s/$lib/$new_lib/g" python-cellframe/cellframe-sdk/dap-sdk/net/server/http_server/CMakeLists.txt +done + +mkdir build && cd build && \ +x86_64-w64-mingw32.static-cmake .. && make -j$(nproc) && \ +mv cellframe-node*.exe $DESTDIR && make clean && cd .. && rm -r build || echo "error $?" && exit $?