From 9db2fe7d081fe988b66e3132dc6d50778f3b0a96 Mon Sep 17 00:00:00 2001
From: thunder2 <thunder2@users.sourceforge.net>
Date: Mon, 4 Feb 2019 19:07:20 +0100
Subject: [PATCH] Modified Windows build scripts - Deactivated build of plugins
 - Deactivated changelog - Pack license

---
 build_scripts/Windows/build-tor.bat           | 27 -------------------
 build_scripts/Windows/build.bat               |  3 ++-
 build_scripts/Windows/build/pack.bat          |  8 ++++--
 .../Windows/installer/retroshare-Qt5.nsi      |  8 +++---
 4 files changed, 12 insertions(+), 34 deletions(-)
 delete mode 100644 build_scripts/Windows/build-tor.bat

diff --git a/build_scripts/Windows/build-tor.bat b/build_scripts/Windows/build-tor.bat
deleted file mode 100644
index a82e63f16..000000000
--- a/build_scripts/Windows/build-tor.bat
+++ /dev/null
@@ -1,27 +0,0 @@
-@echo off
-
-setlocal
-
-:: Initialize environment
-call "%~dp0env.bat"
-if errorlevel 1 goto error_env
-call "%EnvPath%\env.bat"
-if errorlevel 1 goto error_env
-
-%cecho% info "Build libraries"
-call "%~dp0build-libs\build-libs.bat"
-if errorlevel 1 %cecho% error "Failed to build libraries." & exit /B %ERRORLEVEL%
-
-%cecho% info "Build %SourceName%"
-call "%~dp0build\build.bat" release tor autologin plugins
-if errorlevel 1 %cecho% error "Failed to build %SourceName%." & exit /B %ERRORLEVEL%
-
-%cecho% info "Pack %SourceName%"
-call "%~dp0build\pack.bat" release tor
-if errorlevel 1 %cecho% error "Failed to pack %SourceName%." & exit /B %ERRORLEVEL%
-
-exit /B 0
-
-:error_env
-echo Failed to initialize environment.
-exit /B 1
diff --git a/build_scripts/Windows/build.bat b/build_scripts/Windows/build.bat
index c91c64753..4f491d907 100644
--- a/build_scripts/Windows/build.bat
+++ b/build_scripts/Windows/build.bat
@@ -13,7 +13,8 @@ call "%~dp0build-libs\build-libs.bat"
 if errorlevel 1 %cecho% error "Failed to build libraries." & exit /B %ERRORLEVEL%
 
 %cecho% info "Build %SourceName%"
-call "%~dp0build\build.bat" release autologin plugins
+call "%~dp0build\build.bat" release autologin
+rem plugins
 if errorlevel 1 %cecho% error "Failed to build %SourceName%." & exit /B %ERRORLEVEL%
 
 %cecho% info "Pack %SourceName%"
diff --git a/build_scripts/Windows/build/pack.bat b/build_scripts/Windows/build/pack.bat
index d97f3ea22..ec1ca042e 100644
--- a/build_scripts/Windows/build/pack.bat
+++ b/build_scripts/Windows/build/pack.bat
@@ -98,6 +98,7 @@ mkdir "%RsDeployPath%\qss"
 mkdir "%RsDeployPath%\stylesheets"
 mkdir "%RsDeployPath%\sounds"
 mkdir "%RsDeployPath%\translations"
+mkdir "%RsDeployPath%\license"
 
 copy nul "%RsDeployPath%\portable" %Quite%
 
@@ -148,6 +149,9 @@ rmdir /S /Q "%RsDeployPath%\stylesheets\__MACOSX__Bubble" %Quite%
 echo copy sounds
 xcopy /S "%SourcePath%\retroshare-gui\src\sounds" "%RsDeployPath%\sounds" %Quite%
 
+echo copy license
+xcopy /S "%SourcePath%\retroshare-gui\src\license" "%RsDeployPath%\license" %Quite%
+
 echo copy translation
 copy "%SourcePath%\retroshare-gui\src\translations\qt_tr.qm" "%RsDeployPath%\translations" %Quite%
 copy "%QtPath%\..\translations\qt_*.qm" "%RsDeployPath%\translations" %Quite%
@@ -162,8 +166,8 @@ if "%QtMainVersion%"=="5" (
 echo copy bdboot.txt
 copy "%SourcePath%\libbitdht\src\bitdht\bdboot.txt" "%RsDeployPath%" %Quite%
 
-echo copy changelog.txt
-copy "%SourcePath%\retroshare-gui\src\changelog.txt" "%RsDeployPath%" %Quite%
+rem echo copy changelog.txt
+rem copy "%SourcePath%\retroshare-gui\src\changelog.txt" "%RsDeployPath%" %Quite%
 
 if exist "%SourcePath%\libresapi\src\webui" (
 	echo copy webui
diff --git a/build_scripts/Windows/installer/retroshare-Qt5.nsi b/build_scripts/Windows/installer/retroshare-Qt5.nsi
index 99a3c7804..f3a319351 100644
--- a/build_scripts/Windows/installer/retroshare-Qt5.nsi
+++ b/build_scripts/Windows/installer/retroshare-Qt5.nsi
@@ -102,9 +102,9 @@ 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_TEXT changelog.txt
-!define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED
+;!define MUI_FINISHPAGE_SHOWREADME $INSTDIR\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
 ;!define MUI_LANGDLL_REGISTRY_ROOT HKLM
@@ -211,7 +211,7 @@ Section $(Section_Main) Section_Main
   File "${EXTERNAL_LIB_DIR}\bin\ssleay32.dll"
 
   ; Other files
-  File "${SOURCEDIR}\retroshare-gui\src\changelog.txt"
+;  File "${SOURCEDIR}\retroshare-gui\src\changelog.txt"
   File "${SOURCEDIR}\libbitdht\src\bitdht\bdboot.txt"
 
   ; Image formats