Merge pull request #1384 from hunbernd/fix/oldstuff

Removed outdated build scripts and information
This commit is contained in:
csoler 2018-11-02 22:09:18 +01:00 committed by GitHub
commit dccd40f77e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 34 additions and 443 deletions

View File

@ -1,11 +0,0 @@
set QTDIR=C:\Qt\5.5\mingw492_32
set LIBS=..\libs
set RSPATH=.\retroshare-gui\src\debug
set PATH=%QTDIR%\bin;%LIBS%\bin;%PATH%
If not exist %RSPATH%\retroshare.exe (
build-all-mingw32make.bat
)
%RSPATH%\retroshare.exe

View File

@ -1,217 +0,0 @@
set QTDIR=C:\Qt\5.5\mingw492_32\
set MINGW=C:\Qt\Tools\mingw492_32
set PATH=%QTDIR%\bin;%MINGW%\bin;%PATH%
set DEBUG=1
@echo off
rem emptying used variables in case the script was aborted and tempfile
set pack=
set clean=
set errorlevel=
if exist tmp.txt del tmp.txt
:loop1
if %1x == x (
rem if not exist tmp.txt echo debug >>tmp.txt
goto :end1
)
if /i %1==clean (
set clean=clean
shift
goto :loop1
)
if /i %1==pack (
set pack=pack
shift
goto :loop1
)
echo.%1>>tmp.txt
shift
goto :loop1
:end1
if %clean%x==cleanx (
if not exist tmp.txt echo %clean% >>tmp.txt
)
if not exist tmp.txt (
if not %pack%x==packx (
echo debug >>tmp.txt
set clean=clean
)
)
for /f %%a in (tmp.txt) do (
if ECHO==1 @echo on
rem TODO: Remove these lines
rem GOTO :retroshare-gui
:libbitdht
rem ###################################
rem ### libbitdht #####################
rem ###################################
cd libbitdht\src
if not %clean%x==x mingw32-make clean
qmake libbitdht.pro
CALL :TEST_ERROR
mingw32-make %%a
CALL :TEST_ERROR
echo ###################################
echo ### libbitdht done ################
echo ###################################
cd ..\..
:openpgpsdk
rem ###################################
rem ### openpgpsdk ####################
rem ###################################
cd openpgpsdk\src
if not %clean%x==x mingw32-make clean
qmake openpgpsdk.pro
CALL :TEST_ERROR
mingw32-make
CALL :TEST_ERROR
echo ###################################
echo ### openpgpsdk done ###############
echo ###################################
cd ..\..
:libresapi
rem ###################################
rem ### libresapi #####################
rem ###################################
cd libresapi\src
if not %clean%x==x mingw32-make clean
qmake libresapi.pro
CALL :TEST_ERROR
mingw32-make %%a
CALL :TEST_ERROR
echo ###################################
echo ### libresapi done ################
echo ###################################
cd ..\..
:libretroshare
rem ###################################
rem ### libretroshare #################
rem ###################################
cd libretroshare\src
if not %clean%x==x mingw32-make clean
qmake libretroshare.pro "CONFIG+=version_detail_bash_script"
CALL :TEST_ERROR
mingw32-make %%a
CALL :TEST_ERROR
echo ###################################
echo ### libretroshare done ############
echo ###################################
cd ..\..
:pegmarkdown
rem ###################################
rem ### pegmarkdown ###################
rem ###################################
cd supportlibs\pegmarkdown
if not %clean%x==x mingw32-make clean
qmake pegmarkdown.pro
CALL :TEST_ERROR
mingw32-make %%a
CALL :TEST_ERROR
echo ###################################
echo ### pegmarkdown done ##############
echo ###################################
cd ..\..
:retroshare-nogui
rem ###################################
rem ### retroshare-nogui ##############
rem ###################################
cd retroshare-nogui\src
if not %clean%x==x mingw32-make clean
qmake retroshare-nogui.pro
CALL :TEST_ERROR
mingw32-make %%a
CALL :TEST_ERROR
echo ###################################
echo ### retroshare-nogui done #########
echo ###################################
cd ..\..
:retroshare-gui
rem ###################################
rem ### retroshare-gui ################
rem ###################################
cd retroshare-gui\src
if not %clean%x==x mingw32-make clean
rem qmake -r -spec ..\mkspecs\win32-g++ "CONFIG+=version_detail_bash_script" retroshare-gui.pro
qmake retroshare-gui.pro "CONFIG+=version_detail_bash_script"
CALL :TEST_ERROR
mingw32-make %%a
CALL :TEST_ERROR
echo ###################################
echo ### retroshare-gui done ###########
echo ###################################
cd ..\..
@echo off
)
@echo off
if %pack%x==packx call packaging.bat
rem ###################################
rem ### clean up ######################
rem ###################################
set clean=
del tmp.txt
set pack=
pause
rem ###################################
rem ### END ###########################
rem ###################################
GOTO :EOF
:TEST_ERROR
@echo off
if errorlevel 1 (
pause
set clean=
del tmp.txt
set pack=
EXIT
)
if ECHO==1 @echo on
EXIT /B
:EOF

