update the windows build bat and the templates

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5516 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax 2012-09-06 01:29:44 +00:00
parent 6d40f6b283
commit 2edc5793bf
4 changed files with 183 additions and 82 deletions

View File

@ -1,11 +1,19 @@
set QTDIR=d:\qt\2010.01 set QTDIR=h:\qt\2010.01
set MINGW=%QTDIR%\mingw set MINGW=%QTDIR%\mingw
set PATH=%QTDIR%\qt\bin;%QTDIR%\bin;%MINGW%\bin;%PATH% set PATH=%QTDIR%\qt\bin;%QTDIR%\bin;%MINGW%\bin;%PATH%
"c:\Program Files\TortoiseSVN\bin\SubWCRev" . libretroshare\src\util\rsversion.in libretroshare\src\util\rsversion.h "c:\Programme\TortoiseSVN\bin\SubWCRev" . libretroshare\src\util\rsversion.in libretroshare\src\util\rsversion.h
"c:\Programme\TortoiseSVN\bin\SubWCRev" . retroshare-gui\src\retroshare.in retroshare-gui\src\retroshare.nsi
@echo off @echo off
rem emptying used variables in case the script was aborted and tempfile
set pack=
set clean=
if exist tmp.txt del tmp.txt
:loop1 :loop1
if %1x == x ( if %1x == x (
rem if not exist tmp.txt echo debug >>tmp.txt rem if not exist tmp.txt echo debug >>tmp.txt
@ -16,19 +24,27 @@ if /i %1==clean (
shift shift
goto :loop1 goto :loop1
) )
if /i %1==pack (
set pack=pack
shift
goto :loop1
)
echo.%1>>tmp.txt echo.%1>>tmp.txt
shift shift
goto :loop1 goto :loop1
:end1 :end1
if not exist tmp.txt (
echo debug >>tmp.txt
set clean=clean
)
if %clean%x==cleanx ( if %clean%x==cleanx (
if not exist tmp.txt echo %clean% >>tmp.txt 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 ( for /f %%a in (tmp.txt) do (
@echo on @echo on
@ -39,6 +55,13 @@ if not %clean%x==x mingw32-make clean
qmake libbitdht.pro qmake libbitdht.pro
mingw32-make %%a mingw32-make %%a
cd ..\..\openpgpsdk\src
if not %clean%x==x mingw32-make clean
qmake openpgpsdk.pro
mingw32-make
cd ..\..\libretroshare\src cd ..\..\libretroshare\src
@ -48,19 +71,19 @@ qmake libretroshare.pro
mingw32-make %%a mingw32-make %%a
cd ..\..\openpgpsdk\src cd ..\..\plugins
if not %clean%x==x mingw32-make clean if not %clean%x==x mingw32-make clean
qmake openpgpsdk.pro qmake plugins.pro
mingw32-make %%a mingw32-make %%a
cd ..\..\retroshare-nogui\src rem cd ..\..\retroshare-nogui\src
if not %clean%x==x mingw32-make clean rem if not %clean%x==x mingw32-make clean
qmake retroshare-nogui.pro rem qmake retroshare-nogui.pro
mingw32-make %%a mingw32-make %%a
@ -73,13 +96,14 @@ qmake retroshare-gui.pro
mingw32-make %%a mingw32-make %%a
cd ..\.. cd ..\..
@echo off
) )
@echo off @echo off
if %pack%x==packx call packaging.bat
rem clean up rem clean up
set clean= set clean=
del tmp.txt del tmp.txt
set pack=
pause pause

View File

@ -9,7 +9,7 @@
#define LIB_VERSION "0.5.3c" #define LIB_VERSION "0.5.3c"
#define SVN_REVISION "Revision $WCREV$" #define SVN_REVISION "Revision $WCREV$"
#define SVN_REVISION_NUMBER "$WCREV$" #define SVN_REVISION_NUMBER $WCREV$
namespace RsUtil { namespace RsUtil {

View File

@ -2,22 +2,23 @@
; Define your application name ; Define your application name
!define APPNAME "RetroShare" !define APPNAME "RetroShare"
!define VERSION "0.5.1 4069" !define VERSION "0.5.3c"
!define APPNAMEANDVERSION "${APPNAME} Portable ${VERSION}" !define REVISION "$WCREV$"
!define QTBASE "D:\qt\2010.01" !define APPNAMEANDVERSION "${APPNAME} ${VERSION} ${REVISION}"
!define QTBASE "H:\qt\2010.01"
; Main Install settings ; Main Install settings
Name "${APPNAMEANDVERSION}" Name "${APPNAMEANDVERSION}"
InstallDir "$PROGRAMFILES\RetroShare" InstallDir "$PROGRAMFILES\RetroShare"
InstallDirRegKey HKLM "Software\${APPNAME}" "" InstallDirRegKey HKLM "Software\${APPNAME}" ""
OutFile "RetroSharePortable_${VERSION}_setup.exe" OutFile "RetroShare_${VERSION}_${REVISION}_setup.exe"
BrandingText "${APPNAMEANDVERSION}" BrandingText "${APPNAMEANDVERSION}"
; Use compression ; Use compression
SetCompressor /SOLID LZMA SetCompressor /SOLID LZMA
; Modern interface settings ; Modern interface settings
!include Sections.nsh !include Sections.nsh
!include "UMUI.nsh" !include "MUI.nsh"
;Interface Settings ;Interface Settings
!define MUI_ABORTWARNING !define MUI_ABORTWARNING
@ -25,21 +26,21 @@ SetCompressor /SOLID LZMA
;!define MUI_HEADERIMAGE_BITMAP "retroshare.bmp" ; optional ;!define MUI_HEADERIMAGE_BITMAP "retroshare.bmp" ; optional
# MUI defines # MUI defines
!define MUI_ICON "${NSISDIR}\Contrib\Graphics\UltraModernUI\Icon.ico" !define MUI_ICON "${NSISDIR}\Contrib\Graphics\Icons\orange-install.ico"
!define MUI_FINISHPAGE_NOAUTOCLOSE !define MUI_FINISHPAGE_NOAUTOCLOSE
!define MUI_LICENSEPAGE_RADIOBUTTONS !define MUI_LICENSEPAGE_RADIOBUTTONS
!define MUI_COMPONENTSPAGE_SMALLDESC !define MUI_COMPONENTSPAGE_SMALLDESC
!define MUI_FINISHPAGE_LINK "Visit the RetroShare forum for the latest news and support" !define MUI_FINISHPAGE_LINK "$(FINISHPAGELINK)"
!define MUI_FINISHPAGE_LINK_LOCATION "http://retroshare.sourceforge.net/forum/" !define MUI_FINISHPAGE_LINK_LOCATION "http://retroshare.sourceforge.net/forum/"
!define MUI_FINISHPAGE_RUN "$INSTDIR\RetroShare.exe" !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_FINISHPAGE_SHOWREADME_NOTCHECKED
!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\UltraModernUI\UnIcon.ico" !define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\orange-uninstall.ico"
!define MUI_UNFINISHPAGE_NOAUTOCLOSE !define MUI_UNFINISHPAGE_NOAUTOCLOSE
!define MUI_LANGDLL_REGISTRY_ROOT HKLM !define MUI_LANGDLL_REGISTRY_ROOT HKLM
!define MUI_LANGDLL_REGISTRY_KEY ${REGKEY} !define MUI_LANGDLL_REGISTRY_KEY ${REGKEY}
!define UMUI_LANGDLL_REGISTRY_VALUENAME InstallerLanguage !define MUI_LANGDLL_REGISTRY_VALUENAME InstallerLanguage
;!define MUI_WELCOMEPAGE_TEXT "This wizard will guide you through the installation of RetroShare. \r\n\r\nIt is recommended that you close all other applications before starting Setup. This will make it possible to update relevant system files without havinf to reboot your computer. \r\n\r\nIMPORTANT: Ensure that RetroShare is NOT RUNNING before continuing (you can exit from the taskbar menu), otherwise the installer cannot update the executables, and the installation will fail. \r\n\r\nClick Next to continue. " ;!define MUI_WELCOMEPAGE_TEXT "This wizard will guide you through the installation of RetroShare. \r\n\r\nIt is recommended that you close all other applications before starting Setup. This will make it possible to update relevant system files without havinf to reboot your computer. \r\n\r\nIMPORTANT: Ensure that RetroShare is NOT RUNNING before continuing (you can exit from the taskbar menu), otherwise the installer cannot update the executables, and the installation will fail. \r\n\r\nClick Next to continue. "
@ -61,16 +62,20 @@ ReserveFile "${NSISDIR}\Plugins\AdvSplash.dll"
;!insertmacro MUI_RESERVEFILE_SPECIALBITMAP ;!insertmacro MUI_RESERVEFILE_SPECIALBITMAP
LicenseLangString myLicenseData 1030 "license\license.txt" LicenseLangString myLicenseData 1030 "license\license.txt"
LicenseLangString myLicenseData 1033 "license\license.txt"
LicenseLangString myLicenseData 1031 "license\license-GER.txt" LicenseLangString myLicenseData 1031 "license\license-GER.txt"
LicenseLangString myLicenseData 1032 "license\license-GR.txt"
LicenseLangString myLicenseData 1033 "license\license.txt"
LicenseLangString myLicenseData 1034 "license\license-SP.txt"
LicenseLangString myLicenseData 1036 "license\license-FR.txt" LicenseLangString myLicenseData 1036 "license\license-FR.txt"
LicenseLangString myLicenseData 1055 "license\license-TR.txt" LicenseLangString myLicenseData 1040 "license\license-IT.txt"
LicenseLangString myLicenseData 2052 "license\license.txt"
LicenseLangString myLicenseData 1045 "license\license.txt"
LicenseLangString myLicenseData 1041 "license\license.txt" LicenseLangString myLicenseData 1041 "license\license.txt"
LicenseLangString myLicenseData 1042 "license\license.txt" LicenseLangString myLicenseData 1042 "license\license.txt"
LicenseLangString myLicenseData 1045 "license\license.txt"
LicenseLangString myLicenseData 1046 "license\license-PT_BR.txt"
LicenseLangString myLicenseData 1049 "license\license.txt" LicenseLangString myLicenseData 1049 "license\license.txt"
LicenseLangString myLicenseData 1053 "license\license.txt" LicenseLangString myLicenseData 1053 "license\license.txt"
LicenseLangString myLicenseData 1055 "license\license-TR.txt"
LicenseLangString myLicenseData 2052 "license\license.txt"
LicenseData $(myLicenseData) LicenseData $(myLicenseData)
@ -87,20 +92,23 @@ ReserveFile "${NSISDIR}\Plugins\AdvSplash.dll"
# Installer languages # Installer languages
!define MUI_LANGDLL_ALLLANGUAGES !define MUI_LANGDLL_ALLLANGUAGES
!insertmacro MUI_LANGUAGE Danish
!insertmacro MUI_LANGUAGE English !insertmacro MUI_LANGUAGE English
!insertmacro MUI_LANGUAGE Danish
!insertmacro MUI_LANGUAGE French !insertmacro MUI_LANGUAGE French
!insertmacro MUI_LANGUAGE German !insertmacro MUI_LANGUAGE German
!insertmacro MUI_LANGUAGE Greek
!insertmacro MUI_LANGUAGE Italian
!insertmacro MUI_LANGUAGE Japanese !insertmacro MUI_LANGUAGE Japanese
!insertmacro MUI_LANGUAGE Korean !insertmacro MUI_LANGUAGE Korean
!insertmacro MUI_LANGUAGE Polish !insertmacro MUI_LANGUAGE Polish
!insertmacro MUI_LANGUAGE PortugueseBR
!insertmacro MUI_LANGUAGE Russian !insertmacro MUI_LANGUAGE Russian
!insertmacro MUI_LANGUAGE Swedish !insertmacro MUI_LANGUAGE Swedish
!insertmacro MUI_LANGUAGE SimpChinese !insertmacro MUI_LANGUAGE SimpChinese
!insertmacro MUI_LANGUAGE Spanish
!insertmacro MUI_LANGUAGE Turkish !insertmacro MUI_LANGUAGE Turkish
;Component-selection page ;Component-selection page
;Titles ;Titles
@ -115,30 +123,28 @@ ReserveFile "${NSISDIR}\Plugins\AdvSplash.dll"
LangString DESC_sec_link ${LANG_ENGLISH} "Associate RetroShare with .rsc file extension" LangString DESC_sec_link ${LANG_ENGLISH} "Associate RetroShare with .rsc file extension"
LangString LANGUAGEID ${LANG_ENGLISH} "1033" LangString LANGUAGEID ${LANG_ENGLISH} "1033"
LangString sec_main ${LANG_FRENCH} "RetroShare" LangString sec_main ${LANG_FRENCH} "RetroShare"
LangString sec_data ${LANG_FRENCH} "Programme de Skins" LangString sec_data ${LANG_FRENCH} "Programme de Skins"
LangString sec_shortcuts ${LANG_FRENCH} "Raccourcis" LangString sec_shortcuts ${LANG_FRENCH} "Raccourcis"
LangString sec_link ${LANG_FRENCH} "RetroShare fichiers Association" LangString sec_link ${LANG_FRENCH} "Association de fichiers"
LangString sec_startmenu ${LANG_FRENCH} "Raccourcis du menu Démarrer" LangString sec_startmenu ${LANG_FRENCH} "Raccourcis du menu Démarrer"
LangString sec_autostart ${LANG_FRENCH} "Démarrage automatique" LangString sec_autostart ${LANG_FRENCH} "Démarrage automatique"
LangString DESC_sec_main ${LANG_FRENCH} "Installe les fichiers du programme." LangString DESC_sec_main ${LANG_FRENCH} "Installation des fichiers du programme."
LangString DESC_sec_data ${LANG_FRENCH} "Installe RetroShare Skins" LangString DESC_sec_data ${LANG_FRENCH} "Installation des Skins de RetroShare"
LangString DESC_sec_startmenu ${LANG_FRENCH} "Crée les raccourcis du menu Démarrer" LangString DESC_sec_startmenu ${LANG_FRENCH} "Création des raccourcis du menu Démarrer"
LangString DESC_sec_shortcuts ${LANG_FRENCH} "Crée une icône sur le bureau." LangString DESC_sec_shortcuts ${LANG_FRENCH} "Création de l'icône sur le bureau."
LangString DESC_sec_link ${LANG_FRENCH} "Associate RetroShare with .rsc file extension" LangString DESC_sec_link ${LANG_FRENCH} "Associer RetroShare avec l'extension de fichier .rsc"
LangString LANGUAGEID ${LANG_FRENCH} "1036" LangString LANGUAGEID ${LANG_FRENCH} "1036"
LangString sec_main ${LANG_GERMAN} "Programme"
LangString sec_main ${LANG_GERMAN} "Programmdateien" LangString sec_data ${LANG_GERMAN} "Programm Skins"
LangString sec_data ${LANG_GERMAN} "Skins fuer das Programm" LangString sec_shortcuts ${LANG_GERMAN} "Verknüpfungen"
LangString sec_shortcuts ${LANG_GERMAN} "Shortcuts" LangString sec_link ${LANG_GERMAN} "Dateiverknüpfungen"
LangString sec_link ${LANG_GERMAN} "Dateiverknuepfungen" LangString sec_autostart ${LANG_GERMAN} "Autostart"
LangString sec_autostart ${LANG_GERMAN} "Auto Startup" LangString DESC_sec_main ${LANG_GERMAN} "Installiert die RetroShare Programmdateien."
LangString DESC_sec_main ${LANG_GERMAN} "Installiert die erforderlichen Programmdateien."
LangString DESC_sec_data ${LANG_GERMAN} "Installiert RetroShare Skins" LangString DESC_sec_data ${LANG_GERMAN} "Installiert RetroShare Skins"
LangString DESC_sec_shortcuts ${LANG_GERMAN} "Erstellt eine RetroShare Verkn<6B>pfung im Startmen<65>, Desktop oder im Schnellstarter." LangString DESC_sec_shortcuts ${LANG_GERMAN} "RetroShare Verknüpfung im Startmenü, Desktop oder im Schnellstarter erstellen."
LangString DESC_sec_link ${LANG_GERMAN} "RetroShare mit .rsc Dateien verkn<6B>pfen" LangString DESC_sec_link ${LANG_GERMAN} "RetroShare mit .rsc Dateiendung verknüpfen"
LangString LANGUAGEID ${LANG_GERMAN} "1031" LangString LANGUAGEID ${LANG_GERMAN} "1031"
LangString sec_main ${LANG_TURKISH} "Program Dosyalar<61>" LangString sec_main ${LANG_TURKISH} "Program Dosyalar<61>"
@ -160,7 +166,7 @@ ReserveFile "${NSISDIR}\Plugins\AdvSplash.dll"
LangString DESC_sec_main ${LANG_SIMPCHINESE} "安装RetroShare程序" LangString DESC_sec_main ${LANG_SIMPCHINESE} "安装RetroShare程序"
LangString DESC_sec_data ${LANG_SIMPCHINESE} "安装RetroShare皮肤" LangString DESC_sec_data ${LANG_SIMPCHINESE} "安装RetroShare皮肤"
LangString DESC_sec_shortcuts ${LANG_SIMPCHINESE} "建RetroShare快捷方式" LangString DESC_sec_shortcuts ${LANG_SIMPCHINESE} "建RetroShare快捷方式"
LangString DESC_sec_link ${LANG_SIMPCHINESE} "关联.rsc扩" LangString DESC_sec_link ${LANG_SIMPCHINESE} "关联.rsc扩展名"
LangString LANGUAGEID ${LANG_SIMPCHINESE} "2052" LangString LANGUAGEID ${LANG_SIMPCHINESE} "2052"
LangString sec_main ${LANG_POLISH} "Pliki programu" LangString sec_main ${LANG_POLISH} "Pliki programu"
@ -207,6 +213,50 @@ ReserveFile "${NSISDIR}\Plugins\AdvSplash.dll"
LangString DESC_sec_link ${LANG_SWEDISH} "Associate RetroShare with .rsc file extension" LangString DESC_sec_link ${LANG_SWEDISH} "Associate RetroShare with .rsc file extension"
LangString LANGUAGEID ${LANG_SWEDISH} "1053" LangString LANGUAGEID ${LANG_SWEDISH} "1053"
LangString sec_main ${LANG_SPANISH} "Archivos de programa"
LangString sec_data ${LANG_SPANISH} "Estilos del programa"
LangString sec_shortcuts ${LANG_SPANISH} "Accesos directos"
LangString sec_link ${LANG_SPANISH} "Asociación de archivos"
LangString sec_autostart ${LANG_SPANISH} "Inicio automático"
LangString DESC_sec_main ${LANG_SPANISH} "Instala los archivos del programa RetroShare."
LangString DESC_sec_data ${LANG_SPANISH} "Instala los estilos para RetroShare"
LangString DESC_sec_shortcuts ${LANG_SPANISH} "Crear iconos de acceso directo de RetroShare."
LangString DESC_sec_link ${LANG_SPANISH} "Asociar RetroShare con la extensión de archivo .rsc"
LangString LANGUAGEID ${LANG_SPANISH} "1034"
LangString sec_main ${LANG_ITALIAN} "Programmi"
LangString sec_data ${LANG_ITALIAN} "Temi del Programma"
LangString sec_shortcuts ${LANG_ITALIAN} "Icone"
LangString sec_link ${LANG_ITALIAN} "Associazione dei File"
LangString sec_autostart ${LANG_ITALIAN} "Esecuzione Automatica"
LangString DESC_sec_main ${LANG_ITALIAN} "Installare i file programma di RetroShare."
LangString DESC_sec_data ${LANG_ITALIANH} "Installare i temi di RetroShare"
LangString DESC_sec_shortcuts ${LANG_ITALIAN} "Creare le icone per avviare RetroShare."
LangString DESC_sec_link ${LANG_ITALIAN} "Associa a RetroShare i file con estensione .rsc"
LangString LANGUAGEID ${LANG_ITALIAN} "1040"
LangString sec_main ${LANG_GREEK} "Program Files"
LangString sec_data ${LANG_GREEK} "Program Skins"
LangString sec_shortcuts ${LANG_GREEK} "Shortcuts"
LangString sec_link ${LANG_GREEK} "File Association"
LangString sec_autostart ${LANG_GREEK} "Auto Startup"
LangString DESC_sec_main ${LANG_GREEK} "Installs the RetroShare program files."
LangString DESC_sec_data ${LANG_GREEK} "Installs RetroShare Skins"
LangString DESC_sec_shortcuts ${LANG_GREEK} "Create RetroShare shortcut icons."
LangString DESC_sec_link ${LANG_GREEK} "Associate RetroShare with .rsc file extension"
LangString LANGUAGEID ${LANG_GREEK} "1032"
LangString sec_main ${LANG_PORTUGUESEBR} "Program Files"
LangString sec_data ${LANG_PORTUGUESEBR} "Program Skins"
LangString sec_shortcuts ${LANG_PORTUGUESEBR} "Shortcuts"
LangString sec_link ${LANG_PORTUGUESEBR} "File Association"
LangString sec_autostart ${LANG_PORTUGUESEBR} "Auto Startup"
LangString DESC_sec_main ${LANG_PORTUGUESEBR} "Installs the RetroShare program files."
LangString DESC_sec_data ${LANG_PORTUGUESEBR} "Installs RetroShare Skins"
LangString DESC_sec_shortcuts ${LANG_PORTUGUESEBR} "Create RetroShare shortcut icons."
LangString DESC_sec_link ${LANG_PORTUGUESEBR} "Associate RetroShare with .rsc file extension"
LangString LANGUAGEID ${LANG_PORTUGUESEBR} "1046"
LangString sec_main ${LANG_JAPANESE} "Program Files" LangString sec_main ${LANG_JAPANESE} "Program Files"
LangString sec_data ${LANG_JAPANESE} "Program Skins" LangString sec_data ${LANG_JAPANESE} "Program Skins"
LangString sec_shortcuts ${LANG_JAPANESE} "Shortcuts" LangString sec_shortcuts ${LANG_JAPANESE} "Shortcuts"
@ -247,21 +297,17 @@ Section $(sec_main) sec_main
SetOutPath "$INSTDIR\" SetOutPath "$INSTDIR\"
File /r "release\RetroShare.exe" File /r "release\RetroShare.exe"
File /r "..\..\retroshare-nogui\src\release\retroshare-nogui.exe" File /r "..\..\retroshare-nogui\src\release\retroshare-nogui.exe"
File /r "D:\Qt\2010.01\mingw\bin\mingwm10.dll" File /r "${QTBASE}\mingw\bin\mingwm10.dll"
File /r "D:\Qt\2010.01\qt\bin\QtCore4.dll" File /r "${QTBASE}\qt\bin\QtCore4.dll"
File /r "D:\Qt\2010.01\qt\bin\QtGui4.dll" File /r "${QTBASE}\qt\bin\QtGui4.dll"
File /r "D:\Qt\2010.01\qt\bin\QtNetwork4.dll" File /r "${QTBASE}\qt\bin\QtNetwork4.dll"
File /r "D:\Qt\2010.01\qt\bin\QtXml4.dll" File /r "${QTBASE}\qt\bin\QtXml4.dll"
File /r "D:\Qt\2010.01\qt\bin\QtScript4.dll" File /r "${QTBASE}\qt\bin\QtScript4.dll"
File /r "D:\Qt\2010.01\qt\bin\libgcc_s_dw2-1.dll" File /r "${QTBASE}\qt\bin\libgcc_s_dw2-1.dll"
File /r "D:\Qt\2010.01\qt\plugins\imageformats" File /r "${QTBASE}\qt\plugins\imageformats"
File /r "D:\Development\miniupnpc-1.3\miniupnpc.dll"
File /r ${QTBASE}\qt\qt_*.qm File /r ${QTBASE}\qt\qt_*.qm
File /r "release\pthreadGC2d.dll" File /r "release\pthreadGC2d.dll"
File /r "release\libgpg-error-0.dll" File /r "H:\Development\lib\libminiupnpc-1.3\miniupnpc.dll"
File /r "release\libgpgme-11.dll"
File /r "release\gpg.exe"
File /r "release\gpgme-w32spawn.exe"
File /r "changelog.txt" File /r "changelog.txt"
File /r /x Data "release\bdboot.txt" File /r /x Data "release\bdboot.txt"
@ -274,11 +320,11 @@ Section $(sec_data) sec_data
SetOverwrite on SetOverwrite on
; Set Section Files and Shortcuts ; Set Section Files and Shortcuts
;SetOutPath "$APPDATA\RetroShare\" SetOutPath "$APPDATA\RetroShare\"
;File /r "data\*" ;File /r "data\*"
; Set Section Plugins ; Set Section Plugins
;SetOutPath "$APPDATA\RetroShare\plugins\" SetOutPath "$APPDATA\RetroShare\plugins\"
;File /r "plugins\" ;File /r "plugins\"
; Set Section qss and exclude svn ; Set Section qss and exclude svn
@ -298,8 +344,8 @@ Section $(sec_data) sec_data
;File /r emoticons\*.* ;File /r emoticons\*.*
; Add Chat Style ; Add Chat Style
;SetOutPath "$INSTDIR\style\" SetOutPath "$APPDATA\RetroShare\stylesheets\"
;File /r style\*.* File /r gui\qss\chat\bubble
SectionEnd SectionEnd
@ -391,9 +437,6 @@ Section "Uninstall"
; Remove files and uninstaller ; Remove files and uninstaller
Delete $INSTDIR\RetroShare.exe Delete $INSTDIR\RetroShare.exe
Delete $INSTDIR\retroshare-nogui.exe
Delete $INSTDIR\gpg.exe
Delete $INSTDIR\gpgme-w32spawn.exe
Delete $INSTDIR\*.dll Delete $INSTDIR\*.dll
Delete $INSTDIR\*.dat Delete $INSTDIR\*.dat
Delete $INSTDIR\*.txt Delete $INSTDIR\*.txt
@ -402,9 +445,19 @@ Section "Uninstall"
Delete $INSTDIR\uninstall.exe Delete $INSTDIR\uninstall.exe
; Remove the kadc.ini file.
; Don't remove the directory, otherwise ; Don't remove the directory, otherwise
; we lose the XPGP keys. ; we lose the XPGP keys.
; Should make this an option though... ; Should make this an option though...
Delete "$APPDATA\${APPNAME}\kadc.ini"
Delete "$APPDATA\${APPNAME}\*.cfg"
Delete "$APPDATA\${APPNAME}\*.conf"
Delete "$APPDATA\${APPNAME}\*.log-save"
Delete "$APPDATA\${APPNAME}\*.log"
Delete "$APPDATA\${APPNAME}\*.failed"
RMDir /r "$APPDATA\${APPNAME}\cache"
RMDir /r "$APPDATA\${APPNAME}\Partials"
; Remove shortcuts, if any ; Remove shortcuts, if any
Delete "$SMPROGRAMS\${APPNAME}\*.*" Delete "$SMPROGRAMS\${APPNAME}\*.*"
@ -420,10 +473,11 @@ Section "Uninstall"
; Remove directories used ; Remove directories used
RMDir "$SMPROGRAMS\${APPNAME}" RMDir "$SMPROGRAMS\${APPNAME}"
RMDir /r "$INSTDIR"
RMDir /r "$INSTDIR\qss" RMDir /r "$INSTDIR\qss"
RMDir /r "$INSTDIR\emoticons"
RMDir /r "$INSTDIR\style"
RMDir /r "$INSTDIR\translations" RMDir /r "$INSTDIR\translations"
RMDir /r "$INSTDIR\imageformats"
RMDir /r "$INSTDIR\sounds"
SectionEnd SectionEnd
@ -445,9 +499,25 @@ FunctionEnd
# Installer Language Strings # Installer Language Strings
# TODO Update the Language Strings with the appropriate translations. # TODO Update the Language Strings with the appropriate translations.
LangString InstallGPG4WIN ${LANG_ENGLISH} "Install Gpg4win ? Gpg4win is required for RetroShare!"
LangString InstallGPG4WIN ${LANG_GERMAN} "Gpg4win installieren? Gpg4win wird für RetroShare benötigt!"
LangString InstallGPG4WIN ${LANG_TURKISH} "Gpg4win Yükle? Gpg4win RetroShare için gerekli!"
LangString InstallGPG4WIN ${LANG_FRENCH} "RetroShare a besoin de GPG4win pour fonctionner. Lancer l'installation de GPG4win?"
LangString InstallGPG4WIN ${LANG_SIMPCHINESE} "Install Gpg4win ? Gpg4win是需要Retroshare!"
LangString InstallGPG4WIN ${LANG_POLISH} "Install Gpg4win ? Gpg4win wymagane jest Retroshare!"
LangString InstallGPG4WIN ${LANG_DANISH} "Installer Gpg4win? Gpg4win er nødvendig for RetroShare!"
LangString InstallGPG4WIN ${LANG_JAPANESE} "Install Gpg4win ? Gpg4win is required for RetroShare!"
LangString InstallGPG4WIN ${LANG_KOREAN} "Install Gpg4win ? Gpg4win is required for RetroShare!"
LangString InstallGPG4WIN ${LANG_RUSSIAN} "Install Gpg4win ? Gpg4win is required for RetroShare!"
LangString InstallGPG4WIN ${LANG_SWEDISH} "Installera Gpg4win? Gpg4win krävs för RetroShare!"
LangString InstallGPG4WIN ${LANG_SPANISH} "Install Gpg4win ? Gpg4win is required for RetroShare!"
LangString InstallGPG4WIN ${LANG_ITALIAN} "Installare Gpg4win? Gpg4win è richiesto per RetroShare!"
LangString InstallGPG4WIN ${LANG_GREEK} "Install Gpg4win ? Gpg4win is required for RetroShare!"
LangString InstallGPG4WIN ${LANG_PORTUGUESEBR} "Install Gpg4win ? Gpg4win is required for RetroShare!"
LangString FINISHPAGELINK ${LANG_ENGLISH} "Visit the RetroShare forums for the latest news and support" LangString FINISHPAGELINK ${LANG_ENGLISH} "Visit the RetroShare forums for the latest news and support"
LangString FINISHPAGELINK ${LANG_GERMAN} "Besuche RetroShare Support Forum " LangString FINISHPAGELINK ${LANG_GERMAN} "Das RetroShare Support-Forum besuchen, um Neuigkeiten und Unterstützung zu erfahren"
LangString FINISHPAGELINK ${LANG_TURKISH} "Destek için Retroshare foruma ziyaret" LangString FINISHPAGELINK ${LANG_TURKISH} "Destek için Retroshare foruma ziyaret et"
LangString FINISHPAGELINK ${LANG_FRENCH} "Consultez le forum RetroShare pour vous tenir au courant des dernieres modifications, et obtenir de l'aide." LangString FINISHPAGELINK ${LANG_FRENCH} "Consultez le forum RetroShare pour vous tenir au courant des dernieres modifications, et obtenir de l'aide."
LangString FINISHPAGELINK ${LANG_SIMPCHINESE} "帮助论坛" LangString FINISHPAGELINK ${LANG_SIMPCHINESE} "帮助论坛"
LangString FINISHPAGELINK ${LANG_POLISH} "Odwiedź forum RetroShare do najświeższych informacji i wsparcia" LangString FINISHPAGELINK ${LANG_POLISH} "Odwiedź forum RetroShare do najświeższych informacji i wsparcia"
@ -456,6 +526,10 @@ LangString FINISHPAGELINK ${LANG_JAPANESE} "Visit the RetroShare forums for t
LangString FINISHPAGELINK ${LANG_KOREAN} "Visit the RetroShare forums for the latest news and support" LangString FINISHPAGELINK ${LANG_KOREAN} "Visit the RetroShare forums for the latest news and support"
LangString FINISHPAGELINK ${LANG_RUSSIAN} "Visit the RetroShare forums for the latest news and support" LangString FINISHPAGELINK ${LANG_RUSSIAN} "Visit the RetroShare forums for the latest news and support"
LangString FINISHPAGELINK ${LANG_SWEDISH} "Besök RetroShare forum för de senaste nyheterna och stöd" LangString FINISHPAGELINK ${LANG_SWEDISH} "Besök RetroShare forum för de senaste nyheterna och stöd"
LangString FINISHPAGELINK ${LANG_SPANISH} "Visite los foros de RetroShare para las últimas noticias y soporte"
LangString FINISHPAGELINK ${LANG_ITALIAN} "Visita i forum di RetroShare per le ultime novità ed il supporto"
LangString FINISHPAGELINK ${LANG_GREEK} "Visit the RetroShare forums for the latest news and support"
LangString FINISHPAGELINK ${LANG_PORTUGUESEBR} "Visit the RetroShare forums for the latest news and support"
LangString ^UninstallLink ${LANG_ENGLISH} "Uninstall" LangString ^UninstallLink ${LANG_ENGLISH} "Uninstall"
LangString ^UninstallLink ${LANG_GERMAN} "Deinstallieren" LangString ^UninstallLink ${LANG_GERMAN} "Deinstallieren"
@ -468,6 +542,9 @@ LangString ^UninstallLink ${LANG_JAPANESE} "Uninstall"
LangString ^UninstallLink ${LANG_KOREAN} "Uninstall" LangString ^UninstallLink ${LANG_KOREAN} "Uninstall"
LangString ^UninstallLink ${LANG_RUSSIAN} "Uninstall" LangString ^UninstallLink ${LANG_RUSSIAN} "Uninstall"
LangString ^UninstallLink ${LANG_SWEDISH} "Avinstallera" LangString ^UninstallLink ${LANG_SWEDISH} "Avinstallera"
LangString ^UninstallLink ${LANG_SPANISH} "Desinstalar"
LangString ^UninstallLink ${LANG_ITALIAN} "Disinstallare"
LangString ^UninstallLink ${LANG_GREEK} "Απεγκατάσταση"
LangString ^UninstallLink ${LANG_PORTUGUESEBR} "Desinstalar"
; eof ; eof

View File

@ -3,7 +3,7 @@
; Define your application name ; Define your application name
!define APPNAME "RetroShare" !define APPNAME "RetroShare"
!define VERSION "0.5.3c" !define VERSION "0.5.3c"
!define REVISION "$WCREV$" !define REVISION "5515"
!define APPNAMEANDVERSION "${APPNAME} ${VERSION} ${REVISION}" !define APPNAMEANDVERSION "${APPNAME} ${VERSION} ${REVISION}"
!define QTBASE "H:\qt\2010.01" !define QTBASE "H:\qt\2010.01"