Merge branch 'master' into TheWire-update-GroupPtrs

build_scripts/Windows-msys2/env/tools/prepare-msys2.bat

@@ -25,7 +25,7 @@ if exist "%EnvMSYS2Path%\msys%MSYS2Base%\usr\bin\pacman.exe" (
 	)
 )
 
-set MSYS2Install=msys2-base-%MSYS2Architecture%-20180531.tar.xz
+set MSYS2Install=msys2-base-%MSYS2Architecture%-20200720.tar.xz
 set MSYS2Url=http://sourceforge.net/projects/msys2/files/Base/%MSYS2Architecture%/%MSYS2Install%/download
 
 %cecho% info "Remove previous MSYS2 version"

build_scripts/Windows-msys2/readme.md

@@ -7,6 +7,10 @@ This guide contains information about how to setup your build environment in an
 If you prefer to setup your environment manually, check this guide: 
 [WindowsMSys2_InstallGuide.md](WindowsMSys2_InstallGuide.md)
 
+Setting up the build environment automatically on a 32 bit OS is not possible anymore. 
+You can download an older 32 bit [MSYS2 installer](https://sourceforge.net/projects/msys2/files/Base/i686/msys2-base-i686-20180531.tar.xz/download) and follow the manual setup instructions.
+Building 32 bit RetroShare from the 64 bit build environment is still possible.
+
 You have to clone this repository (with [git for windows](https://gitforwindows.org/)) to a local folder, then start it in a terminal.
 
 
@@ -16,7 +20,7 @@ Run the following script:
 
     <sourcefolder>\build_scripts\Windows-msys2\build.bat
 
-It will install all neccessary tools to build RetrosShare, and build it with the default configuration.
+It will install all necessary tools to build RetrosShare, and build it with the default configuration.
 
 After the script is finished, you can find the resulting .7z package here:
 
@@ -24,7 +28,7 @@ After the script is finished, you can find the resulting .7z package here:
 
 ## Advanced building
 
-You can specifiy extra build options if you use the scripts under:
+You can specify extra build options if you use the scripts under:
 
     <sourcefolder>\build_scripts\Windows-msys2\build\
 
@@ -63,7 +67,7 @@ build-installer.bat 64 release autologin
 ```
 
 ## Troubleshooting
-* Run the command again, sometimes it works the second time, specially if it complains about *restbed* during bulding
+* Run the command again, sometimes it works the second time, specially if it complains about *restbed* during building
 * Delete the build artifacts: *&lt;sourcefolder&gt;-msys2\deploy\builds*
 * Update msys2 manually:
   1. Open the terminal: *&lt;sourcefolder&gt;-msys2\msys2\msys64\msys2.exe*
@@ -73,11 +77,15 @@ build-installer.bat 64 release autologin
   5. Jump to 1. until it doesn't find more updates
 * Start with a clean path environment variable, run *&lt;sourcefolder&gt;\build_scripts\Windows-msys2\start-clean-env.bat*, you will get a terminal with cleaned path
 
+### Errors during MSYS2 update
+MSYS2 developers recently introduced some breaking changes.
+If you get PGP related errors during updating the system from pacman, then follow [their guide](https://www.msys2.org/news/#2020-06-29-new-packagers) to resolve the problems.
+
 ## Updating webui
 
-The sripts don't update the webui source code automatically once it is schecked out.
+The scripts don't update the webui source code automatically once it is checked out.
 You have to do it manually with your favourite git client.
 
-You can find the webui sorce code here:
+You can find the webui source code here:
 
     <sourcefolder>-webui

build_scripts/Windows/build/build.bat

@@ -67,6 +67,14 @@ if exist "%EnvJomExe%" (
 ) else (
 	mingw32-make
 )
+if errorlevel 1 goto error
+
+echo.
+echo === Changelog
+echo.
+
+title Build - %SourceName%-%RsBuildConfig% [changelog]
+call "%ToolsPath%\generate-changelog.bat" "%SourcePath%" "%RsBuildPath%\changelog.txt"
 
 :error
 popd

build_scripts/Windows/build/env.bat

@@ -4,6 +4,7 @@ set ParamDebug=0
 set ParamAutologin=0
 set ParamPlugins=0
 set ParamTor=0
+set NonInteractive=0
 
 :parameter_loop
 if "%~1" NEQ "" (
@@ -18,6 +19,8 @@ if "%~1" NEQ "" (
 			set ParamPlugins=1
 		) else if "%%~a"=="tor" (
 			set ParamTor=1
+		) else if "%%~a"=="non-interactive" (
+			set NonInteractive=1
 		) else (
 			echo.
 			echo Unknown parameter %1
@@ -99,4 +102,7 @@ echo.
 echo Parameter for pack
 echo tor                Pack tor version
 echo.
+echo Parameter for git-log
+echo non-interactive    Non-interactive mode
+echo.
 exit /B 2

build_scripts/Windows/build/git-log.bat

@@ -2,9 +2,6 @@
 
 setlocal
 
-set NoAsk=
-if "%~2"=="no-ask" set NoAsk=1
-
 :: Initialize environment
 call "%~dp0..\env.bat"
 if errorlevel 1 goto error_env
@@ -52,7 +49,7 @@ set RsLastRefFile=%BuildPath%\Qt-%QtVersion%-%GCCArchitecture%%RsType%-%RsBuildC
 set RsLastRef=
 if exist "%RsLastRefFile%" set /P RsLastRef=<"%RsLastRefFile%"
 
-if "%NoAsk%"=="1" goto no_ask_for_last_revision
+if "%NonInteractive%"=="1" goto no_ask_for_last_revision
 if not "%RsLastRef%"=="" echo Last Revision was %RsLastRef%
 set /P RsLastRefInput=Last Revision: 
 if "%RsLastRefInput%" NEQ "" set RsLastRef=%RsLastRefInput%
@@ -70,7 +67,7 @@ echo.
 echo Creating log from %RsLastRef%
 echo                to %RsRef%
 
-if "%NoAsk%"=="1" goto no_confirm
+if "%NonInteractive%"=="1" goto no_confirm
 choice /M "Do you want to proceed?"
 if %errorlevel%==2 exit /B 1
 :no_confirm

build_scripts/Windows/build/pack.bat

@@ -165,8 +165,8 @@ if "%QtMainVersion%"=="5" (
 echo copy bdboot.txt
 copy "%SourcePath%\libbitdht\src\bitdht\bdboot.txt" "%RsDeployPath%" %Quite%
 
-rem echo copy changelog.txt
+echo copy changelog.txt
-rem copy "%SourcePath%\retroshare-gui\src\changelog.txt" "%RsDeployPath%" %Quite%
+copy "%RsBuildPath%\changelog.txt" "%RsDeployPath%" %Quite%
 
 if exist "%SourcePath%\libresapi\src\webui" (
 	echo copy webui

build_scripts/Windows/installer/retroshare-Qt5.nsi

@@ -110,8 +110,8 @@ Var StyleSheetDir
 !define MUI_FINISHPAGE_LINK "Visit the RetroShare forum for the latest news and support"
 !define MUI_FINISHPAGE_LINK_LOCATION "http://retroshare.sourceforge.net/forum/"
 !define MUI_FINISHPAGE_RUN "$INSTDIR\retroshare.exe"
-;!define MUI_FINISHPAGE_SHOWREADME $INSTDIR\changelog.txt
+!define MUI_FINISHPAGE_SHOWREADME $INSTDIR\changelog.txt
-;!define MUI_FINISHPAGE_SHOWREADME_TEXT changelog.txt
+!define MUI_FINISHPAGE_SHOWREADME_TEXT changelog.txt
 ;!define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED
 !define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\orange-uninstall.ico"
 !define MUI_UNFINISHPAGE_NOAUTOCLOSE
@@ -230,7 +230,7 @@ Section $(Section_Main) Section_Main
   !endif
 
   ; Other files
-;  File "${SOURCEDIR}\retroshare-gui\src\changelog.txt"
+  File "${RELEASEDIR}\changelog.txt"
   File "${SOURCEDIR}\libbitdht\src\bitdht\bdboot.txt"
 
   ; License

build_scripts/Windows/tools/generate-changelog.bat

@@ -0,0 +1,50 @@
+@echo off
+setlocal enabledelayedexpansion
+
+if "%~2"=="" (
+	echo.
+	echo Parameter error.
+	echo Usage %~n0 sourcepath outputfile
+	exit /B 1
+)
+
+:: Check git executable
+set GitPath=
+call "%~dp0find-in-path.bat" GitPath git.exe
+if "%GitPath%"=="" echo Git executable not found in PATH.& exit /B 1
+
+set logfile=%~2
+copy nul %logfile% > nul
+
+pushd %~1
+
+set last=HEAD
+for /f %%t in ('git tag --sort=-taggerdate --merged ^| findstr v') do (
+	echo generating changelog for !last!..%%t	
+	echo ----------------------------------------------- >> %logfile%
+	if !last! neq HEAD (
+		git tag -n !last! >> %logfile%
+	) else (
+		echo HEAD >> %logfile%
+	)
+	rem echo !last! ---^> %%t >> %logfile%
+	echo ----------------------------------------------- >> %logfile%
+	echo. >> %logfile%
+	git log %%t..!last! --no-merges "--pretty=format:%%h %%ai %%<(10,trunc)%%an %%s" >> %logfile%
+	echo. >> %logfile%
+	echo. >> %logfile%
+	set last=%%t
+)
+
+echo generating changelog for %last%
+echo ----------------------------------------------- >> %logfile%
+git tag -n %last% >> %logfile%
+echo ----------------------------------------------- >> %logfile%
+echo. >> %logfile%
+git log %last% --no-merges "--pretty=format:%%h %%ai %%<(10,trunc)%%an %%s" >> %logfile%
+
+popd
+
+endlocal enabledelayedexpansion
+
+exit /B 0