Commit Graph

73 Commits

Author SHA1 Message Date
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
csoler
62dc21d3b7 added missing -lpthread for some systems
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7508 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-09-09 17:05:20 +00:00
csoler
c7f551a0d1 added missing dependencies in INCLUDEPATH if sqlcipher is not installed in the system
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7503 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-09-06 16:48:39 +00:00
csoler
e7489ea2dc patch from serhaf to fix auto-detection of sqlcipher
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7445 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-07-09 18:11:10 +00:00
thunder2
4c6ab35867 Updated external library to openssl-1.0.1h
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7400 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-06-05 23:51:48 +00:00
thunder2
9ea4ab24e0 Updated external library to openssl-1.0.1g for Windows compile (merged from v0.5.5)
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7262 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-04-10 23:15:24 +00:00
thunder2
98e4271695 Fixed compile on Windows
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7090 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-02-04 21:59:55 +00:00
drbob
c0738eec7f Merging branches/v0.6-initdev into trunk.
These split at 6672 -> 7075, so quite a bit merge.
libretroshare compiles - but untested.
retroshare-gui needs GenCertDialog.ui and IdEditDialog.ui to be properly merged. (compile errors).
some plugins will be broken.
retroshare-nogui is untested.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7078 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-02-01 14:16:15 +00:00
drbob
7ca3ed78ae fixed up nogui for new rsaccounts stuff.
added missing OSX make stuff.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@7075 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-02-01 03:26:26 +00:00
drbob
6855a7ac98 Added OSX protobuf section.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7074 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-02-01 03:22:41 +00:00
csoler
630824aa1b Updated the notification system. Main changes are:
- the notification system is now a service, p3Notify, that is a public RsNotify.
- RsNotify does nothing except providing a registration system for new notify clients.
- Clients should derive a notify client from the NotifyClient class and register it to rsNotify
- all registered clients get all notifications, so only derive the needed methods. This should allow 
  plugins to get notifications as well.
- updated the code to call RsServer::notify()->[notification method] from inside libretroshare
- pqiNotify has been removed.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6996 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-01-07 22:51:22 +00:00
thunder2
13e7ac8b43 Fixed compile of the libraries with MinGW 4.8 on Windows.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6814 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-07 23:11:10 +00:00
thunder2
bf9270dd54 Removed the external library pthreads 2.8.0 on Windows build and used the library of MinGW (version 2.8.0 too). This fixes header mixup of both versions.
Switched to the release version of pthread so the name of the dll changes from pthreadGC2d.dll to pthreadGC2.dll. The new dll can be found in the bin directory of MinGW.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6794 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-03 16:23:02 +00:00
drbob
420fadb5c3 updated nogui for latest V0.6 changes.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@6793 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-03 13:16:51 +00:00
thunder2
959c9c2aca Fixed compile on Windows when using shadow build.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6784 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-01 13:50:34 +00:00
csoler
299678b9c8 patch from Stefan Sperling to allow openbsd compilation.Forgot these files last time
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6618 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-08-26 17:38:51 +00:00
thunder2
4ce08bee38 Renamed the lib of sqlcipher to libsqlcipher.a for Windows too.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6482 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-07-06 00:58:17 +00:00
csoler
fa3cc82790 latest version of sqlcipher has changed the lib name to libsqlcipher.a
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6481 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-07-05 18:57:56 +00:00
csoler
8d7bbb25f8 fixed slite lib linkage
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6463 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-06-25 19:48:51 +00:00
thunder2
05f8b15cfe Added missing file "stream.proto" to the automatic generation in retroshare-nogui.pro.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6336 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-04-23 21:43:24 +00:00
drbob
f02383f5d6 from retroshare/code/branches/v0.5-rpc-b1
--- Merging r6107 through r6332 into the rest of retroshare.

Updated version of RPC protocol with fancy new features like:
 - streaming.
 - add / remove friends.
 - file listings.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6335 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-04-23 21:10:34 +00:00
