From 3a4a52df1f7497d18da367f1e939f59c038d8137 Mon Sep 17 00:00:00 2001 From: Phil Olynyk Date: Fri, 18 Sep 2020 15:29:12 -0400 Subject: [PATCH] Delete extra files, add backslash in options list --- Building/Linux/mkDebian9.sh | 156 ------------------------------------ Building/Linux/mkDistDeb.sh | 2 +- Building/Linux/mkUbuntu.sh | 156 ------------------------------------ 3 files changed, 1 insertion(+), 313 deletions(-) delete mode 100755 Building/Linux/mkDebian9.sh delete mode 100755 Building/Linux/mkUbuntu.sh diff --git a/Building/Linux/mkDebian9.sh b/Building/Linux/mkDebian9.sh deleted file mode 100755 index 8a4f6b00..00000000 --- a/Building/Linux/mkDebian9.sh +++ /dev/null @@ -1,156 +0,0 @@ -#! /bin/bash -# First parameter is optional -# - -ITERATION=$1 -if [ -z ${ITERATION} ]; then - ITERATION="1" -fi - -SRC=/home/$USER/OSCAR/OSCAR-code/oscar - -VERSION=`awk '/#define VERSION / { gsub(/"/, "", $3); print $3 }' ${SRC}/VERSION` -if [[ ${VERSION} == *-* ]]; then - # Use ~ for prerelease information so that it sorts correctly compared to release - # versions. See https://www.debian.org/doc/debian-policy/ch-controlfields.html#version - IFS="-" read -r VERSION PRERELEASE <<< ${VERSION} - if [[ ${PRERELEASE} == *rc* ]]; then - RC=1 - fi - VERSION="${VERSION}~${PRERELEASE}" -fi -GIT_REVISION=`awk '/#define GIT_REVISION / { gsub(/"/, "", $3); print $3 }' ${SRC}/git_info.h` -echo Version: ${VERSION} - -# application name -appli_name="OSCAR" -pre_inst="tst_user.sh" -post_inst="ln_usrbin.sh" -pre_rem="rm_usrbin.sh" -post_rem="clean_rm.sh" -# build folder (absolute path is better) -build_folder="/home/$USER/OSCAR/build" -if [[ -n ${PRERELEASE} && -z ${RC} ]] ; then - appli_name=${appli_name}-test - post_inst="ln_usrbin-test.sh" - pre_rem="rm_usrbin-test.sh" - post_rem="clean_rm-test.sh" -fi - -# temporary folder (absolute path is better) -temp_folder="/home/$USER/tmp_deb_${appli_name}/" - -# destination folder in the .deb file -dest_folder="/usr/" - -# the .deb file mustn't exist (or fpm must have -f parameter to force the creation) -archi_tmp=$(lscpu | grep -i architecture | awk -F: {'print $2'} | tr -d " ") -if [ "$archi_tmp" = "x86_64" ];then - archi="amd64" -else - archi="unknown" -fi -deb_file="${appli_name}_${VERSION}-${ITERATION}_$archi.deb" - -# if deb file exists, fatal error -if [ -f "./$deb_file" ]; then - echo "destination file (./$deb_file) exists. fatal error" - exit -fi - -# clean folders need to create the package -if [ -d "${temp_folder}" ]; then - rm -r ${temp_folder} -fi -mkdir ${temp_folder} -if [ ! -d "${temp_folder}" ]; then - echo "Folder (${temp_folder}) not created : fatal error." - exit -fi -chmod 0755 ${temp_folder} -# save current value of umask (for u=g and not g=o) -current_value=$(umask) -umask 022 -mkdir ${temp_folder}/bin -mkdir ${temp_folder}/share -mkdir ${temp_folder}/share/${appli_name} -mkdir ${temp_folder}/share/doc -share_doc_folder="${temp_folder}/share/doc/${appli_name}" -mkdir ${share_doc_folder} -mkdir ${temp_folder}/share/icons -mkdir ${temp_folder}/share/icons/hicolor -mkdir ${temp_folder}/share/icons/hicolor/48x48 -mkdir ${temp_folder}/share/icons/hicolor/48x48/apps -mkdir ${temp_folder}/share/icons/hicolor/scalable -mkdir ${temp_folder}/share/icons/hicolor/scalable/apps -mkdir ${temp_folder}/share/applications - -# must delete debug symbol in OSCAR binary file -# --- V1 -strip -s -o ${temp_folder}/bin/${appli_name} ${build_folder}/oscar/OSCAR -#old code : cp ${build_folder}/oscar/OSCAR ${temp_folder}/bin - -# 2>/dev/null : errors does not appear : we don't care about them -cp -r ${build_folder}/oscar/Help ${temp_folder}/share/${appli_name} 2>/dev/null -cp -r ${build_folder}/oscar/Html ${temp_folder}/share/${appli_name} 2>/dev/null -cp -r ${build_folder}/oscar/Translations ${temp_folder}/share/${appli_name} 2>/dev/null -cp ./${appli_name}.png ${temp_folder}/share/icons/hicolor/48x48/apps/${appli_name}.png -cp ./${appli_name}.svg ${temp_folder}/share/icons/hicolor/scalable/apps/${appli_name}.svg -cp ./${appli_name}.desktop ${temp_folder}/share/applications/${appli_name}.desktop - -echo "Copyright 2019-2020 oscar-team.org " > $share_doc_folder/copyright - -changelog_file="$share_doc_folder/changelog" - -#automatic changelog as a bad name -# need to generate one and say fpm to use it instead of create one -# it seems that it needs both of them... - -# creation of the changelog.Debian.gz -echo "$appli_name (${VERSION}-${ITERATION}) whatever; urgency=medium" > $changelog_file -echo "" >> $changelog_file -echo " * Package created with FPM." >> $changelog_file -echo "" >> $changelog_file -echo " -- oscar-team.org " >> $changelog_file -gzip --best $changelog_file -description='Open Source CPAP Analysis Reporter\n' -# trick for dummies : need to use echo -e to take care of \n (cariage return to slip description and extra one -description=$(echo -e $description) - -# restore umask value -umask $current_value - -# create the .deb file (litian test show juste a warning with a man that doesn't exists : don't care about that) -fpm --input-type dir --output-type deb \ - --prefix ${dest_folder} \ - --before-install ${pre_inst} \ - --after-install ${post_inst} \ - --before-remove ${pre_rem} \ - --after-remove ${post_rem} \ - --name ${appli_name} --version ${VERSION} --iteration ${ITERATION} \ - --category misc \ - --deb-priority optional \ - --maintainer " -- oscar-team.org " \ - --license GPL-v3 \ - --vendor oscar-team.org \ - --description "$description" \ - --url https://sleepfiles.com/OSCAR \ - --deb-no-default-config-files \ - --depends libdouble-conversion1 \ - --depends libpcre16-3 \ - --depends qttranslations5-l10n \ - --depends 'libqt5core5a > 5.7.0' \ - --depends libqt5serialport5 \ - --depends libqt5xml5 \ - --depends libqt5network5 \ - --depends libqt5gui5 \ - --depends libqt5widgets5 \ - --depends libqt5opengl5 \ - --depends libqt5printsupport5 \ - --depends libglu1-mesa \ - --depends libgl1 \ - --depends libc6 \ - --no-deb-generate-changes \ - -C ${temp_folder} \ - . - diff --git a/Building/Linux/mkDistDeb.sh b/Building/Linux/mkDistDeb.sh index 84f5816f..9b1716d6 100755 --- a/Building/Linux/mkDistDeb.sh +++ b/Building/Linux/mkDistDeb.sh @@ -163,7 +163,7 @@ fpm --input-type dir --output-type deb \ --category misc \ --deb-priority optional \ --maintainer " -- oscar-team.org " \ - --license GPL3+ + --license GPL3+ \ --vendor oscar-team.org \ --description "$description" \ --url https://sleepfiles.com/OSCAR \ diff --git a/Building/Linux/mkUbuntu.sh b/Building/Linux/mkUbuntu.sh deleted file mode 100755 index eef95e23..00000000 --- a/Building/Linux/mkUbuntu.sh +++ /dev/null @@ -1,156 +0,0 @@ -#! /bin/bash -# First parameter is optional -# - -ITERATION=$1 -if [ -z ${ITERATION} ]; then - ITERATION="1" -fi - -SRC=/home/$USER/OSCAR/OSCAR-code/oscar - -VERSION=`awk '/#define VERSION / { gsub(/"/, "", $3); print $3 }' ${SRC}/VERSION` -if [[ ${VERSION} == *-* ]]; then - # Use ~ for prerelease information so that it sorts correctly compared to release - # versions. See https://www.debian.org/doc/debian-policy/ch-controlfields.html#version - IFS="-" read -r VERSION PRERELEASE <<< ${VERSION} - if [[ ${PRERELEASE} == *rc* ]]; then - RC=1 - fi - VERSION="${VERSION}~${PRERELEASE}" -fi -GIT_REVISION=`awk '/#define GIT_REVISION / { gsub(/"/, "", $3); print $3 }' ${SRC}/git_info.h` -echo Version: ${VERSION} - -# application name -appli_name="OSCAR" -pre_inst="tst_user.sh" -post_inst="ln_usrbin.sh" -pre_rem="rm_usrbin.sh" -post_rem="clean_rm.sh" -# build folder (absolute path is better) -build_folder="/home/$USER/OSCAR/build" -if [[ -n ${PRERELEASE} && -z ${RC} ]] ; then - appli_name=${appli_name}-test - post_inst="ln_usrbin-test.sh" - pre_rem="rm_usrbin-test.sh" - post_rem="clean_rm-test.sh" -fi - -# temporary folder (absolute path is better) -temp_folder="/home/$USER/tmp_Ubu_${appli_name}/" - -# destination folder in the .deb file -dest_folder="/usr/" - -# the .deb file mustn't exist (or fpm must have -f parameter to force the creation) -archi_tmp=$(lscpu | grep -i architecture | awk -F: {'print $2'} | tr -d " ") -if [ "$archi_tmp" = "x86_64" ];then - archi="amd64" -else - archi="unknown" -fi -deb_file="${appli_name}_${VERSION}-${ITERATION}_$archi.deb" - -# if deb file exists, fatal error -if [ -f "./$deb_file" ]; then - echo "destination file (./$deb_file) exists. fatal error" - exit -fi - -# clean folders need to create the package -if [ -d "${temp_folder}" ]; then - rm -r ${temp_folder} -fi -mkdir ${temp_folder} -if [ ! -d "${temp_folder}" ]; then - echo "Folder (${temp_folder}) not created : fatal error." - exit -fi -chmod 0755 ${temp_folder} -# save current value of umask (for u=g and not g=o) -current_value=$(umask) -umask 022 -mkdir ${temp_folder}/bin -mkdir ${temp_folder}/share -mkdir ${temp_folder}/share/${appli_name} -mkdir ${temp_folder}/share/doc -share_doc_folder="${temp_folder}/share/doc/${appli_name}" -mkdir ${share_doc_folder} -mkdir ${temp_folder}/share/icons -mkdir ${temp_folder}/share/icons/hicolor -mkdir ${temp_folder}/share/icons/hicolor/48x48 -mkdir ${temp_folder}/share/icons/hicolor/48x48/apps -mkdir ${temp_folder}/share/icons/hicolor/scalable -mkdir ${temp_folder}/share/icons/hicolor/scalable/apps -mkdir ${temp_folder}/share/applications - -# must delete debug symbol in OSCAR binary file -# --- V1 -strip -s -o ${temp_folder}/bin/${appli_name} ${build_folder}/oscar/OSCAR -#old code : cp ${build_folder}/oscar/OSCAR ${temp_folder}/bin - -# 2>/dev/null : errors does not appear : we don't care about them -cp -r ${build_folder}/oscar/Help ${temp_folder}/share/${appli_name} 2>/dev/null -cp -r ${build_folder}/oscar/Html ${temp_folder}/share/${appli_name} 2>/dev/null -cp -r ${build_folder}/oscar/Translations ${temp_folder}/share/${appli_name} 2>/dev/null -cp ./${appli_name}.png ${temp_folder}/share/icons/hicolor/48x48/apps/${appli_name}.png -cp ./${appli_name}.svg ${temp_folder}/share/icons/hicolor/scalable/apps/${appli_name}.svg -cp ./${appli_name}.desktop ${temp_folder}/share/applications/${appli_name}.desktop - -echo "Copyright 2019-2020 oscar-team.org " > $share_doc_folder/copyright - -changelog_file="$share_doc_folder/changelog" - -#automatic changelog as a bad name -# need to generate one and say fpm to use it instead of create one -# it seems that it needs both of them... - -# creation of the changelog.Debian.gz -echo "$appli_name (${VERSION}-${ITERATION}) whatever; urgency=medium" > $changelog_file -echo "" >> $changelog_file -echo " * Package created with FPM." >> $changelog_file -echo "" >> $changelog_file -echo " -- oscar-team.org " >> $changelog_file -gzip --best $changelog_file -description='Open Source CPAP Analysis Reporter\n' -# trick for dummies : need to use echo -e to take care of \n (cariage return to slip description and extra one -description=$(echo -e $description) - -# restore umask value -umask $current_value - -# create the .deb file (litian test show juste a warning with a man that doesn't exists : don't care about that) -fpm --input-type dir --output-type deb \ - --prefix ${dest_folder} \ - --before-install ${pre_inst} \ - --after-install ${post_inst} \ - --before-remove ${pre_rem} \ - --after-remove ${post_rem} \ - --name ${appli_name} --version ${VERSION} --iteration ${ITERATION} \ - --category misc \ - --deb-priority optional \ - --maintainer " -- oscar-team.org " \ - --license GPL-v3 \ - --vendor oscar-team.org \ - --description "$description" \ - --url https://sleepfiles.com/OSCAR \ - --deb-no-default-config-files \ - --depends libdouble-conversion1 \ - --depends libpcre16-3 \ - --depends qttranslations5-l10n \ - --depends 'libqt5core5a > 5.9.0' \ - --depends libqt5serialport5 \ - --depends libqt5xml5 \ - --depends libqt5network5 \ - --depends libqt5gui5 \ - --depends libqt5widgets5 \ - --depends libqt5opengl5 \ - --depends libqt5printsupport5 \ - --depends libglu1-mesa \ - --depends libgl1 \ - --depends libc6 \ - --no-deb-generate-changes \ - -C ${temp_folder} \ - . -