Commit Graph

128 Commits

Author SHA1 Message Date
Gioacchino Mazzurco
4876a0ea3b
Multiple improvements to build process
Restructure and document retroshare.pri variables and helper functions
Link sqlite statically like other libraries on Android
qmake has multiple win32-* specs match them correctly
Move a buch of generic thing to retroshare.pri instead of having them replocated
  accross project specific .pro
Fix retroshare-gui too many symbols exported on windows liking error by adding
  QMAKE_LFLAGS+=-Wl,--exclude-libs,ALL
Rename retroshare-gui/src/util/win32.h because the name is too prone to
  confusion and build conflicts
libreasapi avoid usage of cretar_prl link_prl that seems unreliable on some
  platforms
libreasapi rename LIBRESAPI_QT to more understendable LIBRESAPI_SETTINGS
Use use_*.pri instead of copy pasting error prone qmake snippets around
Expose bitdht option to retroshare.pri
Add RS_THREAD_LIB qmake variable for better crossplatform support
Move debug and profiling generic options to retroshare.pri (avoid copy/pasting)
Remove Qt script module in qmake as it is not available anymore
2018-04-18 07:56:43 +02:00
Gioacchino Mazzurco
4d6085047a More cleanup of .pro files 2018-01-30 18:25:04 +01:00
Gioacchino Mazzurco
ebfe50f814 Make .pro files compiler agnostic on Android 2018-01-30 18:11:31 +01:00
csoler
b4fdd4e0d0 added two additional non packward compatible changes for future version 0.7, and improvements of verifications of certificate signatures 2017-11-19 18:21:56 +01:00
Phenom
714f9bba99 Fix warning: this statement may fall through
/openpgpsdk/src/openpgpsdk/packet-parse.c:2482: warning: this statement
may fall through [-Wimplicit-fallthrough=]
         hashes[n].add(&hashes[n],C.secret_key.salt,OPS_SALT_SIZE);
/openpgpsdk/src/openpgpsdk/packet-parse.c:2484: here
      case OPS_S2KS_SIMPLE:
2017-07-16 20:21:38 +02:00
csoler
4f887ff528 commented out unused line 2017-07-08 16:47:50 +02:00
Gioacchino Mazzurco
59b77da6a2 Merge branch 'master' into qmlapp_pex_alpha 2017-05-31 12:11:15 +02:00
Enno Boland
2046d9eaae fix building with libressl 2017-05-21 10:48:58 +02:00
Gioacchino Mazzurco
4455bfa92d Merge branch 'master' into merge_alpha_master 2017-04-18 21:30:25 +02:00
Phenom
cbc264f5a3 Fix clang warning:Implicit conversion from enumeration
warning: implicit conversion from enumeration type 'ops_s2k_usage_t' to
different enumeration type 'ops_symmetric_algorithm_t' [-Wenum-
conversion]
      C.secret_key.algorithm=C.secret_key.s2k_usage;
                            ~~~~~~~~~~~~~~^~~~~~~~~