drbob
bef0b26744 Improvements to SSH RPC interface.
- Added Directory Listings.
 - Added File Streaming Node->Client
 - Updated generated protobuf files.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-rpc-b1@6282 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-03-25 19:05:31 +00:00
csoler
8cc98aeabc added missing pthread lib for ubuntu raring
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6196 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-03-08 12:57:27 +00:00
csoler
579b04db05 switched libssh to 0.5.4
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6187 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-03-04 22:09:10 +00:00
thunder2
d1b488002e - Fixed generating of protobuf files in retroshare-nogui.pro for shadow build and Windows compile.
- Added dummy files for generated protobuf files. Without these files qmake doesn't add it to the makefile.
- Added svnignore:* to gencc directory.


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6180 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-03-02 13:50:07 +00:00
csoler
2752a6975d patch from Henry Morgan to auto-detect system-wide libssh and use it to compile
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6169 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-02-28 22:48:28 +00:00
csoler
7e03ba812d patch from Henry Morgan to handle proto files from the .pro file
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6167 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-02-28 22:32:13 +00:00
csoler
641a24edac removed default qt, gui and xml flags from Qt,not wanted in no-gui
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6146 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-02-25 17:34:12 +00:00
drbob
e1e040c3eb Improved interfaces for Search, Chat and Peers.
Added latest protobuf files.

NB: This branch is now incompatible with most RPC Clients.
It will be developed in parallel with pyrs branch "rpc_dev"




git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-rpc-b1@6137 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-02-22 20:54:46 +00:00
csoler
c23cfd4a0f removed intermediate (re-generated) protobuf .cc and .h files. Fixed missing include line
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6132 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-02-17 17:01:22 +00:00
thunder2
635f915f46 Fixed ssl path in retroshare-nogui.pro for Windows compile
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6104 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-02-02 18:30:43 +00:00
csoler
b1ffc14954 removed gxs from default
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6099 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-01-30 09:21:57 +00:00
csoler
eed8fb7bfb fixed .pro file. libssh-0.5.2 should be unzipped in a directory next to trunk/
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6096 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-01-28 11:48:16 +00:00
thunder2
e2ad5b6cb6 Disabled "CONFIG += debug" in retroshare-nogui.pro
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6016 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-12-18 21:26:01 +00:00
thunder2
8b794a8f8f retroshare-nogui
- fixed path to libssh
- link static ssh on Windows
- fixed compiler warning on Windows

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6015 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-12-18 19:48:31 +00:00
defnax
46054187fc fixed retroshare no-gui project file for windows compile
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6013 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-12-18 10:52:34 +00:00
drbob
d3787cb324 Make rs-nogui+SSH compile against the trunk.
* converted to new flags format for File Operations.
 * converted from PUBLIC to VISIBLE lobbies. NB: This required name changes to protobuf definitions.
 * converted DataRates to new function.
 * directory sharing shifted to using OTHERS flags (text menus) - No support for group Flags yet.
 * Added == operator to Flags Type.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6000 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-12-17 01:24:16 +00:00
thunder2
f764a82408 Fixed compile of gxs on Windows.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5999 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-12-16 22:39:58 +00:00
drbob
069b72e0b2 Merged branch v0.5-gxs-b1 into trunk (from -r 5351 -> 5995)
This brings a huge amount of goodness into the trunk,
but there is still a big chunk todo before it can be released.

 * GXS Backend.
 * GXS Services:
	- Identities.
	- Circles
	- Photos
	- Wiki
	- GxsForums
	- Posted.
 * SSH no-gui server.

See branch commits for more info.

