Commit Graph

111 Commits

Author SHA1 Message Date
Gioacchino Mazzurco
5e4006b7e6
Merge branch 'v0.6.5' 2018-12-23 11:48:35 +01:00
csoler
3a664063ae
fixed error in .pri tat prevented plugins to be installed 2018-12-21 13:52:56 +01:00
Gioacchino Mazzurco
e80abde78a
Remove some old versioning system cruft remnants 2018-12-18 21:25:46 +01:00
csoler
a802e494f8
Merge pull request #1401 from G10h4ck/forum_api
0.6.5 Safer forum API
2018-11-20 21:45:45 +01:00
Gioacchino Mazzurco
f670a18b13
Break too long line in retroshare.pri 2018-11-16 19:09:37 +01:00
csoler
1e1e81704a
added license headers for librssimulator 2018-11-11 14:24:45 +01:00
sehraf
54df09c4b3
add missing DEFINE, fix small bugs 2018-11-10 20:34:03 +01:00
sehraf
b54305d508
rename config option 2018-11-05 18:56:27 +01:00
sehraf
66dff9bf0b
Add a build-time switch to set whether GXS distributes all available data or only sends data withint the configured sync period. 2018-11-05 18:56:11 +01:00
G10h4ck
047ae7f723
Merge branch 'master' into jsonapi 2018-10-10 22:23:28 +02:00
Gioacchino Mazzurco
77d938bf52
Remove _USE_32BIT_TIME_T windows define
Why did we added it in first place?
2018-10-07 13:07:22 +02:00
Gioacchino Mazzurco
8f17270a2a
Fix type in .pri breaking non-cross-compiling 2018-10-06 18:49:17 +02:00
Gioacchino Mazzurco
184fac95ae
Fix deep_search enable/disable at build time 2018-10-04 22:12:23 +02:00
Gioacchino Mazzurco
0078501dba
Initial work on a RetroShare cross-platform service
This doesn't need any interacion of the user at startup, unlike
retroshare-nogui which requires the user to login on the shell this doesn't
even need a TTY.
At startup this just parse command line, read the PGP keyring, look for
available locations, and start listening for JSON API requests.
Another difference with retroshare-nogui is that this is capable to
generate/import PGP identities, generate locations, and in general anything
possible through the RetroShare API.
retroshare-service is suitable also to run it as a system service, even
in very constrained systems such as Android ot a Docker container.
retroshare-service drop support for libresapi so only the new JSON API
is exposed, it will completely obsolete retroshare-android-service once
retroshare-qml-app is ported to the new JSON API.
2018-09-29 00:15:10 +02:00
Gioacchino Mazzurco
4f4e2d2bbb
More robust automatic version determination
Should work also with older qmake that miss take_first function
2018-09-15 20:57:28 +02:00
Gioacchino Mazzurco
92f90178c4
RS version is now parametrizable at compile time
Avoid the need of dirty patching to set the version at build time
In case RS version is not passed as argument attempt to determine it
  using git describe, if unavailable use hardcoded default
2018-09-12 10:49:36 +02:00
Gioacchino Mazzurco
396fe49312
Merge branch 'master' into jsonapi 2018-08-22 16:59:42 +02:00
csoler
0d4eafde31
fixed compilation on ubuntu with xapian 2018-07-31 18:09:11 +02:00
csoler
d1a375cbd0
removed RETROTOR #ifdef and started using RsAccounts::isTorAuto() instead. Unfinished yet. 2018-07-25 11:37:40 +02:00
csoler
a21c2724f5
disabled compilation of cmark until it gets fixed 2018-07-24 20:59:20 +02:00
csoler
3272ee0719
disabled compilation of cmark until it gets fixed 2018-07-23 17:20:13 +02:00
Gioacchino Mazzurco
130007b578
Merge branch 'master' into jsonapi 2018-07-23 13:44:01 +02:00
Gioacchino Mazzurco
ff166b2295
Merge branch 'master' into deep_search 2018-07-21 12:57:05 +02:00
Gioacchino Mazzurco
a31b06ab60
Merge branch 'master' into deep_search
Needed to make deep search and GXS search cooperate
2018-07-20 13:15:11 +02:00
csoler
2bab688dec
fixed merge with upstream/master 2018-07-19 23:22:24 +02:00
csoler
6848a586f3
merged upstream/master 2018-07-08 21:17:48 +02:00
Gioacchino Mazzurco
c0e92ddc6b
WIP Index GXS channels with xapian
Use temporary DB ATM
2018-07-02 17:29:54 +02:00
Gioacchino Mazzurco
7ad337c8d2
Implement automatic JSON API generation
qmake file add jsonapi-generator target to compile JSON API generator
qmake files add rs_jsonapi CONFIG option to enable/disable JSON API at compile
  time
RsTypeSerializer pass down same serialization flags when creating new context
  for nested objects serial job
RsGxsChannels expose a few methods through JSON API as example
Derive a few GXS types (RsGxsChannelGroup, RsGxsChannelPost, RsGxsFile,
  RsMsgMetaData) from RsSerializables so they can be used for the JSON API
Create RsGenericSerializer::SERIALIZATION_FLAG_YIELDING so JSON objects that
  miss some fields can be still deserialized, this improve API usability