2017-04-17 21:08:59 +02:00
Gioacchino Mazzurco
5a219b4d10 Update to Qt 5.8.0
Simplified android buinding and updated documentation
Removed a bunch of unused qml files
2017-03-15 23:11:50 +01:00
csoler
e75487e48a suppressed a few warnings (suggested by Phenom) 2017-02-25 23:16:43 +01:00
csoler
c313fb5453 removed compilation warning 2017-02-25 14:09:39 +01:00
csoler
65a383afea fixed typo causing crash in openpgp-sdk 2017-02-23 19:16:48 +01:00
csoler
9371521dd1 fixed bug causing crash in openssl_crypto due to not zeroing a field that was not duplicated before delete 2017-02-20 23:19:29 +01:00
csoler
01e89bb0d8 fixing compilation for openssl-1.1.0 (part 10) 2017-02-18 23:47:47 +01:00
csoler
fc1a792a12 fixing compilation for openssl-1.1.0 (part 9) 2017-02-18 18:16:10 +01:00
csoler
d5e679299c fixing compilation for openssl-1.1.0 (part 8) 2017-02-18 18:09:49 +01:00
csoler
deb3a49b6a fixing compilation for openssl-1.1.0 (part 7) 2017-02-18 17:00:46 +01:00
csoler
5951f460f6 fixing compilation for openssl-1.1.0 (part 6) 2017-02-18 16:49:35 +01:00
csoler
70e2a67786 fixing compilation for openssl-1.1.0 (part 5) 2017-02-18 16:40:38 +01:00
csoler
13a8389f68 fixing compilation for openssl-1.1.0 (part 4) 2017-02-18 16:21:17 +01:00
csoler
262fa9c593 fixing compilation for openssl-1.1.0 (part 3) 2017-02-18 15:45:45 +01:00
csoler
ba52b05968 fixing compilation for openssl-1.1.0 (part 2) 2017-02-18 15:28:27 +01:00
csoler
63a221007c fixing compilation with openssl-1.1.0 (part 1) 2017-02-18 14:40:44 +01:00
Gio
8ab3c7de26 Merge branch 'master' into android 2016-11-07 14:37:23 +01:00
Phenom
2db8dbd45f Fix El Capitan OSX 10.11 Compil 2016-11-02 21:40:46 +01:00
manu
50fe3dd711 QML activity interacts with backend.
Test QML activity changed for a simplified version of drbob's rsqml-models.
It requests JSON documents from the libresapilocalserver and shows them raw.
Updated Android documentation.
Moved Android qmake section to the end of libretroshare.pro and openpgpsdk.pro
to avoid static linking errors.
2016-09-04 15:01:44 +02:00
Gio
9a980def2c libretroshare now compiles for Android, instruction on how to do it included 2016-08-23 12:15:28 +02:00
csoler
95202d648b removed possible double free() of buf in parse_headers (suggestion by GuessWho) 2016-07-16 18:26:04 -04:00
sehraf
ca90f1387d remove compiler warnings openpgpsdk 2016-06-01 21:20:50 +02:00
Cyril Soler
9871b37ef2 Merge pull request #305 from realityfabric/openssl_crypto_infinite_loop
Changed a while loop to prevent an infinite loop
2016-04-04 23:02:09 -04:00
Phenom
b13292bb80 Fix error reported by CppChecker:
/libretroshare/src/gxs/rsgenexchange.cc:2850: erreur : Cppcheck:
Dereferencing 'grp' after it is deallocated / released
/libretroshare/src/gxstunnel/p3gxstunnel.cc:1004: erreur : Cppcheck:
Invalid usage of output stream: '<< std::cerr'.
/libretroshare/src/util/contentvalue.cc:185: erreur : Cppcheck: Memory
leak: dest
/openpgpsdk/src/openpgpsdk/reader_armoured.c:575: erreur : Cppcheck:
Common realloc mistake: 'buf' nulled but not freed upon failure
/retroshare-gui/src/gui/FileTransfer/DLListDelegate.cpp:103: erreur :
Cppcheck: Array 'byteUnits[4]' accessed at index 4, which is out of
bounds.
/retroshare-gui/src/gui/FileTransfer/DLListDelegate.cpp:122: erreur :
Cppcheck: Array 'byteUnits[4]' accessed at index 4, which is out of
bounds.
/retroshare-gui/src/gui/FileTransfer/DLListDelegate.cpp:141: erreur :
Cppcheck: Array 'byteUnits[4]' accessed at index 4, which is out of
bounds.
/retroshare-gui/src/gui/FileTransfer/ULListDelegate.cpp:92: erreur :
Cppcheck: Array 'byteUnits[4]' accessed at index 4, which is out of
bounds.
/retroshare-gui/src/gui/FileTransfer/ULListDelegate.cpp:111: erreur :
Cppcheck: Array 'byteUnits[4]' accessed at index 4, which is out of
bounds.
/retroshare-gui/src/gui/People/PeopleDialog.cpp:774: erreur : Cppcheck:
Uninitialized variable: layout
/retroshare-gui/src/gui/People/PeopleDialog.cpp:864: erreur : Cppcheck:
Uninitialized variable: layout
/retroshare-gui/src/gui/common/AvatarWidget.cpp:225: erreur : Cppcheck:
Uninitialized variable: status
/retroshare-nogui/src/rpc/proto/rpcprotostream.cc:805: erreur :
Cppcheck: Memory leak: buffer
/supportlibs/pegmarkdown/GLibFacade.c:150: erreur : Cppcheck: va_list
'args' was opened but not closed by va_end().
/openpgpsdk/src/openpgpsdk/reader_armoured.c:575: erreur : Cppcheck:
Common realloc mistake: 'buf' nulled but not freed upon failure
/tests/unittests/libretroshare/serialiser/rsturtleitem_test.cc:213:
erreur : Cppcheck: Return value of allocation function 'init_item' is
not stored.
2016-03-20 13:12:30 +01:00
realityfabric
546bfe69b0 Changed the logic back to setting err in the conditional statement while more explicitly a logical one 2016-03-14 02:46:58 -07:00
realityfabric
1e90194c86 Changed a while loop from 'while(err=ERR_get_error())' to 'while(err==ERR_get_error())' 2016-03-13 07:24:14 -07:00
Cyril Soler
d878334551 Merge pull request #206 from realityfabric/master
Added top level license file for GPL 2.0
2016-02-16 17:45:49 -05:00
csoler
9c6e7dfc13 added checks after mallocs in several files 2016-01-11 23:49:00 -05:00
Jessie RealityFabric
5519b08a75 Create LICENSE.md 2015-12-16 02:14:19 -08:00
defnax
c41f98cb4c Merge pull request #86 from PhenomRetroShare/Fix_Win7_32bCompilationFromScratch
Fix Windows 7 32b Compilation from scratch.
2015-11-06 01:58:30 +01:00
csoler
b2dbf9d30a adding missing BIO_free (issue #138) 2015-10-20 18:16:18 -04:00
Phenom
79d761ae2e Add Win32 section in retroshare.pri
And add MSys2 directories.
2015-10-17 12:15:36 +02:00
AsamK
2be400e33e CONFIG shouldn't be reset at qmake call, use CONFIG+=… instead
With CONFIG=…, the default values of CONFIG are cleared, with qt4 this
doesn't seem to be a problem, but with qt5 the build fails.

CONFIG=staticlib in openpgpsdk.pro was added in 3caeb0ab7f
for OS X, but is not necessary on linux
2015-09-01 14:53:17 +02:00
AsamK
e135e3441c Create retroshare.pri for common configurations in .pro files
So far it only contains the default values for installation paths
2015-08-31 21:09:28 +02:00
csoler
2b8eafa1db removed default debug flag in .pro files. Fixed up version.h in packaging script. 2015-08-02 18:35:27 +02:00
electron128
779ebbf925 fixed potential use after free in openpgpsdk
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8491 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-06-16 14:09:34 +00:00
electron128
4b624a6091 fixed double free in openpgpsdk
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8490 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-06-16 13:47:41 +00:00
electron128
5e5dd3d12d fixed potential invalid memory read in openpgpsdk
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8486 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-06-16 13:23:06 +00:00
csoler
74c01423f0 improved login system: do not re-ask for passphrase when user clicks cancel. Removed warning stating that maybe passphrase is wrong
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8415 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-06-11 20:31:52 +00:00
thunder2
7f58460e5f Added DEPENDPATH to pro files
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7842 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-01-12 23:14:35 +00:00
thunder2
d0238810b7 Common folders for libraries, includes and binaries of all external libraries for Windows compile.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7580 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-10-05 15:31:00 +00:00