removed default debug flag in .pro files. Fixed up version.h in packaging script.

This commit is contained in:
csoler 2015-08-02 18:35:27 +02:00
parent 7c8788f86e
commit 2b8eafa1db
3 changed files with 11 additions and 7 deletions

View File

@ -83,6 +83,11 @@ cd ${workdir}/src
git clone https://github.com/RetroShare/RetroShare.git . git clone https://github.com/RetroShare/RetroShare.git .
cd - cd -
if ! test -d ${workdir}/src/libretroshare/; then
echo Git clone failed.
exit
fi
cp -r data ${workdir}/src/ cp -r data ${workdir}/src/
cp -r debian ${workdir}/debian cp -r debian ${workdir}/debian
@ -91,8 +96,6 @@ cp -r debian ${workdir}/debian
# VOIP tweak # VOIP tweak
cp ${workdir}/src/retroshare-gui/src/gui/chat/PopupChatDialog.ui ${workdir}/src/plugins/VOIP/gui/PopupChatDialog.ui cp ${workdir}/src/retroshare-gui/src/gui/chat/PopupChatDialog.ui ${workdir}/src/plugins/VOIP/gui/PopupChatDialog.ui
echo waiting...
read tmp
# # handling of libssh # # handling of libssh
# LIBSSH_VERSION=0.6.4 # LIBSSH_VERSION=0.6.4
# LIBSSH_LOCATION=https://git.libssh.org/projects/libssh.git/snapshot/libssh-${LIBSSH_VERSION}.tar.gz # LIBSSH_LOCATION=https://git.libssh.org/projects/libssh.git/snapshot/libssh-${LIBSSH_VERSION}.tar.gz
@ -111,11 +114,13 @@ 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 0x0${hssh}%" > 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...
find . -depth -name ".svn" -a -type d -exec rm -rf {} \; # remove all svn repositories
\rm -rf src/.git
#find . -depth -name ".svn" -a -type d -exec rm -rf {} \; # remove all svn repositories
echo Calling debuild... echo Calling debuild...
for i in ${dist}; do for i in ${dist}; do

View File

@ -6,7 +6,7 @@ TARGET = retroshare
#GXS Stuff. #GXS Stuff.
# This should be disabled for releases until further notice. # This should be disabled for releases until further notice.
CONFIG += gxs debug CONFIG += gxs
#CONFIG += dsdv #CONFIG += dsdv
@ -19,7 +19,6 @@ profiling {
#QMAKE_CFLAGS += -Werror #QMAKE_CFLAGS += -Werror
#QMAKE_CXXFLAGS += -Werror #QMAKE_CXXFLAGS += -Werror
CONFIG += debug
debug { debug {
# DEFINES *= DEBUG # DEFINES *= DEBUG
# DEFINES *= OPENDHT_DEBUG DHT_DEBUG CONN_DEBUG DEBUG_UDP_SORTER P3DISC_DEBUG DEBUG_UDP_LAYER FT_DEBUG EXTADDRSEARCH_DEBUG # DEFINES *= OPENDHT_DEBUG DHT_DEBUG CONN_DEBUG DEBUG_UDP_SORTER P3DISC_DEBUG DEBUG_UDP_LAYER FT_DEBUG EXTADDRSEARCH_DEBUG

View File

@ -2,7 +2,7 @@ TEMPLATE = lib
win32 { win32 {
CONFIG += staticlib CONFIG += staticlib
} else { } else {
CONFIG = staticlib debug CONFIG = staticlib
} }
DEFINES *= OPENSSL_NO_IDEA DEFINES *= OPENSSL_NO_IDEA