diff --git a/build_scripts/Debian+Ubuntu/makeSourcePackage.sh b/build_scripts/Debian+Ubuntu/makeSourcePackage.sh index ee44c0e10..f7fbcfd97 100755 --- a/build_scripts/Debian+Ubuntu/makeSourcePackage.sh +++ b/build_scripts/Debian+Ubuntu/makeSourcePackage.sh @@ -83,6 +83,11 @@ cd ${workdir}/src git clone https://github.com/RetroShare/RetroShare.git . cd - +if ! test -d ${workdir}/src/libretroshare/; then + echo Git clone failed. + exit +fi + cp -r data ${workdir}/src/ cp -r debian ${workdir}/debian @@ -91,8 +96,6 @@ cp -r debian ${workdir}/debian # VOIP tweak cp ${workdir}/src/retroshare-gui/src/gui/chat/PopupChatDialog.ui ${workdir}/src/plugins/VOIP/gui/PopupChatDialog.ui -echo waiting... -read tmp # # handling of libssh # LIBSSH_VERSION=0.6.4 # 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... # 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 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... for i in ${dist}; do diff --git a/libretroshare/src/libretroshare.pro b/libretroshare/src/libretroshare.pro index a103392eb..14833d4cd 100644 --- a/libretroshare/src/libretroshare.pro +++ b/libretroshare/src/libretroshare.pro @@ -6,7 +6,7 @@ TARGET = retroshare #GXS Stuff. # This should be disabled for releases until further notice. -CONFIG += gxs debug +CONFIG += gxs #CONFIG += dsdv @@ -19,7 +19,6 @@ profiling { #QMAKE_CFLAGS += -Werror #QMAKE_CXXFLAGS += -Werror -CONFIG += debug debug { # DEFINES *= DEBUG # DEFINES *= OPENDHT_DEBUG DHT_DEBUG CONN_DEBUG DEBUG_UDP_SORTER P3DISC_DEBUG DEBUG_UDP_LAYER FT_DEBUG EXTADDRSEARCH_DEBUG diff --git a/openpgpsdk/src/openpgpsdk.pro b/openpgpsdk/src/openpgpsdk.pro index dced8d172..c0f741857 100644 --- a/openpgpsdk/src/openpgpsdk.pro +++ b/openpgpsdk/src/openpgpsdk.pro @@ -2,7 +2,7 @@ TEMPLATE = lib win32 { CONFIG += staticlib } else { - CONFIG = staticlib debug + CONFIG = staticlib } DEFINES *= OPENSSL_NO_IDEA