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

more license fixes and updated version in Debian control files

Browse source
This commit is contained in:
csoler 2018-12-27 15:47:58 +01:00
parent bc3a71d3f5
commit d9683459d6
No known key found for this signature in database
GPG key ID: 7BCA522266C0804C
5 changed files with 78 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

88
build_scripts/Debian/makeSourcePackage.sh
View file

@ -1,15 +1,15 @@
#!/bin/sh
###################### PARAMETERS ####################
gitpath="https://github.com/RetroShare/RetroShare.git"
gitpath="https://github.com/csoler/RetroShare.git"
#branch="master"
branch="v0.6.4-official_release"
branch="v0.6.5-DebianPackaging"
#bubba3="Y" # comment out to compile for bubba3
######################################################
RS_MAJOR_VERSION=`fgrep RS_MAJOR_VERSION ../../libretroshare/src/retroshare/rsversion.h | cut -d\\ -f3- | sed -e s\/\ \/\/g | cut -c1`
RS_MINOR_VERSION=`fgrep RS_MINOR_VERSION ../../libretroshare/src/retroshare/rsversion.h | cut -d\\ -f3- | sed -e s\/\ \/\/g | cut -c1`
RS_BUILD_NUMBER=`fgrep RS_BUILD_NUMBER ../../libretroshare/src/retroshare/rsversion.h | grep -v BUILD_NUMBER_ADD | cut -d\\ -f3- | sed -e s\/\ \/\/g | cut -c1`
RS_MAJOR_VERSION=0
RS_MINOR_VERSION=6
RS_BUILD_NUMBER=5
# echo "RS_MAJOR_VERSION="${RS_MAJOR_VERSION}
# echo "RS_MINOR_VERSION="${RS_MINOR_VERSION}
@ -22,7 +22,7 @@ echo This script is going to build the debian source package for RetroShare, fro
if test -d "${workdir}" ; then
echo Removing the ${workdir} directory...
rm -rf ${workdir}
rm -i -rf ${workdir}
fi
# Parse options
@ -33,7 +33,7 @@ gpgkey="0932399B"
date=`git log --pretty=format:"%ai" | head -1 | cut -d\ -f1 | sed -e s/-//g`
time=`git log --pretty=format:"%aD" | head -1 | cut -d\ -f5 | sed -e s/://g`
hhsh=`git log --pretty=format:"%H" | head -1 | cut -c1-8`
hhsh=`git log --pretty=format:"%H" | head -1 | cut -c1-8`
rev=${date}.${hhsh}
useretrotor="false"
@ -68,13 +68,44 @@ while [ ${#} -gt 0 ]; do
esac
done
removeIrrelevantFiles() {
echo Removing irrelevant files in directory ${workdir}...
# remove unised qml code, only needed on Android
rm -i -rf ${workdir}/src/retroshare-qml-app/
rm -i -rf ${workdir}/src/librssimulator/
rm -i -rf ${workdir}/src/libretroshare/tests/
rm -i -rf ${workdir}/src/libretroshare/unfinished/
rm -i -rf ${workdir}/src/libretroshare/unused/
rm -i -rf ${workdir}/src/retroshare-android-notify-service/
rm -i -rf ${workdir}/src/retroshare-android-service/
rm -i -rf ${workdir}/src/libretroshare/src/unused/
rm -i -rf ${workdir}/src/supportlibs/
rm -i -rf ${workdir}/src/retroshare-service/
rm -i -rf ${workdir}/src/plugins/
rm -i -rf ${workdir}/src/unittests/
rm -i -rf ${workdir}/src/tests/
rm -i -rf ${workdir}/src/build_scripts/
rm -i -rf ${workdir}/src/libbitdht/src/tests/
rm -i -rf ${workdir}/src/libbitdht/src/example/
rm -i -f ${workdir}/debian/*~
rm -i -f ${workdir}/debian/.*.sw?
rm -i -f ${workdir}/src/retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/images.sh
rm -i -f ${workdir}/src/retroshare-gui/src/gui/qss/chat/Bubble/src/images.sh
rm -i -f ${workdir}/src/retroshare-gui/src/gui/qss/chat/Bubble/public/images.sh
rm -i -f ${workdir}/src/retroshare-gui/src/gui/qss/chat/Bubble/"history"/images.sh
rm -i -f ${workdir}/src/retroshare-gui/src/gui/qss/chat/Bubble/private/images.sh
}
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}
@ -121,36 +152,18 @@ if ! test "${nodl}" = "yes"; then
# VOIP tweak
cp ${workdir}/src/retroshare-gui/src/gui/chat/PopupChatDialog.ui ${workdir}/src/plugins/VOIP/gui/PopupChatDialog.ui
# remove unised qml code, only needed on Android
rm -rf ${workdir}/src/retroshare-qml-app/
rm -rf ${workdir}/src/librssimulator/
rm -rf ${workdir}/src/libretroshare/tests/
rm -rf ${workdir}/src/libretroshare/unfinished/
rm -rf ${workdir}/src/libretroshare/unused/
rm -rf ${workdir}/src/retroshare-android-notify-service/
rm -rf ${workdir}/src/retroshare-android-service/
rm -rf ${workdir}/src/libretroshare/src/unused/
rm -rf ${workdir}/src/pegmarkdown/
rm -rf ${workdir}/src/unittests/
rm -rf ${workdir}/src/build_scripts/
rm -f ${workdir}/debian/*~
rm -f ${workdir}/debian/.*.sw?
rm -f ${workdir}/src/retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/images.sh
rm -f ${workdir}/src/retroshare-gui/src/gui/qss/chat/Bubble/src/images.sh
rm -f ${workdir}/src/retroshare-gui/src/gui/qss/chat/Bubble/public/images.sh
rm -f ${workdir}/src/retroshare-gui/src/gui/qss/chat/Bubble/"history"/images.sh
rm -f ${workdir}/src/retroshare-gui/src/gui/qss/chat/Bubble/private/images.sh
removeIrrelevantFiles
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...
\rm -rf src/.git
\rm -i -rf src/.git
if test "${makeorig}" = "yes" ; then
echo making orig archive
@ -164,24 +177,7 @@ else
tar zxvf retroshare_${version_number}.orig.tar.gz
cp -r debian/* ${workdir}/debian/
rm -rf ${workdir}/src/retroshare-qml-app/
rm -rf ${workdir}/src/librssimulator/
rm -rf ${workdir}/src/libretroshare/tests/
rm -rf ${workdir}/src/libretroshare/unfinished/
rm -rf ${workdir}/src/libretroshare/unused/
rm -rf ${workdir}/src/retroshare-android-notify-service/
rm -rf ${workdir}/src/retroshare-android-service/
rm -rf ${workdir}/src/libretroshare/src/unused/
rm -rf ${workdir}/src/pegmarkdown/
rm -rf ${workdir}/src/unittests/
rm -rf ${workdir}/src/build_scripts/
rm -f ${workdir}/debian/*~
rm -f ${workdir}/debian/.*.sw?
rm -f ${workdir}/src/retroshare-gui/src/gui/qss/chat/Bubble_Compact/private/images.sh
rm -f ${workdir}/src/retroshare-gui/src/gui/qss/chat/Bubble/src/images.sh
rm -f ${workdir}/src/retroshare-gui/src/gui/qss/chat/Bubble/public/images.sh
rm -f ${workdir}/src/retroshare-gui/src/gui/qss/chat/Bubble/"history"/images.sh
rm -f ${workdir}/src/retroshare-gui/src/gui/qss/chat/Bubble/private/images.sh
removeIrrelevantFiles
fi
# Cloning sqlcipher