View File

@ -1,13 +0,0 @@
set QTDIR=C:\Qt\4.8.6
set MINGW=C:\MinGW
set PATH=%QTDIR%\bin;%MINGW%\bin;%PATH%
mingw32-make clean
qmake libbitdht.pro
mingw32-make
pause

View File

@ -2,64 +2,29 @@
README for RetroShare
=======================================================================================
RetroShare web site . . . . http://retroshare.sourceforge.net/
Documentation . . . . . . . http://retroshare.sourceforge.net/doc.html
Support . . . . . . . . . . http://retroshare.sourceforge.net/support.html
RetroShare web site . . . . http://retroshare.net/index.html
Developer's blog . . . . . https://retroshareteam.wordpress.com
Documentation . . . . . . . https://retroshare.readthedocs.io/en/latest/
Support . . . . . . . . . . http://retroshare.net/support.html
Forums . . . . . . . . . . http://retroshare.sourceforge.net/forum/
Wiki . . . . . . . . . . . http://retroshare.sourceforge.net/wiki/
The Developers site . . . . http://retroshare.sourceforge.net/developers.html
Project site . . . . . . . https://sourceforge.net/projects/retroshare
Wiki . . . . . . . . . . . https://github.com/RetroShare/documentation/wiki
Old developers site . . . . http://retroshare.sourceforge.net/wiki/index.php/Developers_Corner
Project site . . . . . . . https://github.com/RetroShare/RetroShare
Relted projects/plugins . . https://github.com/RetroShare
Contact: . . . . . . . . . retroshare@lunamutt.com ,defnax@users.sourceforge.net
Compiling + Running RetroShare (V0.5.xxx)
=========================================================================================
REQUIREMENTS
Compiling RetroShare
=========================================================================================
Libraries/Tools:
* C/C++ Compiler. (standard on Linux/cygwin)
* Qt >= 4.5.x https://download.qt.io/official_releases/qt/4.8/4.8.7/qt-everywhere-opensource-src-4.8.7.tar.gz
* OpenSSL http://www.openssl.org/source/openssl-0.9.8k.tar.gz
* MiniUPnP http://miniupnp.free.fr/files/download.php?file=miniupnpc-1.3.tar.gz
* gpgme ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-1.1.8.tar.bz2
* libgpg-error ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-1.7.tar.bz2
Build Scripts are avaible on GIT:
https://github.com/RetroShare/RetroShare/tree/master/build_scripts
Windows only:
* Cygwin http://www.cygwin.com/cygwin/setup.exe (for openssl compile)
* MinGW/Msys package http://sourceforge.net/projects/mingw/files/ (for compile gpgme,libgpg-error)
* Pthreads http://sourceware.org/pthreads-win32/
* Zlib http://www.zlib.net/
Latest RetroShare sources from (SVN) sourceforge.net:
svn co https://retroshare.svn.sourceforge.net/svnroot/retroshare retroshare
You can find here instructions howto compile RetroShare:
https://retroshare.readthedocs.io/en/latest/developer/compilation/
=========================================================================================
Build Scripts are avaible on SVN for Debian and Ubuntu:
http://retroshare.svn.sourceforge.net/viewvc/retroshare/trunk/build_scripts/
Latest stable OpenSSL is available at:
http://www.openssl.org
Latest miniupnpc-1.3 is avaible at:
http://miniupnp.free.fr/files/download.php?file=miniupnpc-1.3.tar.gz
Latest gpgme Library is avaible at:
ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-1.1.8.tar.bz2
Latest libgpg-error Library is avaible at:
ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-1.7.tar.bz2
Windows only:
pthreads: ftp://sourceware.org/pub/pthreads-win32/pthreads-w32-2-8-0-release.tar.gz
zlib: http://www.zlib.net/zlib-1.2.3.tar.gz
=========================================================================================
You can find here instrustions howto compile libretroshare and gui:
http://retroshare.sourceforge.net/wiki/index.php/Developers_Corner
=========================================================================================
You can go on over to our forum when you have trouble with compiling:
You can go on over to our forum or chat lobby when you have trouble with compiling:
retroshare://forum?name=Developers%20Discussions&id=8fd22bd8f99754461e7ba1ca8a727995
retroshare://chat_room?name=Retroshare%20Devel%20%28signed%29&id=L68DB0A1E09BDA3A5
http://retroshare.sourceforge.net/forum/
---------------------------------------------

