Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-06-19 11:54:22 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed version numbers in packaging scripts and added proper targets in VOIP and FeedReader plugins

Browse source
This commit is contained in:
csoler 2018-12-18 23:14:14 +01:00
parent 58383a76b1
commit ecf5f79c03
No known key found for this signature in database
GPG key ID: 7BCA522266C0804C
4 changed files with 14 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

9
build_scripts/Debian+Ubuntu/debian/rules
View file

@ -3,7 +3,7 @@
configure: configure-stamp configure: configure-stamp
configure-stamp: configure-stamp:
dh_testdir 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 $@ touch $@
@ -11,13 +11,6 @@ build: build-arch build-indep
build-stamp: configure-stamp build-stamp: configure-stamp
dh_testdir 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) cd src && $(MAKE)
touch $@ touch $@

7
build_scripts/Debian+Ubuntu/makeSourcePackage.sh
View file

@ -84,9 +84,12 @@ echo Attempting to get revision number...
ccount=`git rev-list --count --all` ccount=`git rev-list --count --all`
ccount=`expr $ccount + 8613 - 8267` ccount=`expr $ccount + 8613 - 8267`
gitrev=`git describe | cut -d- -f2-3`
echo " Workdir :"${workdir} echo " Workdir :"${workdir}
echo " Version :"${version_number} echo " Version :"${version_number}
echo " Using revision :"${rev} echo " Using revision :"${rev}
echo " Git Revision :"${gitrev}
echo " Commit count :"${ccount} echo " Commit count :"${ccount}
echo " Hash :"${hhsh} echo " Hash :"${hhsh}
echo " Date :"${date} echo " Date :"${date}
@ -144,7 +147,7 @@ cd ${workdir}
echo Setting version numbers... echo Setting version numbers...
# setup 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 # Various cleaning
echo Cleaning... echo Cleaning...
@ -157,6 +160,8 @@ for i in ${dist}; do
if ! test "${i}" = "debian"; then if ! test "${i}" = "debian"; then
echo copying changelog for ${i} 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/"${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 if test ${useretrotor} = "true"; then
cp ../rules.retrotor debian/rules cp ../rules.retrotor debian/rules

3
plugins/FeedReader/FeedReader.pro
View file

@ -19,6 +19,9 @@
!include("../Common/retroshare_plugin.pri"): error("Could not include file ../Common/retroshare_plugin.pri") !include("../Common/retroshare_plugin.pri"): error("Could not include file ../Common/retroshare_plugin.pri")
CONFIG += qt uic qrc resources CONFIG += qt uic qrc resources
TARGET = FeedReader
TARGET_PRL = FeedReader
DESTDIR = lib
greaterThan(QT_MAJOR_VERSION, 4) { greaterThan(QT_MAJOR_VERSION, 4) {
# Qt 5 # Qt 5

4
plugins/VOIP/VOIP.pro
View file

@ -28,8 +28,12 @@ exists($$[QMAKE_MKSPECS]/features/mobility.prf) {
} else { } else {
QT += multimedia QT += multimedia
} }
CONFIG += qt uic qrc resources CONFIG += qt uic qrc resources
MOBILITY = multimedia MOBILITY = multimedia
TARGET = VOIP
TARGET_PRL = VOIP
DESTDIR = lib
DEPENDPATH += $$PWD/../../retroshare-gui/src/temp/ui DEPENDPATH += $$PWD/../../retroshare-gui/src/temp/ui
INCLUDEPATH += $$PWD/../../retroshare-gui/src/temp/ui INCLUDEPATH += $$PWD/../../retroshare-gui/src/temp/ui