From ecf5f79c03fc4976e2eea2c3bfa9d481a9399de1 Mon Sep 17 00:00:00 2001 From: csoler Date: Tue, 18 Dec 2018 23:14:14 +0100 Subject: [PATCH] fixed version numbers in packaging scripts and added proper targets in VOIP and FeedReader plugins --- build_scripts/Debian+Ubuntu/debian/rules | 9 +-------- build_scripts/Debian+Ubuntu/makeSourcePackage.sh | 7 ++++++- plugins/FeedReader/FeedReader.pro | 3 +++ plugins/VOIP/VOIP.pro | 4 ++++ 4 files changed, 14 insertions(+), 9 deletions(-) diff --git a/build_scripts/Debian+Ubuntu/debian/rules b/build_scripts/Debian+Ubuntu/debian/rules index 2e59d918e..ececec026 100755 --- a/build_scripts/Debian+Ubuntu/debian/rules +++ b/build_scripts/Debian+Ubuntu/debian/rules @@ -3,7 +3,7 @@ configure: configure-stamp configure-stamp: dh_testdir - cd src && qmake "CONFIG-=debug" "CONFIG+=release" "CONFIG+=rs_autologin" "CONFIG+=retroshare_plugins" PREFIX=/usr LIB_DIR=/usr/lib RetroShare.pro + cd src && qmake "RS_MAJOR_VERSION=0" "RS_MINOR_VERSION=6" "RS_MINI_VERSION=4" "RS_EXTRA_VERSION=XXXXXX" "CONFIG-=debug" "CONFIG+=release" "CONFIG+=rs_autologin" "CONFIG+=retroshare_plugins" PREFIX=/usr LIB_DIR=/usr/lib RetroShare.pro touch $@ @@ -11,13 +11,6 @@ build: build-arch build-indep build-stamp: configure-stamp dh_testdir - # Add here commands to compile the package. - # cd libssh-0.6.4 && mkdir -p build && cd build && cmake -DWITH_STATIC_LIB=ON .. && make - # cd sqlcipher && ./configure --disable-shared --enable-static --enable-tempstore=yes CFLAGS="-DSQLITE_HAS_CODEC" LDFLAGS="-lcrypto" && make - # mkdir lib - # cp -r libssh-0.6.4 lib/ - #cp -r sqlcipher lib/ - #cd src/rsctrl/src && make cd src && $(MAKE) touch $@ diff --git a/build_scripts/Debian+Ubuntu/makeSourcePackage.sh b/build_scripts/Debian+Ubuntu/makeSourcePackage.sh index 8eddd7e5a..de99bcb67 100755 --- a/build_scripts/Debian+Ubuntu/makeSourcePackage.sh +++ b/build_scripts/Debian+Ubuntu/makeSourcePackage.sh @@ -84,9 +84,12 @@ echo Attempting to get revision number... ccount=`git rev-list --count --all` ccount=`expr $ccount + 8613 - 8267` +gitrev=`git describe | cut -d- -f2-3` + echo " Workdir :"${workdir} echo " Version :"${version_number} echo " Using revision :"${rev} +echo " Git Revision :"${gitrev} echo " Commit count :"${ccount} echo " Hash :"${hhsh} echo " Date :"${date} @@ -144,7 +147,7 @@ cd ${workdir} echo Setting version numbers... # setup version numbers -sed -e "s%RS_REVISION_NUMBER.*%RS_REVISION_NUMBER 0x${hhsh}%" src/libretroshare/src/retroshare/rsversion.in > src/libretroshare/src/retroshare/rsversion.h +#sed -e "s%RS_REVISION_NUMBER.*%RS_REVISION_NUMBER 0x${hhsh}%" src/libretroshare/src/retroshare/rsversion.in > src/libretroshare/src/retroshare/rsversion.h # Various cleaning echo Cleaning... @@ -157,6 +160,8 @@ for i in ${dist}; do if ! test "${i}" = "debian"; then echo copying changelog for ${i} sed -e s/XXXXXX/"${rev}"/g -e s/YYYYYY/"${i}"/g -e s/ZZZZZZ/"${version_number}"/g ../changelog > debian/changelog + sed -e s/XXXXXX/"-${gitrev}"/g debian/rules > debian_rules_tmp + cp debian_rules_tmp debian/rules if test ${useretrotor} = "true"; then cp ../rules.retrotor debian/rules diff --git a/plugins/FeedReader/FeedReader.pro b/plugins/FeedReader/FeedReader.pro index 6399c657e..dcd1ca296 100644 --- a/plugins/FeedReader/FeedReader.pro +++ b/plugins/FeedReader/FeedReader.pro @@ -19,6 +19,9 @@ !include("../Common/retroshare_plugin.pri"): error("Could not include file ../Common/retroshare_plugin.pri") CONFIG += qt uic qrc resources +TARGET = FeedReader +TARGET_PRL = FeedReader +DESTDIR = lib greaterThan(QT_MAJOR_VERSION, 4) { # Qt 5 diff --git a/plugins/VOIP/VOIP.pro b/plugins/VOIP/VOIP.pro index 187ecbd98..38cfb1022 100644 --- a/plugins/VOIP/VOIP.pro +++ b/plugins/VOIP/VOIP.pro @@ -28,8 +28,12 @@ exists($$[QMAKE_MKSPECS]/features/mobility.prf) { } else { QT += multimedia } + CONFIG += qt uic qrc resources MOBILITY = multimedia +TARGET = VOIP +TARGET_PRL = VOIP +DESTDIR = lib DEPENDPATH += $$PWD/../../retroshare-gui/src/temp/ui INCLUDEPATH += $$PWD/../../retroshare-gui/src/temp/ui