View File

@ -1,7 +0,0 @@
TODO
---------------
Too much to list...
test SVN

View File

@ -1,14 +0,0 @@
set QTDIR=C:\Qt\4.8.6
set MINGW=C:\MinGW
set GIT=C:\Program Files\Git
set PATH=%QTDIR%\bin;%MINGW%\bin;;%GIT%\bin;%PATH%
mingw32-make clean
qmake libretroshare.pro "CONFIG+=version_detail_bash_script"
mingw32-make
pause

View File

@ -1,28 +0,0 @@
SQLCIPHER_VERSION=3.3.1
MSYS2AUTOMAKE=/usr/share/automake-1.15
BLD=../build-libs
DLD=../downloads
all: dirs sqlcipher
dirs:
mkdir -p ../../libs/include
mkdir -p ../../libs/lib
mkdir -p ../../libs/bin
mkdir -p $(DLD)
mkdir -p $(BLD)
sqlcipher: | ../../libs/lib/libsqlcipher.a
$(DLD)/sqlcipher-$(SQLCIPHER_VERSION).tar.gz:
curl.exe -L -k https://github.com/sqlcipher/sqlcipher/archive/v$(SQLCIPHER_VERSION).tar.gz -o $(DLD)/sqlcipher-$(SQLCIPHER_VERSION).tar.gz
../../libs/lib/libsqlcipher.a: $(DLD)/sqlcipher-$(SQLCIPHER_VERSION).tar.gz
tar xvf $(DLD)/sqlcipher-$(SQLCIPHER_VERSION).tar.gz -C $(BLD)
cp $(MSYS2AUTOMAKE)/config.guess $(BLD)/sqlcipher-$(SQLCIPHER_VERSION)/config.guess
cp $(MSYS2AUTOMAKE)/config.sub $(BLD)/sqlcipher-$(SQLCIPHER_VERSION)/config.sub
cd $(BLD)/sqlcipher-$(SQLCIPHER_VERSION) && LIBS="-L`pwd`/../../libs/lib -lgdi32 $$LIBS" && export LIBS && ./configure --disable-shared --enable-static --enable-tempstore=yes CFLAGS="-DSQLITE_HAS_CODEC -I`pwd`/../../libs/include" LDFLAGS="-L`pwd`/../../libs/lib -lcrypto -lgdi32" && make install prefix="`pwd`/install"
cp -r $(BLD)/sqlcipher-$(SQLCIPHER_VERSION)/install/include/* ../../libs/include/
cp $(BLD)/sqlcipher-$(SQLCIPHER_VERSION)/install/lib/libsqlcipher.a ../../libs/lib/
cp $(BLD)/sqlcipher-$(SQLCIPHER_VERSION)/install/bin/sqlcipher.exe ../../libs/bin/

View File

@ -1,13 +0,0 @@
set QTDIR=C:\Qt\4.8.6
set MINGW=C:\MinGW
set PATH=%QTDIR%\bin;%MINGW%\bin;%PATH%
mingw32-make clean
qmake plugins.pro
mingw32-make
pause

View File

@ -2,58 +2,29 @@
README for RetroShare
=======================================================================================
RetroShare web site . . . . http://retroshare.sourceforge.net/
Documentation . . . . . . . http://retroshare.sourceforge.net/doc.html
Support . . . . . . . . . . http://retroshare.sourceforge.net/support.html
RetroShare web site . . . . http://retroshare.net/index.html
Developer's blog . . . . . https://retroshareteam.wordpress.com
Documentation . . . . . . . https://retroshare.readthedocs.io/en/latest/
Support . . . . . . . . . . http://retroshare.net/support.html
Forums . . . . . . . . . . http://retroshare.sourceforge.net/forum/
Wiki . . . . . . . . . . . http://retroshare.sourceforge.net/wiki/
The Developers site . . . . http://retroshare.sourceforge.net/developers.html
Project site . . . . . . . https://sourceforge.net/projects/retroshare
Wiki . . . . . . . . . . . https://github.com/RetroShare/documentation/wiki
Old developers site . . . . http://retroshare.sourceforge.net/wiki/index.php/Developers_Corner
Project site . . . . . . . https://github.com/RetroShare/RetroShare
Relted projects/plugins . . https://github.com/RetroShare
Contact: . . . . . . . . . retroshare@lunamutt.com ,defnax@users.sourceforge.net
Compiling + Running RetroShare (V0.5.xxx)
=========================================================================================
REQUIREMENTS
Compiling RetroShare
=========================================================================================
Libraries/Tools:
* C/C++ Compiler. (standard on Linux/cygwin)
* Qt >= 4.6.x http://qt.nokia.com/downloads/downloads#lgpl
* OpenSSL http://www.openssl.org/source/openssl-1.0.1c.tar.gz
* MiniUPnP http://miniupnp.free.fr/files/download.php?file=miniupnpc-1.3.tar.gz
Build Scripts are avaible on GIT:
https://github.com/RetroShare/RetroShare/tree/master/build_scripts
Windows only:
* Cygwin http://www.cygwin.com/cygwin/setup.exe (for compile, openssl, pthreads)
* MinGW/Msys package http://sourceforge.net/projects/mingw/files/(for compile zlib, miniupnc, bzip2)
* Pthreads http://sourceware.org/pthreads-win32/
* Zlib http://www.zlib.net/
* bzip2 http://www.bzip.org/1.0.6/bzip2-1.0.6.tar.gz
Latest RetroShare sources from (SVN) sourceforge.net:
svn co https://retroshare.svn.sourceforge.net/svnroot/retroshare retroshare
=========================================================================================
Build Scripts are avaible on SVN for Debian and Ubuntu:
http://retroshare.svn.sourceforge.net/viewvc/retroshare/trunk/build_scripts/
Latest stable OpenSSL is available at:
http://www.openssl.org
Latest miniupnpc-1.3 is avaible at:
http://miniupnp.free.fr/files/download.php?file=miniupnpc-1.3.tar.gz
Windows only:
pthreads: ftp://sourceware.org/pub/pthreads-win32/pthreads-w32-2-8-0-release.tar.gz
zlib: http://www.zlib.net/zlib-1.2.3.tar.gz
=========================================================================================
You can find here instructions howto compile RetroShare:
http://retroshare.sourceforge.net/wiki/index.php/Developers_Corner
=========================================================================================
You can go on over to our forum when you have trouble with compiling:
https://retroshare.readthedocs.io/en/latest/developer/compilation/
You can go on over to our forum or chat lobby when you have trouble with compiling:
retroshare://forum?name=Developers%20Discussions&id=8fd22bd8f99754461e7ba1ca8a727995
retroshare://chat_room?name=Retroshare%20Devel%20%28signed%29&id=L68DB0A1E09BDA3A5
http://retroshare.sourceforge.net/forum/
---------------------------------------------

View File

@ -24,6 +24,7 @@
#include <retroshare/rsiface.h>
#include <retroshare/rsplugin.h>
#include "rshare.h"
#ifdef ENABLE_WEBUI
#include <microhttpd.h>
@ -84,13 +85,7 @@ HelpDialog::HelpDialog(QWidget *parent) :
ui->thanks->setText(in.readAll());
}
QFile versionFile(QLatin1String(":/help/version.html"));
if (versionFile.open(QIODevice::ReadOnly | QIODevice::Text)) {
QTextStream in(&versionFile);
QString version = in.readAll();
ui->version->setText(version);
}
ui->version->setText(Rshare::retroshareVersion(true));
/* Add version numbers of libretroshare */
std::list<RsLibraryInfo> libraries;

