Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-09-22 22:04:53 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

* Rolled back Modifications to SearchDialog and PopupChatDialog.

Browse source 
- unable to get windows to compile with PopupChat on windows.
	- not happy with new SearchDialog. Not an improvement on old dialog + uses Qt4.4

 * updated version numbers...
 * added a couple of windows scripts.
 


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1200 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2009-05-08 23:07:08 +00:00
parent 705a51ac1f
commit 65e02ba4de
13 changed files with 779 additions and 676 deletions
Download patch file Download diff file Expand all files Collapse all files

46
build_scripts/Windows/make_installer.sh Executable file
View file

@ -0,0 +1,46 @@
#!/bin/sh
###
#
#
#
QTGUI_DIR=../devel/retroshare-package-v0.4.09b/src/svn-retroshare/retroshare-gui/src
INST_DIR=../devel/retroshare-package-v0.4.09b/src/svn-retroshare/build_scripts/Windows/
EXEC=release/Retroshare.exe
BIN_DIR=./release
NSIS_EXE="/cygdrive/c/Program\ Files/NSIS/makensis.exe"
cp $QTGUI_DIR/$EXEC $BIN_DIR
echo cp $QTGUI_DIR/$EXEC $BIN_DIR
# copy skin files.
cp -r $QTGUI_DIR/qss/* $BIN_DIR/qss
echo 'cp -r $QTGUI_DIR/qss/* $BIN_DIR/qss'
#
cp -r $QTGUI_DIR/skin/* $BIN_DIR/skin
echo 'cp $QTGUI_DIR/skin/* $BIN_DIR/skin'
#
cp -r $QTGUI_DIR/emoticons/* $BIN_DIR/emoticons/
echo cp -r $QTGUI_DIR/emoticons/* $BIN_DIR/emoticons/
cp -r $QTGUI_DIR/style/* $BIN_DIR/style
echo 'cp -r $QTGUI_DIR/style/* $BIN_DIR/style'
./stripSVN.sh release
echo ./stripSVN.sh release
cp $INST_DIR/retroshare.nsi ./
echo cp $QTGUI_DIR/retroshare.nsi ./
cp $QTGUI_DIR/license/* ./license/
echo cp $QTGUI_DIR/license/* ./license/
cp $QTGUI_DIR/gui/images/splash.bmp ./gui/images/
echo cp $QTGUI_DIR/gui/images/splash.bmp ./gui/images/
#cp $QTGUI_DIR/release/changelog.txt ./release/changelog.txt
#echo cp $QTGUI_DIR/release/changelog.txt ./release/changelog.txt
"/cygdrive/c/Program Files/NSIS/makensis.exe" retroshare.nsi
#$NSIS_EXE retroshare.nsi

35
build_scripts/Windows/retroshare.nsi
View file

@ -2,7 +2,7 @@
; Define your application name
!define APPNAME "RetroShare"
!define VERSION "0.4.12a"
!define VERSION "0.4.13a"
!define APPNAMEANDVERSION "${APPNAME} ${VERSION}"
; Main Install settings
@ -40,7 +40,7 @@ SetCompressor LZMA
!define MUI_LANGDLL_REGISTRY_KEY ${REGKEY}
!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 having 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\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. "
@ -144,14 +144,21 @@ Section $(sec_main) sec_main
; Set Section Files and Shortcuts
SetOutPath "$INSTDIR\"
File /r "release\RetroShare.exe"
File /r "D:\MinGW\bin\mingwm10.dll"
File /r "pthreadGCE2.dll"
File /r "D:\Qt\4.4.3\bin\QtCore4.dll"
File /r "D:\Qt\4.4.3\bin\QtGui4.dll"
File /r "D:\Qt\4.4.3\bin\QtNetwork4.dll"
File /r "D:\Qt\4.4.3\bin\QtXml4.dll"
File /r "D:\Qt\4.4.3\bin\QtScript4.dll"
File /r "changelog.txt"
File /r "release\mingwm10.dll"
File /r "release\changelog.txt"
; Two Comments here:
; 1) Please use relative directorys ( like I have changed it to)
; As it prevents use from needing to continually change the file.
; 2) Better To Build as standalone exec.
;
; File /r "D:\MinGW\bin\mingwm10.dll"
; File /r "pthreadGCE2.dll"
; File /r "D:\Qt\4.4.3\bin\QtCore4.dll"
; File /r "D:\Qt\4.4.3\bin\QtGui4.dll"
; File /r "D:\Qt\4.4.3\bin\QtNetwork4.dll"
; File /r "D:\Qt\4.4.3\bin\QtXml4.dll"
; File /r "D:\Qt\4.4.3\bin\QtScript4.dll"
@ -169,19 +176,19 @@ Section $(sec_data) sec_data
; We're not ready for external skins...
; Set Section qss need to remove svn path
SetOutPath "$INSTDIR\qss\"
File /r qss\*.*
File /r release\qss\*.*
; Set Section skin
; SetOutPath "$INSTDIR\skin\"
; File /r release\skin\*.*
; File /r skin\*.*
; Add emoticons
SetOutPath "$INSTDIR\emoticons\"
File /r emoticons\*.*
File /r release\emoticons\*.*
; Add Chat Style
SetOutPath "$INSTDIR\style\"
File /r style\*.*
File /r release\style\*.*
SectionEnd

12
build_scripts/Windows/stripSVN.sh Executable file
View file

@ -0,0 +1,12 @@
#!/bin/sh
if [ $# -le 0 ]
then
echo usage $0 directory
exit
fi
echo find $1 -name .svn
rm -vrf `find $1 -name .svn`