Menu
▾
▴
pidgin-commits
|
From: <dat...@us...> - 2006-08-22 15:38:53
|
Revision: 16977 Author: datallah Date: 2006-08-22 08:38:49 -0700 (Tue, 22 Aug 2006) ViewCVS: http://svn.sourceforge.net/gaim/?rev=16977&view=rev Log Message: ----------- Fix for reorganization. Modified Paths: -------------- trunk/gaim-installer.nsi Modified: trunk/gaim-installer.nsi =================================================================== --- trunk/gaim-installer.nsi 2006-08-22 12:07:41 UTC (rev 16976) +++ trunk/gaim-installer.nsi 2006-08-22 15:38:49 UTC (rev 16977) @@ -44,7 +44,7 @@ ;-------------------------------- ;Defines -!define GAIM_NSIS_INCLUDE_PATH ".\src\win32\nsis" +!define GAIM_NSIS_INCLUDE_PATH ".\gtk\win32\nsis" !define GAIM_INSTALLER_DEPS "..\win32-dev\gaim-inst-deps" !define GAIM_REG_KEY "SOFTWARE\gaim" @@ -70,11 +70,11 @@ ;-------------------------------- ;Modern UI Configuration - !define MUI_ICON ".\pixmaps\gaim-install.ico" - !define MUI_UNICON ".\pixmaps\gaim-install.ico" - !define MUI_WELCOMEFINISHPAGE_BITMAP ".\src\win32\nsis\gaim-intro.bmp" + !define MUI_ICON ".\gtk\pixmaps\gaim-install.ico" + !define MUI_UNICON ".\gtk\pixmaps\gaim-install.ico" + !define MUI_WELCOMEFINISHPAGE_BITMAP ".\gtk\win32\nsis\gaim-intro.bmp" !define MUI_HEADERIMAGE - !define MUI_HEADERIMAGE_BITMAP ".\src\win32\nsis\gaim-header.bmp" + !define MUI_HEADERIMAGE_BITMAP ".\gtk\win32\nsis\gaim-header.bmp" ; Alter License section !define MUI_LICENSEPAGE_BUTTON $(GAIM_LICENSE_BUTTON) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <dat...@us...> - 2006-08-30 03:46:41
|
Revision: 17083 Author: datallah Date: 2006-08-29 20:46:34 -0700 (Tue, 29 Aug 2006) ViewCVS: http://svn.sourceforge.net/gaim/?rev=17083&view=rev Log Message: ----------- Installer cleanup - use NSIS built-in stuff instead of writing our own Modified Paths: -------------- trunk/gaim-installer.nsi Modified: trunk/gaim-installer.nsi =================================================================== --- trunk/gaim-installer.nsi 2006-08-30 02:40:56 UTC (rev 17082) +++ trunk/gaim-installer.nsi 2006-08-30 03:46:34 UTC (rev 17083) @@ -10,7 +10,6 @@ Var name Var GTK_FOLDER Var GTK_THEME_SEL -Var LANG_IS_SET Var ISSILENT Var STARTUP_RUN_KEY Var SPELLCHECK_SEL @@ -40,7 +39,12 @@ !include "MUI.nsh" !include "Sections.nsh" +!include "FileFunc.nsh" +!insertmacro GetParameters +!insertmacro GetOptions +!insertmacro GetParent + ;-------------------------------- ;Defines @@ -937,9 +941,7 @@ Loop: IfFileExists $0 dir_exists StrCpy $1 $0 ; save last - Push $0 - Call GetParent - Pop $0 + ${GetParent} $0 $0 StrLen $2 $0 ; IfFileExists "C:" on xp returns true and on win2k returns false ; So we're done in such a case.. @@ -1002,35 +1004,6 @@ Pop $0 FunctionEnd -; GetParent -; input, top of stack (e.g. C:\Program Files\Poop) -; output, top of stack (replaces, with e.g. C:\Program Files) -; modifies no other variables. -; -; Usage: -; Push "C:\Program Files\Directory\Whatever" -; Call GetParent -; Pop $R0 -; ; at this point $R0 will equal "C:\Program Files\Directory" -Function GetParent - Exch $0 ; old $0 is on top of stack - Push $1 - Push $2 - StrCpy $1 -1 - loop: - StrCpy $2 $0 1 $1 - StrCmp $2 "" exit - StrCmp $2 "\" exit - IntOp $1 $1 - 1 - Goto loop - exit: - StrCpy $0 $0 $1 - Pop $2 - Pop $1 - Exch $0 ; put $0 on top of stack, restore $0 to original value -FunctionEnd - - ; CheckGtkVersion ; inputs: Push 2 GTK+ version strings to check. The major value needs to ; be equal and the minor value needs to be greater or equal. @@ -1221,10 +1194,12 @@ StrCpy $ISSILENT "/S" set_gtk_normal: - Call ParseParameters + ${GetParameters} $R0 + ClearErrors + ${GetOptions} $R0 "/L=" $LANGUAGE + IfErrors 0 skip_lang ; Select Language - IntCmp $LANG_IS_SET 1 skip_lang ; Display Language selection dialog !insertmacro MUI_LANGDLL_DISPLAY skip_lang: @@ -1250,9 +1225,8 @@ Goto instdir_done user_dir: Push $SMPROGRAMS - Call GetParent - Call GetParent - Pop $R2 + ${GetParent} $SMPROGRAMS $R2 + ${GetParent} $R2 $R2 StrCpy $INSTDIR "$R2\Gaim" instdir_done: @@ -1381,11 +1355,8 @@ no_gtk_cont: ; Suggest path.. StrCmp $R1 "HKCU" 0 hklm1 - StrCpy $R0 "$SMPROGRAMS" - Push $R0 - Call GetParent - Call GetParent - Pop $R0 + ${GetParent} $SMPROGRAMS $R0 + ${GetParent} $R0 $R0 StrCpy $R0 "$R0\GTK\2.0" Goto got_path hklm1: @@ -1412,112 +1383,6 @@ FunctionEnd !endif -; GetParameters -; input, none -; output, top of stack (replaces, with e.g. whatever) -; modifies no other variables. -Function GetParameters - - Push $R0 - Push $R1 - Push $R2 - Push $R3 - - StrCpy $R2 1 - StrLen $R3 $CMDLINE - - ;Check for quote or space - StrCpy $R0 $CMDLINE $R2 - StrCmp $R0 '"' 0 +3 - StrCpy $R1 '"' - Goto loop - StrCpy $R1 " " - - loop: - IntOp $R2 $R2 + 1 - StrCpy $R0 $CMDLINE 1 $R2 - StrCmp $R0 $R1 get - StrCmp $R2 $R3 get - Goto loop - - get: - IntOp $R2 $R2 + 1 - StrCpy $R0 $CMDLINE 1 $R2 - StrCmp $R0 " " get - StrCpy $R0 $CMDLINE "" $R2 - - Pop $R3 - Pop $R2 - Pop $R1 - Exch $R0 - -FunctionEnd - - ; StrStr - ; input, top of stack = string to search for - ; top of stack-1 = string to search in - ; output, top of stack (replaces with the portion of the string remaining) - ; modifies no other variables. - ; - ; Usage: - ; Push "this is a long ass string" - ; Push "ass" - ; Call StrStr - ; Pop $R0 - ; ($R0 at this point is "ass string") - -Function StrStr - Exch $R1 ; st=haystack,old$R1, $R1=needle - Exch ; st=old$R1,haystack - Exch $R2 ; st=old$R1,old$R2, $R2=haystack - Push $R3 - Push $R4 - Push $R5 - StrLen $R3 $R1 - StrCpy $R4 0 - ; $R1=needle - ; $R2=haystack - ; $R3=len(needle) - ; $R4=cnt - ; $R5=tmp - loop: - StrCpy $R5 $R2 $R3 $R4 - StrCmp $R5 $R1 done - StrCmp $R5 "" done - IntOp $R4 $R4 + 1 - Goto loop - done: - StrCpy $R1 $R2 "" $R4 - Pop $R5 - Pop $R4 - Pop $R3 - Pop $R2 - Exch $R1 -FunctionEnd - -; -; Parse the Command line -; -; Unattended install command line parameters -; /L=Language e.g.: /L=1033 -; -Function ParseParameters - Push $R0 - IntOp $LANG_IS_SET 0 + 0 - Call GetParameters - ;Pop $R0 - ;Push $R0 - Push "L=" - Call StrStr - Pop $R0 - StrCmp $R0 "" next - StrCpy $R0 $R0 4 2 ; Strip first 2 chars of string - StrCpy $LANGUAGE $R0 - IntOp $LANG_IS_SET 0 + 1 - next: - Pop $R0 -FunctionEnd - ; GetWindowsVersion ; ; Based on Yazno's function, http://yazno.tripod.com/powerpimpit/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <dat...@us...> - 2006-09-20 20:32:54
|
Revision: 17331
http://svn.sourceforge.net/gaim/?rev=17331&view=rev
Author: datallah
Date: 2006-09-20 13:32:43 -0700 (Wed, 20 Sep 2006)
Log Message:
-----------
Don't remove the perl plugin if we can't find ActivePerl. We no longer have the annoying error popups when a dll dependency isn't found, so this isn't necessary anymore.
Modified Paths:
--------------
trunk/gaim-installer.nsi
Modified: trunk/gaim-installer.nsi
===================================================================
--- trunk/gaim-installer.nsi 2006-09-20 18:07:28 UTC (rev 17330)
+++ trunk/gaim-installer.nsi 2006-09-20 20:32:43 UTC (rev 17331)
@@ -444,19 +444,14 @@
SetOutPath "$INSTDIR"
got_shfolder:
- ; Check if Perl is installed, If not remove perl plugin
+ ; Check if Perl is installed, if so add it to the AppPaths
ReadRegStr $R2 HKLM ${PERL_REG_KEY} ""
StrCmp $R2 "" 0 perl_exists
ReadRegStr $R2 HKCU ${PERL_REG_KEY} ""
- StrCmp $R2 "" perl_remove perl_exists
+ StrCmp $R2 "" perl_done perl_exists
- perl_remove:
- Delete "$INSTDIR\plugins\perl.dll"
- RMDir /r "$INSTDIR\perlmod"
- Goto perl_done
-
perl_exists:
- IfFileExists "$R2\bin\${PERL_DLL}" 0 perl_remove
+ IfFileExists "$R2\bin\${PERL_DLL}" 0 perl_done
StrCmp $R0 "HKLM" 0 perl_done
ReadRegStr $R3 HKLM "${HKLM_APP_PATHS_KEY}" "Path"
WriteRegStr HKLM "${HKLM_APP_PATHS_KEY}" "Path" "$R3;$R2\bin"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dat...@us...> - 2006-10-17 04:07:22
|
Revision: 17492
http://svn.sourceforge.net/gaim/?rev=17492&view=rev
Author: datallah
Date: 2006-10-16 21:07:19 -0700 (Mon, 16 Oct 2006)
Log Message:
-----------
Fix to work with GTK+ 2.10.6 installer.
Modified Paths:
--------------
trunk/gaim-installer.nsi
Modified: trunk/gaim-installer.nsi
===================================================================
--- trunk/gaim-installer.nsi 2006-10-17 03:23:08 UTC (rev 17491)
+++ trunk/gaim-installer.nsi 2006-10-17 04:07:19 UTC (rev 17492)
@@ -48,6 +48,10 @@
!include "WordFunc.nsh"
!insertmacro VersionCompare
+!include "TextFunc.nsh"
+!insertmacro ConfigRead
+!insertmacro ConfigWriteS
+
;--------------------------------
;Defines
@@ -60,15 +64,12 @@
!define GAIM_STARTUP_RUN_KEY "SOFTWARE\Microsoft\Windows\CurrentVersion\Run"
!define GAIM_UNINST_EXE "gaim-uninst.exe"
-!define GTK_VERSION "2.6.10"
+!define GTK_VERSION "2.10.6"
!define GTK_REG_KEY "SOFTWARE\GTK\2.0"
!define PERL_REG_KEY "SOFTWARE\Perl"
!define PERL_DLL "perl58.dll"
!define GTK_DEFAULT_INSTALL_PATH "$COMMONFILES\GTK\2.0"
!define GTK_RUNTIME_INSTALLER "..\gtk_installer\gtk-runtime*.exe"
-!define GTK_THEME_DIR "..\gtk_installer\gtk_themes"
-!define GTK_DEFAULT_THEME_GTKRC_DIR "share\themes\Default\gtk-2.0"
-!define GTK_DEFAULT_THEME_ENGINE_DIR "lib\gtk-2.0\2.4.0\engines"
!define ASPELL_REG_KEY "SOFTWARE\Aspell"
!define DOWNLOADER_URL "http://gaim.sourceforge.net/win32/download_redir.php"
@@ -510,59 +511,23 @@
SubSection /e $(GTK_THEMES_SECTION_TITLE) SecGtkThemes
Section /o $(GTK_NOTHEME_SECTION_TITLE) SecGtkNone
- Call CanWeInstallATheme
- Pop $R0
- StrCmp $R0 "" done
- SetOverwrite on
- Rename $R0\${GTK_DEFAULT_THEME_GTKRC_DIR}\gtkrc $R0\${GTK_DEFAULT_THEME_GTKRC_DIR}\gtkrc.old
- CopyFiles $R0\${GTK_DEFAULT_THEME_GTKRC_DIR}\gtkrc.plain $R0\${GTK_DEFAULT_THEME_GTKRC_DIR}\gtkrc
- SetOverwrite off
- done:
+ Push "Raleigh"
+ Call WriteGtkThemeConfig
SectionEnd
Section $(GTK_WIMP_SECTION_TITLE) SecGtkWimp
- Call CanWeInstallATheme
- Pop $R0
- StrCmp $R0 "" done
- SetOverwrite on
- Rename $R0\${GTK_DEFAULT_THEME_GTKRC_DIR}\gtkrc $R0\${GTK_DEFAULT_THEME_GTKRC_DIR}\gtkrc.old
- SetOutPath $R0\${GTK_DEFAULT_THEME_ENGINE_DIR}
- File ${GTK_THEME_DIR}\engines\libwimp.dll
- SetOutPath $R0\${GTK_DEFAULT_THEME_GTKRC_DIR}
- File ${GTK_THEME_DIR}\themes\gtkrc.gtkwimp
- File /oname=gtkrc ${GTK_THEME_DIR}\themes\gtkrc.gtkwimp
- SetOverwrite off
- done:
+ Push "MS-Windows"
+ Call WriteGtkThemeConfig
SectionEnd
Section /o $(GTK_BLUECURVE_SECTION_TITLE) SecGtkBluecurve
- Call CanWeInstallATheme
- Pop $R0
- StrCmp $R0 "" done
- SetOverwrite on
- Rename $R0\${GTK_DEFAULT_THEME_GTKRC_DIR}\gtkrc $R0\${GTK_DEFAULT_THEME_GTKRC_DIR}\gtkrc.old
- SetOutPath $R0\${GTK_DEFAULT_THEME_ENGINE_DIR}
- File ${GTK_THEME_DIR}\engines\libbluecurve.dll
- SetOutPath $R0\${GTK_DEFAULT_THEME_GTKRC_DIR}
- File ${GTK_THEME_DIR}\themes\gtkrc.bluecurve
- File /oname=gtkrc ${GTK_THEME_DIR}\themes\gtkrc.bluecurve
- SetOverwrite off
- done:
+ Push "Bluecurve"
+ Call WriteGtkThemeConfig
SectionEnd
Section /o $(GTK_LIGHTHOUSEBLUE_SECTION_TITLE) SecGtkLighthouseblue
- Call CanWeInstallATheme
- Pop $R0
- StrCmp $R0 "" done
- SetOverwrite on
- Rename $R0\${GTK_DEFAULT_THEME_GTKRC_DIR}\gtkrc $R0\${GTK_DEFAULT_THEME_GTKRC_DIR}\gtkrc.old
- SetOutPath $R0\${GTK_DEFAULT_THEME_ENGINE_DIR}
- File ${GTK_THEME_DIR}\engines\liblighthouseblue.dll
- SetOutPath $R0\${GTK_DEFAULT_THEME_GTKRC_DIR}
- File ${GTK_THEME_DIR}\themes\gtkrc.lighthouseblue
- File /oname=gtkrc ${GTK_THEME_DIR}\themes\gtkrc.lighthouseblue
- SetOverwrite off
- done:
+ Push "Lighthouseblue"
+ Call WriteGtkThemeConfig
SectionEnd
SubSectionEnd
@@ -758,6 +723,7 @@
!ifdef DEBUG
Delete "$INSTDIR\exchndl.dll"
!endif
+ Delete "$INSTDIR\install.log"
;Try to remove Gaim install dir .. if empty
RMDir "$INSTDIR"
@@ -857,50 +823,26 @@
;--------------------------------
;Functions
-;
-; Usage:
-;
-; Call CanWeInstallATheme
-; Pop $R0
-;
-; Return:
-; "" - If no
-; "root path of GTK+ installation" - if yes
-;
-Function CanWeInstallATheme
- Push $1
- Push $0
+Function WriteGtkThemeConfig
+Exch $0
+Push $1
- ; Set default.. no rights
- StrCpy $1 ""
+ClearErrors
+${ConfigRead} "$PROFILE\.gtkrc-2.0" "gtk-theme-name =" $1
+IfErrors new_file
+${ConfigWriteS} "$PROFILE\.gtkrc-2.0" "gtk-theme-name =" "$\"$0$\"" $1
+Goto done
- Call CheckUserInstallRights
- Pop $0
+new_file:
+ClearErrors
+FileOpen $1 "$PROFILE\.gtkrc-2.0" w
+FileWrite $1 "gtk-theme-name = $\"$0$\""
+FileClose $1
+Goto done
- ; If no rights check if gtk was installed to gaim dir..
- StrCmp $0 "NONE" 0 themes_cont
- StrCmp $GTK_FOLDER $INSTDIR 0 no_rights
- StrCpy $1 $INSTDIR
- Goto done
- themes_cont:
-
- StrCmp $0 "HKCU" hkcu hklm
-
- hkcu:
- ReadRegStr $1 HKCU ${GTK_REG_KEY} "Path"
- StrCmp $1 "" no_rights done
-
- hklm:
- ReadRegStr $1 HKLM ${GTK_REG_KEY} "Path"
- Goto done
-
- no_rights:
- MessageBox MB_OK $(GTK_NO_THEME_INSTALL_RIGHTS) /SD IDOK
- StrCpy $1 ""
-
- done:
- Pop $0
- Exch $1
+done:
+Pop $1
+Pop $0
FunctionEnd
!macro CheckUserInstallRightsMacro UN
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dat...@us...> - 2006-10-21 20:40:29
|
Revision: 17557
http://svn.sourceforge.net/gaim/?rev=17557&view=rev
Author: datallah
Date: 2006-10-21 13:40:12 -0700 (Sat, 21 Oct 2006)
Log Message:
-----------
Don't force GTK+ upgrade if there is a compatible version installed.
Modified Paths:
--------------
trunk/gaim-installer.nsi
Modified: trunk/gaim-installer.nsi
===================================================================
--- trunk/gaim-installer.nsi 2006-10-21 19:12:54 UTC (rev 17556)
+++ trunk/gaim-installer.nsi 2006-10-21 20:40:12 UTC (rev 17557)
@@ -64,7 +64,8 @@
!define GAIM_STARTUP_RUN_KEY "SOFTWARE\Microsoft\Windows\CurrentVersion\Run"
!define GAIM_UNINST_EXE "gaim-uninst.exe"
-!define GTK_VERSION "2.10.6"
+!define GTK_MIN_VERSION "2.6.10"
+!define GTK_INSTALL_VERSION "2.10.6"
!define GTK_REG_KEY "SOFTWARE\GTK\2.0"
!define PERL_REG_KEY "SOFTWARE\Perl"
!define PERL_DLL "perl58.dll"
@@ -320,35 +321,29 @@
File /oname=gtk-runtime.exe ${GTK_RUNTIME_INSTALLER}
SetOverwrite off
- ; This keeps track whether we install GTK+ or not..
- StrCpy $R5 "0"
-
Call DoWeNeedGtk
Pop $R0
Pop $R6
StrCmp $R0 "0" have_gtk
StrCmp $R0 "1" upgrade_gtk
- StrCmp $R0 "2" no_gtk no_gtk
+ StrCmp $R0 "2" upgrade_gtk
+ StrCmp $R0 "3" no_gtk no_gtk
no_gtk:
StrCmp $R1 "NONE" gtk_no_install_rights
ClearErrors
ExecWait '"$TEMP\gtk-runtime.exe" /L=$LANGUAGE $ISSILENT /D=$GTK_FOLDER'
- Goto gtk_install_cont
+ IfErrors gtk_install_error done
upgrade_gtk:
StrCpy $GTK_FOLDER $R6
+ StrCmp $R0 "2" +2 ; Upgrade isn't optional
MessageBox MB_YESNO $(GTK_UPGRADE_PROMPT) /SD IDYES IDNO done
ClearErrors
- ExecWait '"$TEMP\gtk-runtime.exe" /L=$LANGUAGE $ISSILENT'
- Goto gtk_install_cont
+ ExecWait '"$TEMP\gtk-runtime.exe" /L=$LANGUAGE /S /D=$GTK_FOLDER'
+ IfErrors gtk_install_error done
- gtk_install_cont:
- IfErrors gtk_install_error
- StrCpy $R5 "1" ; marker that says we installed...
- Goto done
-
gtk_install_error:
Delete "$TEMP\gtk-runtime.exe"
MessageBox MB_OK $(GTK_INSTALL_ERROR) /SD IDOK
@@ -967,9 +962,11 @@
; First Pop:
; 0 - We have the correct version
; Second Pop: Key where Version was found
-; 1 - We have an old version that needs to be upgraded
+; 1 - We have an old version that should work, prompt user for optional upgrade
; Second Pop: HKLM or HKCU depending on where GTK was found.
-; 2 - We don't have Gtk+ at all
+; 2 - We have an old version that needs to be upgraded
+; Second Pop: HKLM or HKCU depending on where GTK was found.
+; 3 - We don't have Gtk+ at all
; Second Pop: "NONE, HKLM or HKCU" depending on our rights..
;
Function DoWeNeedGtk
@@ -988,6 +985,7 @@
Push $0
Push $1
Push $2
+ Push $3
Call CheckUserInstallRights
Pop $1
@@ -1003,23 +1001,23 @@
StrCpy $2 "HKLM"
StrCmp $0 "" no_gtk have_gtk
-
have_gtk:
; GTK+ is already installed.. check version.
- ${VersionCompare} ${GTK_VERSION} $0 $0
- IntCmp $0 1 bad_version good_version good_version
+ ${VersionCompare} ${GTK_INSTALL_VERSION} $0 $3
+ IntCmp $3 1 +1 good_version good_version
+ ${VersionCompare} ${GTK_MIN_VERSION} $0 $3
- bad_version:
; Bad version. If hklm ver and we have hkcu or no rights.. return no gtk
- StrCmp $1 "NONE" no_gtk ; if no rights.. can't upgrade
- StrCmp $1 "HKCU" 0 upgrade_gtk ; if HKLM can upgrade..
- StrCmp $2 "HKLM" no_gtk upgrade_gtk ; have hkcu rights.. if found hklm ver can't upgrade..
+ StrCmp $1 "NONE" no_gtk ; if no rights.. can't upgrade
+ StrCmp $1 "HKCU" 0 +2 ; if HKLM can upgrade..
+ StrCmp $2 "HKLM" no_gtk ; have hkcu rights.. if found hklm ver can't upgrade..
+ Push $2
+ IntCmp $3 1 +3
+ Push "1" ; Optional Upgrade
+ Goto done
+ Push "2" ; Mandatory Upgrade
+ Goto done
- upgrade_gtk:
- Push $2
- Push "1"
- Goto done
-
good_version:
StrCmp $2 "HKLM" have_hklm_gtk have_hkcu_gtk
have_hkcu_gtk:
@@ -1038,14 +1036,15 @@
no_gtk:
Push $1 ; our rights
- Push "2"
+ Push "3"
Goto done
done:
; The top two items on the stack are what we want to return
- Exch 3
+ Exch 4
Pop $0
- Exch 3
+ Exch 4
+ Pop $3
Pop $2
Pop $1
FunctionEnd
@@ -1222,8 +1221,8 @@
Pop $R0
Pop $GTK_FOLDER
- StrCmp $R0 "0" have_gtk need_gtk
- need_gtk:
+ IntCmp $R0 1 have_gtk have_gtk
+
MessageBox MB_OK $(GTK_INSTALLER_NEEDED) /SD IDOK
Quit
have_gtk:
@@ -1239,16 +1238,13 @@
Pop $R0
Pop $R1
- StrCmp $R0 "0" have_gtk
- StrCmp $R0 "1" upgrade_gtk
- StrCmp $R0 "2" no_gtk no_gtk
+ IntCmp $R0 2 +2 +2 no_gtk
+ StrCmp $R0 "3" no_gtk no_gtk
; Don't show dir selector.. Upgrades are done to existing path..
- have_gtk:
- upgrade_gtk:
- Pop $R1
- Pop $R0
- Abort
+ Pop $R1
+ Pop $R0
+ Abort
no_gtk:
StrCmp $R1 "NONE" 0 no_gtk_cont
@@ -1267,7 +1263,7 @@
StrCpy $R0 "${GTK_DEFAULT_INSTALL_PATH}"
got_path:
- StrCpy $name "GTK+ ${GTK_VERSION}"
+ StrCpy $name "GTK+ ${GTK_INSTALL_VERSION}"
StrCpy $GTK_FOLDER $R0
Pop $R1
Pop $R0
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dat...@us...> - 2006-11-17 01:11:20
|
Revision: 17762
http://svn.sourceforge.net/gaim/?rev=17762&view=rev
Author: datallah
Date: 2006-11-16 17:11:18 -0800 (Thu, 16 Nov 2006)
Log Message:
-----------
GTK+ Theme selection will now choose the system-wide theme if the installer is being run by the admin user.
Also, the theme checkboxes can now be all unselected and we wont mess with the current theme selection.
Modified Paths:
--------------
trunk/gaim-installer.nsi
Modified: trunk/gaim-installer.nsi
===================================================================
--- trunk/gaim-installer.nsi 2006-11-17 00:41:28 UTC (rev 17761)
+++ trunk/gaim-installer.nsi 2006-11-17 01:11:18 UTC (rev 17762)
@@ -49,7 +49,6 @@
!insertmacro VersionCompare
!include "TextFunc.nsh"
-!insertmacro ConfigRead
!insertmacro ConfigWriteS
;--------------------------------
@@ -487,7 +486,7 @@
;--------------------------------
;Shortcuts
-SubSection /e $(GAIM_SHORTCUTS_SECTION_TITLE) SecShortcuts
+SectionGroup /e $(GAIM_SHORTCUTS_SECTION_TITLE) SecShortcuts
Section /o $(GAIM_DESKTOP_SHORTCUT_SECTION_TITLE) SecDesktopShortcut
SetOverwrite on
CreateShortCut "$DESKTOP\Gaim.lnk" "$INSTDIR\gaim.exe"
@@ -499,12 +498,12 @@
CreateShortCut "$SMPROGRAMS\Gaim\Gaim.lnk" "$INSTDIR\gaim.exe"
SetOverwrite off
SectionEnd
-SubSectionEnd
+SectionGroupEnd
;--------------------------------
;GTK+ Themes
-SubSection /e $(GTK_THEMES_SECTION_TITLE) SecGtkThemes
+SectionGroup /e $(GTK_THEMES_SECTION_TITLE) SecGtkThemes
Section /o $(GTK_NOTHEME_SECTION_TITLE) SecGtkNone
Push "Raleigh"
Call WriteGtkThemeConfig
@@ -524,12 +523,12 @@
Push "Lighthouseblue"
Call WriteGtkThemeConfig
SectionEnd
-SubSectionEnd
+SectionGroupEnd
;--------------------------------
;Spell Checking
-SubSection /e $(GAIM_SPELLCHECK_SECTION_TITLE) SecSpellCheck
+SectionGroup /e $(GAIM_SPELLCHECK_SECTION_TITLE) SecSpellCheck
Section /o $(GAIM_SPELLCHECK_BRETON) SecSpellCheckBreton
Push ${SecSpellCheckBreton}
Call InstallAspellAndDict
@@ -618,7 +617,7 @@
Push ${SecSpellCheckUkrainian}
Call InstallAspellAndDict
SectionEnd
-SubSectionEnd
+SectionGroupEnd
;--------------------------------
;Uninstaller Section
@@ -822,25 +821,37 @@
;Functions
Function WriteGtkThemeConfig
-Exch $0
-Push $1
+ Exch $0
+ Push $1
+ Push $2
+ Push $3
-ClearErrors
-${ConfigRead} "$PROFILE\.gtkrc-2.0" "gtk-theme-name =" $1
-IfErrors new_file
-${ConfigWriteS} "$PROFILE\.gtkrc-2.0" "gtk-theme-name =" "$\"$0$\"" $1
-Goto done
+ Call CheckUserInstallRights
+ Pop $2
+ StrCmp $2 "HKLM" 0 user_theme
-new_file:
-ClearErrors
-FileOpen $1 "$PROFILE\.gtkrc-2.0" w
-FileWrite $1 "gtk-theme-name = $\"$0$\""
-FileClose $1
-Goto done
+ ; Global Theme
+ ReadRegStr $2 HKLM ${GTK_REG_KEY} "Path"
+ StrCpy $3 "$2\etc\gtk-2.0\gtkrc"
+ Goto update_theme
+ user_theme:
+ StrCpy $3 "$PROFILE\.gtkrc-2.0"
-done:
-Pop $1
-Pop $0
+ update_theme:
+ IfFileExists $3 0 new_file
+ ${ConfigWriteS} $3 "gtk-theme-name =" " $\"$0$\"" $1
+ Goto done
+
+ new_file:
+ FileOpen $1 $3 w
+ FileWrite $1 "gtk-theme-name = $\"$0$\""
+ FileClose $1
+
+ done:
+ Pop $3
+ Pop $2
+ Pop $1
+ Pop $0
FunctionEnd
!macro CheckUserInstallRightsMacro UN
@@ -1177,7 +1188,7 @@
Push $1
Push $2
- !insertmacro StartRadioButtons $GTK_THEME_SEL
+ !insertmacro StartRadioButtonsUnselectable $GTK_THEME_SEL
!insertmacro RadioButton ${SecGtkNone}
!insertmacro RadioButton ${SecGtkWimp}
!insertmacro RadioButton ${SecGtkBluecurve}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dat...@us...> - 2006-12-11 13:33:01
|
Revision: 17960
http://svn.sourceforge.net/gaim/?rev=17960&view=rev
Author: datallah
Date: 2006-12-11 05:32:53 -0800 (Mon, 11 Dec 2006)
Log Message:
-----------
Add new plugins to uninstaller.
Modified Paths:
--------------
trunk/gaim-installer.nsi
Modified: trunk/gaim-installer.nsi
===================================================================
--- trunk/gaim-installer.nsi 2006-12-11 13:32:07 UTC (rev 17959)
+++ trunk/gaim-installer.nsi 2006-12-11 13:32:53 UTC (rev 17960)
@@ -655,6 +655,10 @@
RMDir /r "$INSTDIR\locale"
RMDir /r "$INSTDIR\pixmaps"
RMDir /r "$INSTDIR\perlmod"
+ Delete "$INSTDIR\plugins\autoaccept.dll"
+ Delete "$INSTDIR\plugins\autoreply.dll"
+ Delete "$INSTDIR\plugins\buddynote.dll"
+ Delete "$INSTDIR\plugins\convcolors.dll"
Delete "$INSTDIR\plugins\extplacement.dll"
Delete "$INSTDIR\plugins\gaimrc.dll"
Delete "$INSTDIR\plugins\history.dll"
@@ -675,7 +679,10 @@
Delete "$INSTDIR\plugins\libtoc.dll"
Delete "$INSTDIR\plugins\libyahoo.dll"
Delete "$INSTDIR\plugins\log_reader.dll"
+ Delete "$INSTDIR\plugins\markerline.dll"
+ Delete "$INSTDIR\plugins\newline.dll"
Delete "$INSTDIR\plugins\notify.dll"
+ Delete "$INSTDIR\plugins\offlinemsg.dll"
Delete "$INSTDIR\plugins\perl.dll"
Delete "$INSTDIR\plugins\psychic.dll"
Delete "$INSTDIR\plugins\relnot.dll"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X