To switch on GXS stuff, enable CONFIG += gxs
in both libretroshare.pro and retroshare-gui.pro



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5996 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-12-16 19:17:11 +00:00
drbob
fde1e8d66d tweaked cyrils mods to be compatible with old ssh location, and use pregenerated proto.cc files.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5712 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-10-22 18:42:54 +00:00
csoler
3d4869e226 forgot to commit this file last time
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5708 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-10-21 19:59:53 +00:00
thunder2
56635e4ce4 Added more PRE_TARGETDEPS for Windows compile.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5700 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-10-21 11:51:38 +00:00
defnax
92454adbe7 added the required include dirs for win
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5647 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-10-08 15:59:22 +00:00
csoler
20747426ec added missing libs to compile on arch linux (Patch by AC)
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5558 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-09-17 18:42:31 +00:00
drbob
a9f95289d0 Added more RPC functionality:
* System: Quit & shutdown.
 * Search: New Search, List Searches, Close Search, Search Results.
 * Files: TranferLists, ControlDownloads (Start, Stop, Pause, etc).

Changed the way NotifyTxt records search results. 
 * Must register searchId for results to be saved.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5528 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-09-09 11:48:25 +00:00
drbob
84074fdca1 * Adding Chat RPC support into retroshare-nogui. ( About 90% there, and 40% tested. )
- RPC commands are outlined in the proto file.
	- You can: get listing, send msg, register for recv events, change nickname and join/create lobbiey
	- updated chat & core generated files.

 * Added RpcUniqueId(chan_id, req_id) for identifying requests.
 	- Modified Responses Queues to use new datatype.

 * Fixed reset to occur after the connection has died.




git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5508 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-09-03 19:18:59 +00:00
drbob
c8350ad011 Got the first RPC commands working now and tested with python library.
* Switched from BASE => CORE in proto files.
 * finished first RPC call to list peers.
 * return "NO_IMPL_YET" for other peer fns (Not Implemented Yet)
 * Added SystemStatus RPC call too.
 * Disable Verbose SSH logging - so we can see debug better.




git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5469 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-08-25 11:47:20 +00:00
drbob
b67f66faa0 Put the first rpc service into action. (untested though).
* Added functions to split up MsgId into Extension / Service / SubMsg.
 * Updated the generated code.
 * Switched on compilation too.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5461 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-08-23 15:20:43 +00:00
drbob
ccb43660a8 First bits of the RPC Protobuf Service. Doesn't compile yet - this is just a check-point checkin.
* Added generated protobuf code in proto/gencc
 * Added rpcprotopeers.h : Interface for getting/modifying peer information.
 * Added Stuff to .pro file. (disabled at the moment)
 * tweaked update times for SSH Menu, as they were too slow.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5460 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-08-23 14:04:01 +00:00
drbob
bb10b6b400 Added first version of RPC system for external control of retroshare-nogui.
The protocol message format is as follows: 
	[HEADER: 16 bytes: 4 x Network Order uint32_t][ VARIABLE LENGTH BODY ] 

	[ MAGIC_CODE ] [ MSG_ID ] [ REQ_ID ] [ BODY_SIZE ] [ ........ BODY ......... ]
	MagicCode = 0x137f0001 ... this will be incremented for new versions of the protocol.
 	MsgID = Corresponds to the format of the Body.
	ReqID = Generated by Requester, Returned in Response, make sure its unique. (undefined behaviour for duplicates)
        BodySize = Byte Length of Body.

	The Body will consist of a protobuf encoded message.

For the moment, the RPC server just ECHOs the request back to the sender - for testing purposes.

Usage:
 * Create SSH connection to retroshare-nogui.
 * Create Request Message(s), and send over SSH channel - You can send as meny requests as you want. 
 * They will processed, and responses sent back (potentially in an arbitary order).

Specific Changes here:
 * Modified rssshd to support arbitary recv/send applications. (interface is RpcComms).
 * Added rpc directory, with server, setup and echo service.
 * Modified Menu System to use the new interface to rssshd 
 * Wrote new matching interface for Terminal Usage.
	- NOTE: Strange BUG in Terminal version.... causes stderr to disappear. TODO.
 * Added -C commandline option to switch on RPC system.

This is the first version - so I expect there will be bugs. Please report for a prompt fix!



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5444 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-08-20 14:59:41 +00:00