SerializeContext offer friendly constructor with default paramethers
Add restbed 4.6 library as git submodule as most systems doesn't have it yet
Add a bit of documentation about JSON API into jsonapi-generator/README.adoc
Add JsonApiServer class to expose the JSON API via HTTP protocol
2018-06-24 16:28:33 +02:00
csoler
5b9666855d
fixed merge with upstream 2018-06-22 23:38:31 +02:00
Gioacchino Mazzurco
3c678f2a28
Fix windows build if MINGW_PREFIX is defined 2018-06-11 16:05:25 +02:00
csoler
b3277824eb
license fix in pqi 2018-05-28 22:03:39 +02:00
csoler
8b8eb6b597
re-licenced libbitdht to AGPLv3+ 2018-05-21 18:23:52 +02:00
Gioacchino Mazzurco
181d99e882
Give proper error message if Qt version is too old 2018-05-16 10:38:47 +02:00
thunder2
38ac234862 Fixed Windows compile with pre-compiled libraries
Added new variable EXTERNAL_LIB_DIR to specify path of external libraries
2018-05-07 09:42:36 +02:00
sehraf
c89e36a665
add auto selection of libsecret with fallback to libgnome-keyring 2018-05-04 20:52:31 +02:00
sehraf
1129bcb0c0
Add support for libsecret 2018-05-04 20:47:41 +02:00
cyril soler
56e8134d45 removed sqlite3 lib from ld when using sqlcipher. 2018-05-03 11:32:24 +02:00
sehraf
10daf3b9c6
Fix 'make install'
Since DATA_DIR (and the others) are not set 'make install' will move the files to /{qss, sounds, stylesheets, usr, webui} (instead of '/usr/...')
Fixes 4876a0ea3b
2018-04-28 09:06:10 +02:00
csoler
38b39caf13
added compilation flag for GXS dist sync 2018-04-25 14:58:53 +02:00
Gioacchino Mazzurco
678ee31a14
Fix compilation with GCC 6
Adding default include path to INCLUDEPATH break compilation with GCC 6
With many errors similar to this
x86_64-pc-linux-gnu-gcc -c -march=native -mtune=native -pipe -O0 -g -fno-omit-frame-pointer -fPIC -Wall -W -D_REENTRANT -DRS_ENABLE_GXS -DENABLE_WEBUI -DRS_NO_WARN_DEPRECATED -DRS_NO_WARN_CPP -DRS_GXS_TRANS -DOPENSSL_NO_IDEA -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB -I. -isystem /usr/include -I. -isystem /usr/include/qt5 -isystem /usr/include/qt5/QtGui -isystem /usr/include/qt5/QtCore -I. -isystem /usr/include/libdrm -I/usr/lib64/qt5/mkspecs/linux-g++ -o temp/linux/obj/accumulate.o openpgpsdk/accumulate.c
In file included from /usr/lib/gcc/x86_64-pc-linux-gnu/6.4.0/include/g++-v6/ext/string_conversions.h:41:0,
                 from /usr/lib/gcc/x86_64-pc-linux-gnu/6.4.0/include/g++-v6/bits/basic_string.h:5417,
                 from /usr/lib/gcc/x86_64-pc-linux-gnu/6.4.0/include/g++-v6/string:52,
                 from /usr/lib/gcc/x86_64-pc-linux-gnu/6.4.0/include/g++-v6/bits/locale_classes.h:40,
                 from /usr/lib/gcc/x86_64-pc-linux-gnu/6.4.0/include/g++-v6/bits/ios_base.h:41,
                 from /usr/lib/gcc/x86_64-pc-linux-gnu/6.4.0/include/g++-v6/ios:42,
                 from /usr/lib/gcc/x86_64-pc-linux-gnu/6.4.0/include/g++-v6/ostream:38,
                 from /usr/lib/gcc/x86_64-pc-linux-gnu/6.4.0/include/g++-v6/iostream:39,
                 from ./bitdht/bdobj.h:32,
                 from ./bitdht/bdmsgs.h:34,
                 from bitdht/bdmsgs.cc:30:
/usr/lib/gcc/x86_64-pc-linux-gnu/6.4.0/include/g++-v6/cstdlib:75:25: fatal error: stdlib.h: No such file or directory
 #include_next <stdlib.h>
                         ^

@see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=70129
2018-04-23 20:58:40 +02:00
Gioacchino Mazzurco
c39173c3db
Fix TravisCI 2018-04-20 12:09:21 +02:00
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
f5a3b26199
More omogeneous variable naming in android build tools 2018-03-09 20:26:29 +01:00
Gioacchino Mazzurco
0c8b3ed614
Set default Mac OS X version only if macx 2018-02-28 23:32:13 +01:00
Gioacchino Mazzurco
b2217fc109
Build plugin only if requested 2018-02-20 15:56:16 +01:00
csoler
7a2d874863
Merge pull request #1153 from csoler/v0.6-TorOnly
V0.6 tor only
2018-02-11 20:49:45 +01:00
csoler
a2eb145459
fixed option in .pri for retrotor configuration 2018-02-11 20:40:38 +01:00
Gioacchino Mazzurco
00125864ff Add support for SQLCipher on Android
Plus some cleanup
2018-01-30 18:24:03 +01:00
Gioacchino Mazzurco
ebfe50f814 Make .pro files compiler agnostic on Android 2018-01-30 18:11:31 +01:00
csoler
e28886fe79 updated to upstream/master 2018-01-05 21:59:22 +01:00