mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-08-01 02:36:23 -04:00
Removed version files from retroshare-gui.
Moved header file with version information to retroshare/rsversion.h. Added version information to Windows executable. git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7845 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
4e8cc9d49f
commit
94ec83fcdb
27 changed files with 156 additions and 210 deletions
|
@ -13,7 +13,6 @@ set SourceDir=%~dp0..\..
|
|||
|
||||
:: Optional environment variables
|
||||
::set OutDir=
|
||||
::set Revision=
|
||||
|
||||
:: Build defines for script
|
||||
set NSIS_PARAM=
|
||||
|
@ -23,11 +22,10 @@ if "%ReleaseDir%" NEQ "" set NSIS_PARAM=%NSIS_PARAM% /DRELEASEDIR="%ReleaseDir%"
|
|||
if "%QtDir%" NEQ "" set NSIS_PARAM=%NSIS_PARAM% /DQTDIR="%QtDir%"
|
||||
if "%MinGWDir%" NEQ "" set NSIS_PARAM=%NSIS_PARAM% /DMINGWDIR="%MinGWDir%"
|
||||
if "%OutDir%" NEQ "" set NSIS_PARAM=%NSIS_PARAM% /DOUTDIR="%OutDir%"
|
||||
if "%Revision%" NEQ "" set NSIS_PARAM=%NSIS_PARAM% /DREVISION="%Revision%"
|
||||
|
||||
:: Scan version from source
|
||||
set Version=
|
||||
set VersionFile="%SourceDir%\retroshare-gui\src\util\rsguiversion.h"
|
||||
set BuildAdd=
|
||||
set VersionFile="%SourceDir%\libretroshare\src\retroshare\rsversion.h"
|
||||
|
||||
if not exist "%VersionFile%" (
|
||||
echo.
|
||||
|
@ -36,22 +34,22 @@ if not exist "%VersionFile%" (
|
|||
goto :exit
|
||||
)
|
||||
|
||||
for /F "usebackq tokens=1,2,*" %%A in (%VersionFile%) do (
|
||||
for /F "usebackq tokens=1,2,3" %%A in (%VersionFile%) do (
|
||||
if "%%A"=="#define" (
|
||||
if "%%B"=="GUI_VERSION" (
|
||||
set Version=%%~C
|
||||
if "%%B"=="RS_BUILD_NUMBER_ADD" (
|
||||
set BuildAdd=%%~C
|
||||
)
|
||||
)
|
||||
)
|
||||
|
||||
if "%Version%"=="" (
|
||||
if "%BuildAdd%"=="" (
|
||||
echo.
|
||||
echo Version not found in
|
||||
echo %VersionFile%
|
||||
goto :exit
|
||||
)
|
||||
|
||||
set NSIS_PARAM=%NSIS_PARAM% /DVERSION=%Version%
|
||||
set NSIS_PARAM=%NSIS_PARAM% /DBUILDADD=%BuildAdd%
|
||||
|
||||
:: Create installer
|
||||
"%NSIS_EXE%" %NSIS_PARAM% "%~dp0retroshare.nsi"
|
||||
|
|
|
@ -2,19 +2,18 @@
|
|||
; Reworked by Thunder
|
||||
|
||||
# Needed defines
|
||||
;!define VERSION ""
|
||||
;!define BUILDADD ""
|
||||
;!define SOURCEDIR ""
|
||||
;!define RELEASEDIR ""
|
||||
;!define QTDIR ""
|
||||
;!define MINGWDIR ""
|
||||
|
||||
# Optional defines
|
||||
;!define REVISION ""
|
||||
;!define OUTDIR ""
|
||||
|
||||
# Check needed defines
|
||||
!ifndef VERSION
|
||||
!error "VERSION is not defined"
|
||||
!ifndef BUILDADD
|
||||
!error "BUILDADD is not defined"
|
||||
!endif
|
||||
|
||||
!ifndef SOURCEDIR
|
||||
|
@ -32,13 +31,6 @@
|
|||
!endif
|
||||
|
||||
# Check optional defines
|
||||
!ifdef REVISION
|
||||
!define REVISION_ "${REVISION}_"
|
||||
!else
|
||||
!define REVISION ""
|
||||
!define REVISION_ ""
|
||||
!endif
|
||||
|
||||
!ifdef OUTDIR
|
||||
!define OUTDIR_ "${OUTDIR}\"
|
||||
!else
|
||||
|
@ -46,6 +38,21 @@
|
|||
!define OUTDIR_ ""
|
||||
!endif
|
||||
|
||||
# Get version from executable
|
||||
!GetDllVersion "${RELEASEDIR}\retroshare-gui\src\release\RetroShare.exe" VERSION_
|
||||
|
||||
!define VERSION ${VERSION_1}.${VERSION_2}.${VERSION_3}${BUILDADD}
|
||||
!define REVISION ${VERSION_4}
|
||||
|
||||
# Check version
|
||||
!ifndef REVISION
|
||||
!error "REVISION is not defined"
|
||||
!endif
|
||||
|
||||
!ifndef REVISION
|
||||
!error "REVISION is not defined"
|
||||
!endif
|
||||
|
||||
# Application name and version
|
||||
!define APPNAME "RetroShare"
|
||||
!define APPNAMEANDVERSION "${APPNAME} ${VERSION}"
|
||||
|
@ -61,7 +68,7 @@
|
|||
# Main Install settings
|
||||
Name "${APPNAMEANDVERSION}"
|
||||
InstallDirRegKey HKLM "Software\${APPNAME}" ""
|
||||
OutFile "${OUTDIR_}RetroShare_${VERSION}_${REVISION_}setup.exe"
|
||||
OutFile "${OUTDIR_}RetroShare_${VERSION}_${REVISION}_setup.exe"
|
||||
BrandingText "${APPNAMEANDVERSION}"
|
||||
RequestExecutionlevel highest
|
||||
# Use compression
|
||||
|
@ -120,7 +127,6 @@ Page Custom PortableModePageCreate PortableModePageLeave
|
|||
|
||||
# Set languages (first is default language)
|
||||
!insertmacro MUI_RESERVEFILE_LANGDLL
|
||||
ReserveFile "${NSISDIR}\Plugins\AdvSplash.dll"
|
||||
|
||||
# Installer languages
|
||||
!define MUI_LANGDLL_ALLLANGUAGES
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue