Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-06-06 21:58:57 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Various stuff. FAQ has 0 zero stuff inside, we don't use git, and matched lowercase filenames. Also, a few formatting fixes in the .pro file in libretroshare.

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2243 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
andrewsteinborn 2010-02-08 21:34:40 +00:00
parent 55c514d850
commit 38b0c578bb
6 changed files with 8 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

6
libretroshare/src/FAQ
View file

@ -1,6 +0,0 @@
RetroShare FAQ
---------------
Ask a Question.

14
libretroshare/src/libretroshare.pro
View file

@ -152,7 +152,7 @@ HEADERS += dbase/cachestrapper.h \
ft/ftchunkmap.h \ ft/ftchunkmap.h \
ft/ftserver.h \ ft/ftserver.h \
ft/fttransfermodule.h \ ft/fttransfermodule.h \
ft/ftdwlqueue.h \ ft/ftdwlqueue.h \
pqi/authssl.h \ pqi/authssl.h \
pqi/authgpg.h \ pqi/authgpg.h \
pqi/cleanupxpgp.h \ pqi/cleanupxpgp.h \
@ -205,7 +205,7 @@ HEADERS += dbase/cachestrapper.h \
rsiface/rsrank.h \ rsiface/rsrank.h \
rsiface/rsstatus.h \ rsiface/rsstatus.h \
rsiface/rstypes.h \ rsiface/rstypes.h \
rsserver/p3Blog.h \ rsserver/p3blog.h \
rsserver/p3discovery.h \ rsserver/p3discovery.h \
rsserver/p3face.h \ rsserver/p3face.h \
rsserver/p3msgs.h \ rsserver/p3msgs.h \
@ -251,10 +251,10 @@ HEADERS += dbase/cachestrapper.h \
services/p3ranking.h \ services/p3ranking.h \
services/p3service.h \ services/p3service.h \
services/p3status.h \ services/p3status.h \
turtle/p3turtle.h \ turtle/p3turtle.h \
turtle/turtletypes.h \ turtle/turtletypes.h \
turtle/rsturtleitem.h \ turtle/rsturtleitem.h \
tcponudp/extaddrfinder.h \ tcponudp/extaddrfinder.h \
tcponudp/bio_tou.h \ tcponudp/bio_tou.h \
tcponudp/tcppacket.h \ tcponudp/tcppacket.h \
tcponudp/tcpstream.h \ tcponudp/tcpstream.h \
@ -281,7 +281,7 @@ SOURCES += \
rsserver/rsinit.cc \ rsserver/rsinit.cc \
rsserver/p3face-config.cc \ rsserver/p3face-config.cc \
rsserver/p3face-server.cc \ rsserver/p3face-server.cc \
rsserver/p3Blog.cc \ rsserver/p3blog.cc \
rsserver/p3discovery.cc \ rsserver/p3discovery.cc \
rsserver/p3msgs.cc \ rsserver/p3msgs.cc \
rsserver/p3photo.cc \ rsserver/p3photo.cc \

2
libretroshare/src/rsserver/Makefile
View file

@ -12,7 +12,7 @@ RSOBJ = rsinit.o \
p3rank.o \ p3rank.o \
p3photo.o \ p3photo.o \
p3msgs.o \ p3msgs.o \
p3Blog.o \ p3blog.o \
p3discovery.o \ p3discovery.o \
p3face-server.o \ p3face-server.o \
p3face-config.o \ p3face-config.o \

3
libretroshare/src/rsserver/p3Blog.cc → libretroshare/src/rsserver/p3blog.cc
View file

@ -43,8 +43,6 @@ bool p3Blog::getBlogs(std::map< std::string, std::multimap<long int, std::wstrin
return mQblog->getBlogs(blogs); return mQblog->getBlogs(blogs);
} }
bool p3Blog::sendBlog(const std::wstring &msg) bool p3Blog::sendBlog(const std::wstring &msg)
{ {
return mQblog->sendBlog(msg); return mQblog->sendBlog(msg);
@ -57,6 +55,5 @@ bool p3Blog::getPeerLatestBlog(std::string id, uint32_t &ts, std::wstring &post)
post = L"Hmmm, not much, just eating prawn crackers at the moment... but I'll post this every second if you want ;)"; post = L"Hmmm, not much, just eating prawn crackers at the moment... but I'll post this every second if you want ;)";
return true; return true;
} }

0
libretroshare/src/rsserver/p3Blog.h → libretroshare/src/rsserver/p3blog.h
View file

14
libretroshare/src/version_detail.sh
View file

@ -3,20 +3,6 @@
#don't exit even if a command fails #don't exit even if a command fails
set +e set +e
if ( git log -n 1 &> /dev/null); then
#retrieve git information
version="git : $(git status | grep branch | cut -c 13-) $(git log -n 1 | grep commit | cut -c 8-)"
fi
if ( git log -n 1 | grep svn &> /dev/null); then
#retrieve git svn information
version="$version svn : $(git log -n 1 | grep svn | awk '{print $2}' | head -1 | sed 's/.*@//')"
elif ( git log -n 10 | grep svn &> /dev/null); then
#retrieve git svn information
version="$version svn closest version : $(git log -n 10 | grep svn | awk '{print $2}' | head -1 | sed 's/.*@//')"
fi
if ( svn info &> /dev/null); then if ( svn info &> /dev/null); then
version=$(svn info | head -n 5 | tail -1) version=$(svn info | head -n 5 | tail -1)
fi fi