View File

@ -1,5 +0,0 @@
Retroshare Gui version :
Svn version : 8013
Fr 13. Mär 16:32:53 CET 2015

View File

@ -1,4 +0,0 @@
Retroshare Gui version :
Git version : $Branch$
$Hash$
$Date$

View File

@ -646,7 +646,6 @@
<file>images/newsfeed/news-feed-32.png</file>
<file>images/newsfeed/news-feed-notify-32.png</file>
<file>images/share-icon-16.png</file>
<file>help/version.html</file>
<file>images/view-certificate-sign-48.png</file>
<file>images/toasterEnable.png</file>
<file>images/toasterDisable.png</file>

View File

@ -1,15 +0,0 @@
set QTDIR=C:\Qt\5.5.0\5.5\mingw492_32
set MINGW=C:\Qt\Tools\mingw492_32
set GIT=C:\Program Files\Git
set PATH=%QTDIR%\bin;%MINGW%\bin;%GIT%\bin;%PATH%
qmake retroshare-gui.pro "CONFIG+=version_detail_bash_script"
mingw32-make
pause

View File

@ -1,12 +0,0 @@
set QTDIR=C:\Qt\4.8.5
set MINGW=C:\MinGW
set PATH=%QTDIR%\bin;%MINGW%\bin;%PATH%
qmake retroshare-nogui.pro
mingw32-make
pause