Thread: [vassalengine-svn-trunk] [vassalengine-svn] SF.net SVN: vassalengine:[4310] VASSAL-src/trunk/dist/w
Brought to you by:
rodneykinney,
uckelman
From: <uck...@us...> - 2008-10-23 13:23:42
|
Revision: 4310 http://vassalengine.svn.sourceforge.net/vassalengine/?rev=4310&view=rev Author: uckelman Date: 2008-10-23 12:12:15 +0000 (Thu, 23 Oct 2008) Log Message: ----------- Updated JRE download URL to fetch current JRE 1.6.0_6u10. Modified Paths: -------------- VASSAL-src/trunk/dist/windows/nsis/installer.nsi Modified: VASSAL-src/trunk/dist/windows/nsis/installer.nsi =================================================================== --- VASSAL-src/trunk/dist/windows/nsis/installer.nsi 2008-10-23 06:08:30 UTC (rev 4309) +++ VASSAL-src/trunk/dist/windows/nsis/installer.nsi 2008-10-23 12:12:15 UTC (rev 4310) @@ -33,7 +33,7 @@ !define IROOT "${VROOT}\${VNAME}" !define AROOT "Software\Classes" !define JRE_MINIMUM "1.5.0" -!define JRE_URL "http://javadl.sun.com/webapps/download/AutoDL?BundleId=12797" +!define JRE_URL "http://javadl.sun.com/webapps/download/AutoDL?BundleId=24943" Name "VASSAL" OutFile "${TMPDIR}/VASSAL-${VERSION}-windows.exe" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ------------------------------------------------------------------------- This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK & win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100&url=/ _______________________________________________ vassalengine-svn mailing list vas...@li... https://lists.sourceforge.net/lists/listinfo/vassalengine-svn |
From: <uck...@us...> - 2008-11-08 18:51:21
|
Revision: 4403 http://vassalengine.svn.sourceforge.net/vassalengine/?rev=4403&view=rev Author: uckelman Date: 2008-11-08 18:51:12 +0000 (Sat, 08 Nov 2008) Log Message: ----------- Fixed: $R0 will not be 0 when there is no JRE. Modified Paths: -------------- VASSAL-src/trunk/dist/windows/nsis/installer.nsi Modified: VASSAL-src/trunk/dist/windows/nsis/installer.nsi =================================================================== --- VASSAL-src/trunk/dist/windows/nsis/installer.nsi 2008-11-08 17:56:07 UTC (rev 4402) +++ VASSAL-src/trunk/dist/windows/nsis/installer.nsi 2008-11-08 18:51:12 UTC (rev 4403) @@ -525,7 +525,7 @@ nsDialogs::Create /NOUNLOAD 1018 Pop $0 - ${If} $R1 == 0 + ${If} $1 == "" StrCpy $0 "The installer has not found a Java Runtime Environment (JRE) installed on your computer." ${Else} StrCpy $0 "The installer has found version $1 of the Java Runtime Environment (JRE) installed on your computer." This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ------------------------------------------------------------------------- This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK & win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100&url=/ _______________________________________________ vassalengine-svn mailing list vas...@li... https://lists.sourceforge.net/lists/listinfo/vassalengine-svn |
From: <uck...@us...> - 2008-11-08 20:16:07
|
Revision: 4404 http://vassalengine.svn.sourceforge.net/vassalengine/?rev=4404&view=rev Author: uckelman Date: 2008-11-08 20:15:52 +0000 (Sat, 08 Nov 2008) Log Message: ----------- Silently uninstall the OpenOffice installer which the Java 1.6.0_6u10 installer instals. GRRRR!!!! Modified Paths: -------------- VASSAL-src/trunk/dist/windows/nsis/installer.nsi Modified: VASSAL-src/trunk/dist/windows/nsis/installer.nsi =================================================================== --- VASSAL-src/trunk/dist/windows/nsis/installer.nsi 2008-11-08 18:51:12 UTC (rev 4403) +++ VASSAL-src/trunk/dist/windows/nsis/installer.nsi 2008-11-08 20:15:52 UTC (rev 4404) @@ -33,7 +33,7 @@ !define IROOT "${VROOT}\${VNAME}" !define AROOT "Software\Classes" !define JRE_MINIMUM "1.5.0" -!define JRE_URL "http://javadl.sun.com/webapps/download/AutoDL?BundleId=24943" +!define JRE_URL "http://javadl.sun.com/webapps/download/AutoDL?BundleId=24934" Name "VASSAL" OutFile "${TMPDIR}/VASSAL-${VERSION}-windows.exe" @@ -696,8 +696,9 @@ ${Else} ; provide a JRE installer requiring no user interaction ; options reference: http://java.sun.com/javase/6/docs/technotes/guides/deployment/deployment-guide/silent.html - ExecWait "$0 /qr ADDLOCAL=ALL" -; ExecWait "$0 /qr /log $TEMP\jre_install.log ADDLOCAL=ALL" + ExecWait "$0 /qr ADDLOCAL=ALL" + ; silently uninstall the OpenOffice installer which 6u10 installs, grrr! + ExecWait "MsiExec.exe /qn /X{0D499481-22C6-4B25-8AC2-6D3F6C885FB9}" ${EndIf} Delete $0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ------------------------------------------------------------------------- This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK & win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100&url=/ _______________________________________________ vassalengine-svn mailing list vas...@li... https://lists.sourceforge.net/lists/listinfo/vassalengine-svn |
From: <uck...@us...> - 2008-12-05 18:33:42
|
Revision: 4620 http://vassalengine.svn.sourceforge.net/vassalengine/?rev=4620&view=rev Author: uckelman Date: 2008-12-05 18:33:33 +0000 (Fri, 05 Dec 2008) Log Message: ----------- Updating JRE download link for 1.6.0_11. Modified Paths: -------------- VASSAL-src/trunk/dist/windows/nsis/installer.nsi Modified: VASSAL-src/trunk/dist/windows/nsis/installer.nsi =================================================================== --- VASSAL-src/trunk/dist/windows/nsis/installer.nsi 2008-12-05 13:59:11 UTC (rev 4619) +++ VASSAL-src/trunk/dist/windows/nsis/installer.nsi 2008-12-05 18:33:33 UTC (rev 4620) @@ -33,7 +33,7 @@ !define IROOT "${VROOT}\${VNAME}" !define AROOT "Software\Classes" !define JRE_MINIMUM "1.5.0" -!define JRE_URL "http://javadl.sun.com/webapps/download/AutoDL?BundleId=24934" +!define JRE_URL "http://javadl.sun.com/webapps/download/AutoDL?BundleId=26223" Name "VASSAL" OutFile "${TMPDIR}/VASSAL-${VERSION}-windows.exe" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ------------------------------------------------------------------------------ SF.Net email is Sponsored by MIX09, March 18-20, 2009 in Las Vegas, Nevada. The future of the web can't happen without you. Join us at MIX09 to help pave the way to the Next Web now. Learn more and register at http://ad.doubleclick.net/clk;208669438;13503038;i?http://2009.visitmix.com/ _______________________________________________ vassalengine-svn mailing list vas...@li... https://lists.sourceforge.net/lists/listinfo/vassalengine-svn |
From: <uck...@us...> - 2009-04-01 20:53:51
|
Revision: 5457 http://vassalengine.svn.sourceforge.net/vassalengine/?rev=5457&view=rev Author: uckelman Date: 2009-04-01 20:53:48 +0000 (Wed, 01 Apr 2009) Log Message: ----------- Merged 3.1@5454. Updated installer to download Java 6u13. Modified Paths: -------------- VASSAL-src/trunk/dist/windows/nsis/installer.nsi Modified: VASSAL-src/trunk/dist/windows/nsis/installer.nsi =================================================================== --- VASSAL-src/trunk/dist/windows/nsis/installer.nsi 2009-04-01 20:46:16 UTC (rev 5456) +++ VASSAL-src/trunk/dist/windows/nsis/installer.nsi 2009-04-01 20:53:48 UTC (rev 5457) @@ -33,7 +33,7 @@ !define IROOT "${VROOT}\${VNAME}" !define AROOT "Software\Classes" !define JAVA_MINIMUM "1.5.0_08" -!define JRE_URL "http://javadl.sun.com/webapps/download/AutoDL?BundleId=26223" +!define JRE_URL "http://javadl.sun.com/webapps/download/AutoDL?BundleId=29226" Name "VASSAL" OutFile "${TMPDIR}/VASSAL-${VERSION}-windows.exe" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ------------------------------------------------------------------------------ _______________________________________________ vassalengine-svn mailing list vas...@li... https://lists.sourceforge.net/lists/listinfo/vassalengine-svn |
From: <uck...@us...> - 2011-08-28 14:36:06
|
Revision: 7786 http://vassalengine.svn.sourceforge.net/vassalengine/?rev=7786&view=rev Author: uckelman Date: 2011-08-28 14:35:58 +0000 (Sun, 28 Aug 2011) Log Message: ----------- Bump JRE download to 6 Update 27, minumum JRE to 6 Update 22. Modified Paths: -------------- VASSAL-src/trunk/dist/windows/nsis/installer.nsi Modified: VASSAL-src/trunk/dist/windows/nsis/installer.nsi =================================================================== --- VASSAL-src/trunk/dist/windows/nsis/installer.nsi 2011-08-28 13:57:30 UTC (rev 7785) +++ VASSAL-src/trunk/dist/windows/nsis/installer.nsi 2011-08-28 14:35:58 UTC (rev 7786) @@ -32,9 +32,9 @@ !define VNAME "VASSAL (${VERSION})" !define IROOT "${VROOT}\${VNAME}" !define AROOT "Software\Classes" -!define JAVA_MINIMUM "1.6.0_21" +!define JAVA_MINIMUM "1.6.0_22" # FIXME: would be better if we read the download URL from our own site -!define JRE_URL "http://javadl.sun.com/webapps/download/AutoDL?BundleId=41723" +!define JRE_URL "http://javadl.sun.com/webapps/download/AutoDL?BundleId=52247" Name "VASSAL" OutFile "${TMPDIR}/VASSAL-${VERSION}-windows.exe" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ------------------------------------------------------------------------------ EMC VNX: the world's simplest storage, starting under $10K The only unified storage solution that offers unified management Up to 160% more powerful than alternatives and 25% more efficient. Guaranteed. http://p.sf.net/sfu/emc-vnx-dev2dev _______________________________________________ vassalengine-svn mailing list vas...@li... https://lists.sourceforge.net/lists/listinfo/vassalengine-svn |
From: <uck...@us...> - 2013-06-16 11:38:25
|
Revision: 8753 http://sourceforge.net/p/vassalengine/svn/8753 Author: uckelman Date: 2013-06-16 11:38:21 +0000 (Sun, 16 Jun 2013) Log Message: ----------- Two changes to the Windows installer for Bug 3934: * Set exec level to admin. * If user requests VASSAL to be run from installer, launch it via explorer.exe, which will be running with user privileges already. If VASSAL is launced as admin, then temp files written by JNA will be owned by the admin account, with the consequence that when VASSAL is launched from a user account, JNA will fail. Ensuring that VASSAL is launched from the installer as the user prevents this problem. Modified Paths: -------------- VASSAL-src/trunk/dist/windows/nsis/installer.nsi Modified: VASSAL-src/trunk/dist/windows/nsis/installer.nsi =================================================================== --- VASSAL-src/trunk/dist/windows/nsis/installer.nsi 2013-06-09 19:57:17 UTC (rev 8752) +++ VASSAL-src/trunk/dist/windows/nsis/installer.nsi 2013-06-16 11:38:21 UTC (rev 8753) @@ -43,6 +43,8 @@ InstallDir "$PROGRAMFILES\VASSAL" InstallDirRegKey HKLM "${IROOT}" "InstallLocation" +RequestExecutionLevel admin + # compression SetCompress auto SetCompressor /SOLID lzma @@ -659,7 +661,7 @@ Function launchApp - Exec "$INSTDIR\VASSAL.exe" + Exec '"$WINDIR\explorer.exe" "$INSTDIR\VASSAL.exe"' FunctionEnd This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ------------------------------------------------------------------------------ This SF.net email is sponsored by Windows: Build for Windows Store. http://p.sf.net/sfu/windows-dev2dev _______________________________________________ vassalengine-svn mailing list vas...@li... https://lists.sourceforge.net/lists/listinfo/vassalengine-svn |
From: <uck...@us...> - 2013-06-16 11:40:39
|
Revision: 8754 http://sourceforge.net/p/vassalengine/svn/8754 Author: uckelman Date: 2013-06-16 11:40:35 +0000 (Sun, 16 Jun 2013) Log Message: ----------- Added comment. Modified Paths: -------------- VASSAL-src/trunk/dist/windows/nsis/installer.nsi Modified: VASSAL-src/trunk/dist/windows/nsis/installer.nsi =================================================================== --- VASSAL-src/trunk/dist/windows/nsis/installer.nsi 2013-06-16 11:38:21 UTC (rev 8753) +++ VASSAL-src/trunk/dist/windows/nsis/installer.nsi 2013-06-16 11:40:35 UTC (rev 8754) @@ -661,6 +661,8 @@ Function launchApp + ; Launch via explorer.exe becuase it is already running as the user, + ; not as admin, which will launch us as user also. Exec '"$WINDIR\explorer.exe" "$INSTDIR\VASSAL.exe"' FunctionEnd This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ------------------------------------------------------------------------------ This SF.net email is sponsored by Windows: Build for Windows Store. http://p.sf.net/sfu/windows-dev2dev _______________________________________________ vassalengine-svn mailing list vas...@li... https://lists.sourceforge.net/lists/listinfo/vassalengine-svn |
From: <uck...@us...> - 2013-07-28 13:52:29
|
Revision: 8804 http://sourceforge.net/p/vassalengine/svn/8804 Author: uckelman Date: 2013-07-28 13:52:25 +0000 (Sun, 28 Jul 2013) Log Message: ----------- Default to a versioned install directory for Standard installs. Modified Paths: -------------- VASSAL-src/trunk/dist/windows/nsis/installer.nsi Modified: VASSAL-src/trunk/dist/windows/nsis/installer.nsi =================================================================== --- VASSAL-src/trunk/dist/windows/nsis/installer.nsi 2013-07-28 10:37:11 UTC (rev 8803) +++ VASSAL-src/trunk/dist/windows/nsis/installer.nsi 2013-07-28 13:52:25 UTC (rev 8804) @@ -40,7 +40,7 @@ Name "VASSAL" OutFile "${TMPDIR}/VASSAL-${VERSION}-windows.exe" -InstallDir "$PROGRAMFILES\VASSAL" +InstallDir "$PROGRAMFILES\VASSAL-${VERSION}" InstallDirRegKey HKLM "${IROOT}" "InstallLocation" RequestExecutionLevel admin @@ -347,11 +347,6 @@ Function leaveSetupType ; read the install type from the Custom radio button ${NSD_GetState} $CustomSetup $CustomSetup - - ; custom setups install to a versioned directory, by default - ${If} $CustomSetup == 1 - StrCpy $INSTDIR "$PROGRAMFILES\VASSAL-${VERSION}" - ${EndIf} FunctionEnd This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ------------------------------------------------------------------------------ See everything from the browser to the database with AppDynamics Get end-to-end visibility with application monitoring from AppDynamics Isolate bottlenecks and diagnose root cause in seconds. Start your free trial of AppDynamics Pro today! http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk _______________________________________________ vassalengine-svn mailing list vas...@li... https://lists.sourceforge.net/lists/listinfo/vassalengine-svn |
From: <uck...@us...> - 2013-07-31 20:55:31
|
Revision: 8807 http://sourceforge.net/p/vassalengine/svn/8807 Author: uckelman Date: 2013-07-31 20:55:25 +0000 (Wed, 31 Jul 2013) Log Message: ----------- Death to trailing whitespace. Modified Paths: -------------- VASSAL-src/trunk/dist/windows/nsis/installer.nsi Modified: VASSAL-src/trunk/dist/windows/nsis/installer.nsi =================================================================== --- VASSAL-src/trunk/dist/windows/nsis/installer.nsi 2013-07-30 00:49:55 UTC (rev 8806) +++ VASSAL-src/trunk/dist/windows/nsis/installer.nsi 2013-07-31 20:55:25 UTC (rev 8807) @@ -1,21 +1,21 @@ -# +# # $Id$ -# +# # Copyright (c) 2008-2012 by Joel Uckelman -# +# # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Library General Public # License (LGPL) as published by the Free Software Foundation. -# +# # This library is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # Library General Public License for more details. -# +# # You should have received a copy of the GNU Library General Public # License along with this library; if not, copies are available # at http://www.opensource.org. -# +# # # General Configuration @@ -27,10 +27,11 @@ ;!define TMPDIR "/home/uckelman/projects/VASSAL/uckelman-working/tmp" !define SRCDIR "${TMPDIR}/VASSAL-${VERSION}" -!define UROOT "Software\Microsoft\Windows\CurrentVersion\Uninstall\VASSAL (${VERSION})" +!define UNINST "Software\Microsoft\Windows\CurrentVersion\Uninstall" !define VROOT "Software\vassalengine.org\VASSAL" !define VNAME "VASSAL (${VERSION})" !define IROOT "${VROOT}\${VNAME}" +!define UROOT "${UNINST}\${VNAME}" !define AROOT "Software\Classes" !define JAVA_MINIMUM "1.6.0_45" # FIXME: would be better if we read the download URL from our own site @@ -40,8 +41,8 @@ Name "VASSAL" OutFile "${TMPDIR}/VASSAL-${VERSION}-windows.exe" -InstallDir "$PROGRAMFILES\VASSAL-${VERSION}" -InstallDirRegKey HKLM "${IROOT}" "InstallLocation" +; InstDir is set in .onInit based on the architecture +InstallDir "" RequestExecutionLevel admin @@ -175,7 +176,7 @@ Pop $0 ; if the mutex already existed, find the installer running before us - ${If} $0 != 0 + ${If} $0 != 0 StrLen $0 "${_MUTEX}" IntOp $0 $0 + 1 @@ -189,7 +190,7 @@ System::Call "user32::GetWindowText(i r1, t .r2, i r0) i." ${If} $2 == "${_MUTEX}" ; bring it to the front and die - System::Call "user32::ShowWindow(i r1,i 9) i." + System::Call "user32::ShowWindow(i r1,i 9) i." System::Call "user32::SetForegroundWindow(i r1) i." Abort ${EndIf} @@ -209,10 +210,10 @@ ; no PSAPI on Windows 9x and ME, so don't try there ${IfNot} ${IsNT} - Goto cannot_check + Goto cannot_check ${EndIf} -check_processes: +check_processes: ; allocate a buffer System::Alloc 1024 Pop $R9 @@ -223,7 +224,7 @@ System::Free $R9 Goto cannot_check ${EndIf} - + IntOp $R2 $R1 / 4 ; Divide by sizeof(DWORD) to get number of processes StrCpy $R4 0 ; R4 is our counter variable @@ -272,7 +273,7 @@ ${EndIf} System::Free $R7 - + next_iteration: IntOp $R4 $R4 + 1 ; Add 1 to our counter IntOp $R9 $R9 + 4 ; Add sizeof(int) to our buffer address @@ -305,12 +306,30 @@ # Functions # Function un.onInit + ${If} ${RunningX64} + SetRegView 64 + ${Else} + SetRegView 32 + ${EndIf} + ${ForceSingleton} "VASSAL-${VERSION}-uninstaller" ${WaitForVASSALToClose} FunctionEnd Function .onInit + ${If} ${RunningX64} + SetRegView 64 + ${If} $InstDir == "" ; /D= was not used on the command line + StrCpy $InstDir "$PROGRAMFILES64\VASSAL-${VERSION}" + ${EndIf} + ${Else} + SetRegView 32 + ${If} $InstDir == "" ; /D= was not used on the command line + StrCpy $InstDir "$PROGRAMFILES32\VASSAL-${VERSION}" + ${EndIf} + ${EndIf} + ${ForceSingleton} "VASSAL-installer" ${WaitForVASSALToClose} FunctionEnd @@ -362,7 +381,7 @@ ; remove all versions in Standard setup ; find all versions of VASSAL StrCpy $R0 0 - ${Do} + ${Do} EnumRegKey $0 HKLM "${VROOT}" $R0 StrCpy $RemoveOtherVersions "$RemoveOtherVersions$0$\n" IntOp $R0 $R0 + 1 @@ -414,9 +433,9 @@ ; populate the keep list StrCpy $R0 0 - ${Do} + ${Do} EnumRegKey $1 HKLM "${VROOT}" $R0 - + ${If} $1 != "" ${If} $1 == "${VNAME}" ; automatically uninstall existing copies of this version @@ -426,7 +445,7 @@ SendMessage $KeepListBox ${LB_ADDSTRING} 0 "STR:$1" Pop $0 ${EndIf} - + IntOp $R0 $R0 + 1 ${EndIf} ${LoopUntil} $1 == "" @@ -463,7 +482,7 @@ StrCpy $0 0 ${Else} StrCpy $0 1 - ${EndIf} + ${EndIf} EnableWindow $RemoveButton $0 SendMessage $RemoveListBox ${LB_GETCURSEL} 0 0 $0 @@ -471,7 +490,7 @@ StrCpy $0 0 ${Else} StrCpy $0 1 - ${EndIf} + ${EndIf} EnableWindow $KeepButton $0 FunctionEnd @@ -496,7 +515,7 @@ Function leaveUninstallOld ; find the uninstallers for old versions to be removed - SendMessage $RemoveListBox ${LB_GETCOUNT} 0 0 $1 + SendMessage $RemoveListBox ${LB_GETCOUNT} 0 0 $1 ${For} $0 0 $1 System::Call "user32::SendMessage(i $RemoveListBox,i ${LB_GETTEXT},i r0, t .r2)i .r4" StrCpy $RemoveOtherVersions "$RemoveOtherVersions$2$\n" @@ -511,7 +530,7 @@ Push $R1 Push $R2 - StrCpy $InstallJRE 0 ; set default + StrCpy $InstallJRE 0 ; set default ${GetJavaVersion} $1 ${VersionConvert} "$1" "_" $R1 @@ -532,7 +551,7 @@ ${Else} StrCpy $0 "The installer has found version $1 of the Java Runtime Environment (JRE) installed on your computer." ${EndIf} - + StrCpy $1 "We recommend running VASSAL with a JRE no older than version ${JAVA_MINIMUM}.$\n$\n$\n" ${If} $CustomSetup == 1 @@ -561,14 +580,14 @@ Function leaveJavaCheck ${If} $CustomSetup == 1 - ; read whether to install a JRE from the check box + ; read whether to install a JRE from the check box ${NSD_GetState} $InstallJRE $InstallJRE ${EndIf} FunctionEnd Function preDirectory - ${SkipIfNotCustom} + ${SkipIfNotCustom} FunctionEnd @@ -582,7 +601,7 @@ ; set shortcuts defaults StrCpy $AddDesktopSC 1 - StrCpy $AddStartMenuSC 1 + StrCpy $AddStartMenuSC 1 StrCpy $AddQuickLaunchSC 1 ; present user with choices in a custom install @@ -667,41 +686,48 @@ # Section "-Application" Application SectionIn RO - + ; remove old versions of VASSAL, if requested ${If} $RemoveOtherVersions != "" ; split version strings on '\n' ; there must be at least one '\n', or WordFind finds no words - StrCpy $0 1 ; word indices are 1-based + StrCpy $0 1 ; word indices are 1-based ${Do} - ${WordFind} "$RemoveOtherVersions" "$\n" "E+$0" $1 + ${WordFind} "$RemoveOtherVersions" "$\n" "E+$0" $1 IfErrors done notdone done: ${Break} - + notdone: DetailPrint "Uninstall: $1" - + + ; check that the uninstall key exists, otherwise clean up + ReadRegStr $2 HKLM "${UNINST}\$1" "" + IfErrors 0 +3 + DeleteRegKey HKLM "${VROOT}\$1" + Goto next + ; get old install and uninstaller paths - ReadRegStr $2 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\$1" "InstallLocation" - ReadRegStr $3 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\$1" "UninstallString" + ReadRegStr $2 HKLM "${UNINST}\$1" "InstallLocation" + ReadRegStr $3 HKLM "${UNINST}\$1" "UninstallString" ; copy the uninstaller to $TEMP CopyFiles "$3" "$TEMP" ${GetFileName} $3 $3 - ; run the uninstaller silently + ; run the uninstaller silently ExecWait '"$TEMP\$3" /S _?=$2' - IfErrors +2 0 + IfErrors 0 +2 + DetailPrint "Failed: $1" + Delete "$TEMP\$3" ; remove the uninstaller copy - Goto +2 - DetailPrint "Failed: $1" + + next: ClearErrors - IntOp $0 $0 + 1 ${Loop} ${EndIf} - + ; install a JRE, if necessary ${If} $InstallJRE == 1 ; choose a 64-bit JRE for 64-bit systems @@ -710,7 +736,7 @@ ${Else} StrCpy $R1 ${JRE_32_URL} ${EndIf} - + DetailPrint "Downloading a JRE from $R1" StrCpy $0 "$TEMP\jre_installer.exe" NSISdl::download /TIMEOUT=30000 $R1 $0 @@ -721,7 +747,7 @@ ${If} $CustomSetup == 1 ; provide a full JRE installer - ExecWait $0 + ExecWait $0 ${Else} ; provide a JRE installer requiring no user interaction ; options reference: http://java.sun.com/javase/6/docs/technotes/guides/deployment/deployment-guide/silent.html @@ -737,7 +763,7 @@ ; write keys to the registry WriteRegStr HKLM "${IROOT}" "InstallLocation" "$INSTDIR" - + ; write registry keys for uninstaller WriteRegStr HKLM "${UROOT}" "DisplayName" "VASSAL (${VERSION})" WriteRegStr HKLM "${UROOT}" "DisplayVersion" "${VERSION}" @@ -826,7 +852,7 @@ ${If} $0 != "" Delete "$0" ${EndIf} - + ; delete the Start Menu items ReadRegStr $0 HKLM "${UROOT}" "StartMenuShortcut" ${If} $0 != "" @@ -841,6 +867,12 @@ DeleteRegKey HKLM "${IROOT}" DeleteRegKey HKLM "${UROOT}" + ${If} ${RunningX64} + ; kill the 32-bit registry tree if empty + DeleteRegKey HKLM /ifempty "Software\Wow6432Node\vassalengine.org\VASSAL" + DeleteRegKey HKLM /ifempty "Software\Wow6432Node\vassalengine.org" + ${EndIf} + ; remove file associations DeleteRegKey HKLM "${AROOT}\.vmod" DeleteRegKey HKLM "${AROOT}\VASSALModule" @@ -853,11 +885,10 @@ ; notify Windows that file associations have changed ${RefreshShellIcons} - + ; delete the installed files and directories !include "${TMPDIR}/uninstall_files.inc" - ; delete VASSAL if empty - RMDir "$PROGRAMFILES\VASSAL" + ; delete VASSAL from start menu if empty RMDir "$SMPROGRAMS\VASSAL" -SectionEnd +SectionEnd This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ------------------------------------------------------------------------------ Get your SQL database under version control now! Version control is standard for application code, but databases havent caught up. So what steps can you take to put your SQL databases under version control? Why should you start doing it? Read more to find out. http://pubads.g.doubleclick.net/gampad/clk?id=49501711&iu=/4140/ostg.clktrk _______________________________________________ vassalengine-svn mailing list vas...@li... https://lists.sourceforge.net/lists/listinfo/vassalengine-svn |
From: <uck...@us...> - 2013-07-31 20:55:37
|
Revision: 8808 http://sourceforge.net/p/vassalengine/svn/8808 Author: uckelman Date: 2013-07-31 20:55:30 +0000 (Wed, 31 Jul 2013) Log Message: ----------- Defined SetNativeRegView to reset registry view to whatever is native for the machine on which the installer is running. Modified Paths: -------------- VASSAL-src/trunk/dist/windows/nsis/installer.nsi Modified: VASSAL-src/trunk/dist/windows/nsis/installer.nsi =================================================================== --- VASSAL-src/trunk/dist/windows/nsis/installer.nsi 2013-07-31 20:55:25 UTC (rev 8807) +++ VASSAL-src/trunk/dist/windows/nsis/installer.nsi 2013-07-31 20:55:30 UTC (rev 8808) @@ -154,6 +154,19 @@ # Macros # + +; sets registry to architecture-appropriate one +!macro SetNativeRegView + ${If} ${RunningX64} + SetRegView 64 + ${Else} + SetRegView 32 + ${EndIf} +!macroend + +!define SetNativeRegView "!insertmacro SetNativeRegView" + + ; skips a page in a Standard install !macro SkipIfNotCustom ${If} $CustomSetup == 0 @@ -306,26 +319,19 @@ # Functions # Function un.onInit - ${If} ${RunningX64} - SetRegView 64 - ${Else} - SetRegView 32 - ${EndIf} - + ${SetNativeRegView} ${ForceSingleton} "VASSAL-${VERSION}-uninstaller" ${WaitForVASSALToClose} FunctionEnd Function .onInit - ${If} ${RunningX64} - SetRegView 64 - ${If} $InstDir == "" ; /D= was not used on the command line + ${SetNativeRegView} + + ${If} $InstDir == "" ; /D= was not used on the command line + ${If} ${RunningX64} StrCpy $InstDir "$PROGRAMFILES64\VASSAL-${VERSION}" - ${EndIf} - ${Else} - SetRegView 32 - ${If} $InstDir == "" ; /D= was not used on the command line + ${Else} StrCpy $InstDir "$PROGRAMFILES32\VASSAL-${VERSION}" ${EndIf} ${EndIf} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ------------------------------------------------------------------------------ Get your SQL database under version control now! Version control is standard for application code, but databases havent caught up. So what steps can you take to put your SQL databases under version control? Why should you start doing it? Read more to find out. http://pubads.g.doubleclick.net/gampad/clk?id=49501711&iu=/4140/ostg.clktrk _______________________________________________ vassalengine-svn mailing list vas...@li... https://lists.sourceforge.net/lists/listinfo/vassalengine-svn |
From: <uck...@us...> - 2013-07-31 20:55:40
|
Revision: 8809 http://sourceforge.net/p/vassalengine/svn/8809 Author: uckelman Date: 2013-07-31 20:55:35 +0000 (Wed, 31 Jul 2013) Log Message: ----------- Clarified comment. Modified Paths: -------------- VASSAL-src/trunk/dist/windows/nsis/installer.nsi Modified: VASSAL-src/trunk/dist/windows/nsis/installer.nsi =================================================================== --- VASSAL-src/trunk/dist/windows/nsis/installer.nsi 2013-07-31 20:55:30 UTC (rev 8808) +++ VASSAL-src/trunk/dist/windows/nsis/installer.nsi 2013-07-31 20:55:35 UTC (rev 8809) @@ -520,7 +520,7 @@ Function leaveUninstallOld - ; find the uninstallers for old versions to be removed + ; collect the old versions to be removed from the remove list box SendMessage $RemoveListBox ${LB_GETCOUNT} 0 0 $1 ${For} $0 0 $1 System::Call "user32::SendMessage(i $RemoveListBox,i ${LB_GETTEXT},i r0, t .r2)i .r4" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ------------------------------------------------------------------------------ Get your SQL database under version control now! Version control is standard for application code, but databases havent caught up. So what steps can you take to put your SQL databases under version control? Why should you start doing it? Read more to find out. http://pubads.g.doubleclick.net/gampad/clk?id=49501711&iu=/4140/ostg.clktrk _______________________________________________ vassalengine-svn mailing list vas...@li... https://lists.sourceforge.net/lists/listinfo/vassalengine-svn |
From: <uck...@us...> - 2013-07-31 20:55:47
|
Revision: 8810 http://sourceforge.net/p/vassalengine/svn/8810 Author: uckelman Date: 2013-07-31 20:55:40 +0000 (Wed, 31 Jul 2013) Log Message: ----------- Arguments in wrong order for DeleteRegKey. Modified Paths: -------------- VASSAL-src/trunk/dist/windows/nsis/installer.nsi Modified: VASSAL-src/trunk/dist/windows/nsis/installer.nsi =================================================================== --- VASSAL-src/trunk/dist/windows/nsis/installer.nsi 2013-07-31 20:55:35 UTC (rev 8809) +++ VASSAL-src/trunk/dist/windows/nsis/installer.nsi 2013-07-31 20:55:40 UTC (rev 8810) @@ -875,8 +875,8 @@ ${If} ${RunningX64} ; kill the 32-bit registry tree if empty - DeleteRegKey HKLM /ifempty "Software\Wow6432Node\vassalengine.org\VASSAL" - DeleteRegKey HKLM /ifempty "Software\Wow6432Node\vassalengine.org" + DeleteRegKey /ifempty HKLM "Software\Wow6432Node\vassalengine.org\VASSAL" + DeleteRegKey /ifempty HKLM "Software\Wow6432Node\vassalengine.org" ${EndIf} ; remove file associations This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ------------------------------------------------------------------------------ Get your SQL database under version control now! Version control is standard for application code, but databases havent caught up. So what steps can you take to put your SQL databases under version control? Why should you start doing it? Read more to find out. http://pubads.g.doubleclick.net/gampad/clk?id=49501711&iu=/4140/ostg.clktrk _______________________________________________ vassalengine-svn mailing list vas...@li... https://lists.sourceforge.net/lists/listinfo/vassalengine-svn |
From: <uck...@us...> - 2013-08-06 18:13:10
|
Revision: 8811 http://sourceforge.net/p/vassalengine/svn/8811 Author: uckelman Date: 2013-08-06 18:13:06 +0000 (Tue, 06 Aug 2013) Log Message: ----------- Cleanup: Don't define labels we don't need. Modified Paths: -------------- VASSAL-src/trunk/dist/windows/nsis/installer.nsi Modified: VASSAL-src/trunk/dist/windows/nsis/installer.nsi =================================================================== --- VASSAL-src/trunk/dist/windows/nsis/installer.nsi 2013-07-31 20:55:40 UTC (rev 8810) +++ VASSAL-src/trunk/dist/windows/nsis/installer.nsi 2013-08-06 18:13:06 UTC (rev 8811) @@ -194,20 +194,20 @@ IntOp $0 $0 + 1 ; loop until we find the other installer -loop: - FindWindow $1 '#32770' '' 0 $1 - ${If} $1 == 0 - Abort - ${EndIf} + ${Do} + FindWindow $1 '#32770' '' 0 $1 + ${If} $1 == 0 + Abort + ${EndIf} - System::Call "user32::GetWindowText(i r1, t .r2, i r0) i." - ${If} $2 == "${_MUTEX}" - ; bring it to the front and die - System::Call "user32::ShowWindow(i r1,i 9) i." - System::Call "user32::SetForegroundWindow(i r1) i." - Abort - ${EndIf} - Goto loop + System::Call "user32::GetWindowText(i r1, t .r2, i r0) i." + ${If} $2 == "${_MUTEX}" + ; bring it to the front and die + System::Call "user32::ShowWindow(i r1,i 9) i." + System::Call "user32::SetForegroundWindow(i r1) i." + Abort + ${EndIf} + ${Loop} ${EndIf} !macroend This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ------------------------------------------------------------------------------ Get 100% visibility into Java/.NET code with AppDynamics Lite! It's a free troubleshooting tool designed for production. Get down to code-level detail for bottlenecks, with <2% overhead. Download for free and get started troubleshooting in minutes. http://pubads.g.doubleclick.net/gampad/clk?id=48897031&iu=/4140/ostg.clktrk _______________________________________________ vassalengine-svn mailing list vas...@li... https://lists.sourceforge.net/lists/listinfo/vassalengine-svn |
From: <uck...@us...> - 2013-08-06 18:13:14
|
Revision: 8812 http://sourceforge.net/p/vassalengine/svn/8812 Author: uckelman Date: 2013-08-06 18:13:11 +0000 (Tue, 06 Aug 2013) Log Message: ----------- Fixed Bug 10369: Windows installer doesn't find older installs on 64-bit systems Check the 32-bit registry hive for old installs. Modified Paths: -------------- VASSAL-src/trunk/dist/windows/nsis/installer.nsi Modified: VASSAL-src/trunk/dist/windows/nsis/installer.nsi =================================================================== --- VASSAL-src/trunk/dist/windows/nsis/installer.nsi 2013-08-06 18:13:06 UTC (rev 8811) +++ VASSAL-src/trunk/dist/windows/nsis/installer.nsi 2013-08-06 18:13:11 UTC (rev 8812) @@ -305,6 +305,23 @@ !define WaitForVASSALToClose "!insertmacro WaitForVASSALToClose" + + +!macro FindVASSALVersions + StrCpy $R0 0 + ${Do} + EnumRegKey $0 HKLM "${VROOT}" $R0 + ${WordFind} "$RemoveOtherVersions" "$\n" "E/$R0" $1 + IfErrors 0 +2 + StrCpy $RemoveOtherVersions "$RemoveOtherVersions$0$\n" + ClearErrors + IntOp $R0 $R0 + 1 + ${LoopUntil} $0 == "" +!macroend + +!define FindVASSALVersions "!insertmacro FindVASSALVersions" + + # # Setup Option Variables # @@ -383,30 +400,21 @@ Function preUninstallOld StrCpy $RemoveOtherVersions "" - ${If} $CustomSetup != 1 - ; remove all versions in Standard setup - ; find all versions of VASSAL - StrCpy $R0 0 - ${Do} - EnumRegKey $0 HKLM "${VROOT}" $R0 - StrCpy $RemoveOtherVersions "$RemoveOtherVersions$0$\n" - IntOp $R0 $R0 + 1 - ${LoopUntil} $0 == "" - ${EndIf} + ; find all versions of VASSAL, checking the 32- and 64-bit hives + SetRegView 32 + ${FindVASSALVersions} + SetRegView 64 + ${FindVASSALVersions} + ${SetNativeRegView} + ; remove all versions in Standard setup, skip this page ${SkipIfNotCustom} - EnumRegKey $0 HKLM "${VROOT}" 0 - ${If} $0 == "" - ; skip this page if we find no other versions + ${If} $RemoveOtherVersions == "" + ; no versions installed, skip this page + ${OrIf} $RemoveOtherVersions == "${VNAME}$\n" + ; only this version installed, remove it and skip this page Abort - ${ElseIf} $0 == "${VNAME}" - ; remove this version and skip this page if we find only this version - EnumRegKey $0 HKLM "${VROOT}" 1 - ${If} $0 == "" - StrCpy $RemoveOtherVersions "${VNAME}$\n" - Abort - ${EndIf} ${EndIf} !insertmacro MUI_HEADER_TEXT "Remove Old Versions" "Uninstalling previous versions of VASSAL" @@ -438,23 +446,25 @@ Pop $RemoveListBox ; populate the keep list + StrCpy $R1 "$RemoveOtherVersions" + StrCpy $RemoveOtherVersions "" StrCpy $R0 0 ${Do} - EnumRegKey $1 HKLM "${VROOT}" $R0 + IntOp $R0 $R0 + 1 + ${WordFind} "$R1" "$\n" "E+$R0" $1 + IfErrors 0 +3 + ClearErrors + ${Break} - ${If} $1 != "" - ${If} $1 == "${VNAME}" - ; automatically uninstall existing copies of this version - StrCpy $RemoveOtherVersions "${VNAME}$\n" - ${Else} - ; add entries for versions which are not this one - SendMessage $KeepListBox ${LB_ADDSTRING} 0 "STR:$1" - Pop $0 - ${EndIf} - - IntOp $R0 $R0 + 1 + ${If} $1 == "${VNAME}" + ; automatically uninstall existing copies of this version + StrCpy $RemoveOtherVersions "${VNAME}$\n" + ${Else} + ; add entries for versions which are not this one + SendMessage $KeepListBox ${LB_ADDSTRING} 0 "STR:$1" + Pop $0 ${EndIf} - ${LoopUntil} $1 == "" + ${Loop} ; ready the buttons SendMessage $KeepListBox ${LB_SETCURSEL} 0 0 @@ -697,41 +707,48 @@ ${If} $RemoveOtherVersions != "" ; split version strings on '\n' ; there must be at least one '\n', or WordFind finds no words - StrCpy $0 1 ; word indices are 1-based + StrCpy $0 0 ; word indices are 1-based ${Do} + IntOp $0 $0 + 1 ${WordFind} "$RemoveOtherVersions" "$\n" "E+$0" $1 - IfErrors done notdone - done: - ${Break} + IfErrors 0 +2 + ${Break} - notdone: - DetailPrint "Uninstall: $1" + DetailPrint "Uninstall: $1" - ; check that the uninstall key exists, otherwise clean up - ReadRegStr $2 HKLM "${UNINST}\$1" "" - IfErrors 0 +3 - DeleteRegKey HKLM "${VROOT}\$1" - Goto next + ; look for 64-bit install + ${If} ${RunningX64} + SetRegView 64 ; get old install and uninstaller paths ReadRegStr $2 HKLM "${UNINST}\$1" "InstallLocation" ReadRegStr $3 HKLM "${UNINST}\$1" "UninstallString" + IfErrors 0 found + ClearErrors + ${EndIf} - ; copy the uninstaller to $TEMP - CopyFiles "$3" "$TEMP" - ${GetFileName} $3 $3 + ; look for 32-bit install + SetRegView 32 + ReadRegStr $2 HKLM "${UNINST}\$1" "InstallLocation" + ReadRegStr $3 HKLM "${UNINST}\$1" "UninstallString" + IfErrors 0 found + ClearErrors + ${Continue} - ; run the uninstaller silently - ExecWait '"$TEMP\$3" /S _?=$2' - IfErrors 0 +2 - DetailPrint "Failed: $1" + found: + ; copy the uninstaller to $TEMP + CopyFiles "$3" "$TEMP" + ${GetFileName} $3 $3 - Delete "$TEMP\$3" ; remove the uninstaller copy + ; run the uninstaller silently + ExecWait '"$TEMP\$3" /S _?=$2' + IfErrors 0 +2 + DetailPrint "Failed: $1" + ClearErrors - next: - ClearErrors - IntOp $0 $0 + 1 + Delete "$TEMP\$3" ; remove the uninstaller copy ${Loop} + ${SetNativeRegView} ${EndIf} ; install a JRE, if necessary This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ------------------------------------------------------------------------------ Get 100% visibility into Java/.NET code with AppDynamics Lite! It's a free troubleshooting tool designed for production. Get down to code-level detail for bottlenecks, with <2% overhead. Download for free and get started troubleshooting in minutes. http://pubads.g.doubleclick.net/gampad/clk?id=48897031&iu=/4140/ostg.clktrk _______________________________________________ vassalengine-svn mailing list vas...@li... https://lists.sourceforge.net/lists/listinfo/vassalengine-svn |
From: <uck...@us...> - 2013-08-06 18:22:58
|
Revision: 8813 http://sourceforge.net/p/vassalengine/svn/8813 Author: uckelman Date: 2013-08-06 18:22:51 +0000 (Tue, 06 Aug 2013) Log Message: ----------- Removed useless registry key. We don't need to write to anything outside of the uninstall tree. Modified Paths: -------------- VASSAL-src/trunk/dist/windows/nsis/installer.nsi Modified: VASSAL-src/trunk/dist/windows/nsis/installer.nsi =================================================================== --- VASSAL-src/trunk/dist/windows/nsis/installer.nsi 2013-08-06 18:13:11 UTC (rev 8812) +++ VASSAL-src/trunk/dist/windows/nsis/installer.nsi 2013-08-06 18:22:51 UTC (rev 8813) @@ -30,7 +30,6 @@ !define UNINST "Software\Microsoft\Windows\CurrentVersion\Uninstall" !define VROOT "Software\vassalengine.org\VASSAL" !define VNAME "VASSAL (${VERSION})" -!define IROOT "${VROOT}\${VNAME}" !define UROOT "${UNINST}\${VNAME}" !define AROOT "Software\Classes" !define JAVA_MINIMUM "1.6.0_45" @@ -784,9 +783,6 @@ ; set the files to bundle !include "${TMPDIR}/install_files.inc" - ; write keys to the registry - WriteRegStr HKLM "${IROOT}" "InstallLocation" "$INSTDIR" - ; write registry keys for uninstaller WriteRegStr HKLM "${UROOT}" "DisplayName" "VASSAL (${VERSION})" WriteRegStr HKLM "${UROOT}" "DisplayVersion" "${VERSION}" @@ -887,7 +883,6 @@ RMDir "$SMPROGRAMS\$StartMenuFolder" ; delete registry keys - DeleteRegKey HKLM "${IROOT}" DeleteRegKey HKLM "${UROOT}" ${If} ${RunningX64} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ------------------------------------------------------------------------------ Get 100% visibility into Java/.NET code with AppDynamics Lite! It's a free troubleshooting tool designed for production. Get down to code-level detail for bottlenecks, with <2% overhead. Download for free and get started troubleshooting in minutes. http://pubads.g.doubleclick.net/gampad/clk?id=48897031&iu=/4140/ostg.clktrk _______________________________________________ vassalengine-svn mailing list vas...@li... https://lists.sourceforge.net/lists/listinfo/vassalengine-svn |
From: <uck...@us...> - 2013-08-07 04:07:01
|
Revision: 8814 http://sourceforge.net/p/vassalengine/svn/8814 Author: uckelman Date: 2013-08-07 04:06:56 +0000 (Wed, 07 Aug 2013) Log Message: ----------- More aggressively clean up old registry keys. Modified Paths: -------------- VASSAL-src/trunk/dist/windows/nsis/installer.nsi Modified: VASSAL-src/trunk/dist/windows/nsis/installer.nsi =================================================================== --- VASSAL-src/trunk/dist/windows/nsis/installer.nsi 2013-08-06 18:22:51 UTC (rev 8813) +++ VASSAL-src/trunk/dist/windows/nsis/installer.nsi 2013-08-07 04:06:56 UTC (rev 8814) @@ -730,11 +730,11 @@ SetRegView 32 ReadRegStr $2 HKLM "${UNINST}\$1" "InstallLocation" ReadRegStr $3 HKLM "${UNINST}\$1" "UninstallString" - IfErrors 0 found - ClearErrors - ${Continue} + IfErrors cleanup found found: + IfFileExists "$3" 0 cleanup + ; copy the uninstaller to $TEMP CopyFiles "$3" "$TEMP" ${GetFileName} $3 $3 @@ -746,7 +746,22 @@ ClearErrors Delete "$TEMP\$3" ; remove the uninstaller copy + + cleanup: + ClearErrors + + ; clean up leftover reg keys + ${If} ${RunningX64} + SetRegView 64 + DeleteRegKey HKLM "${VROOT}\$1" + DeleteRegKey HKLM "${UNINST}\$1" + ${EndIf} + + SetRegView 32 + DeleteRegKey HKLM "${VROOT}\$1" + DeleteRegKey HKLM "${UNINST}\$1" ${Loop} + ${SetNativeRegView} ${EndIf} @@ -891,6 +906,10 @@ DeleteRegKey /ifempty HKLM "Software\Wow6432Node\vassalengine.org" ${EndIf} + ; kill the registry tree if empty + DeleteRegKey /ifempty HKLM "Software\vassalengine.org\VASSAL" + DeleteRegKey /ifempty HKLM "Software\\vassalengine.org" + ; remove file associations DeleteRegKey HKLM "${AROOT}\.vmod" DeleteRegKey HKLM "${AROOT}\VASSALModule" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ------------------------------------------------------------------------------ Get 100% visibility into Java/.NET code with AppDynamics Lite! It's a free troubleshooting tool designed for production. Get down to code-level detail for bottlenecks, with <2% overhead. Download for free and get started troubleshooting in minutes. http://pubads.g.doubleclick.net/gampad/clk?id=48897031&iu=/4140/ostg.clktrk _______________________________________________ vassalengine-svn mailing list vas...@li... https://lists.sourceforge.net/lists/listinfo/vassalengine-svn |
From: <uck...@us...> - 2014-02-23 13:28:38
|
Revision: 9019 http://sourceforge.net/p/vassalengine/svn/9019 Author: uckelman Date: 2014-02-23 13:28:34 +0000 (Sun, 23 Feb 2014) Log Message: ----------- Be more paranoid about setting the native registry view, so that we're not accidentally writing keys to the wrong one. Modified Paths: -------------- VASSAL-src/trunk/dist/windows/nsis/installer.nsi Modified: VASSAL-src/trunk/dist/windows/nsis/installer.nsi =================================================================== --- VASSAL-src/trunk/dist/windows/nsis/installer.nsi 2014-02-22 22:56:11 UTC (rev 9018) +++ VASSAL-src/trunk/dist/windows/nsis/installer.nsi 2014-02-23 13:28:34 UTC (rev 9019) @@ -761,10 +761,10 @@ DeleteRegKey HKLM "${VROOT}\$1" DeleteRegKey HKLM "${UNINST}\$1" ${Loop} - - ${SetNativeRegView} ${EndIf} + ${SetNativeRegView} + ; install a JRE, if necessary ${If} $InstallJRE == 1 ; choose a 64-bit JRE for 64-bit systems @@ -795,6 +795,8 @@ DetailPrint "Installed a JRE" ${EndIf} + ${SetNativeRegView} + ; set the files to bundle !include "${TMPDIR}/install_files.inc" @@ -872,6 +874,8 @@ # Uninstall Section # Section Uninstall + ${SetNativeRegView} + ; delete the uninstaller Delete "$INSTDIR\uninst.exe" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ------------------------------------------------------------------------------ Managing the Performance of Cloud-Based Applications Take advantage of what the Cloud has to offer - Avoid Common Pitfalls. Read the Whitepaper. http://pubads.g.doubleclick.net/gampad/clk?id=121054471&iu=/4140/ostg.clktrk _______________________________________________ vassalengine-svn mailing list vas...@li... https://lists.sourceforge.net/lists/listinfo/vassalengine-svn |
From: <uck...@us...> - 2014-02-26 19:20:41
|
Revision: 9021 http://sourceforge.net/p/vassalengine/svn/9021 Author: uckelman Date: 2014-02-26 19:20:37 +0000 (Wed, 26 Feb 2014) Log Message: ----------- Fixed Bug 10897: Windows uninstaller unconditionally removes file associations Modified Paths: -------------- VASSAL-src/trunk/dist/windows/nsis/installer.nsi Modified: VASSAL-src/trunk/dist/windows/nsis/installer.nsi =================================================================== --- VASSAL-src/trunk/dist/windows/nsis/installer.nsi 2014-02-26 19:20:28 UTC (rev 9020) +++ VASSAL-src/trunk/dist/windows/nsis/installer.nsi 2014-02-26 19:20:37 UTC (rev 9021) @@ -763,8 +763,6 @@ ${Loop} ${EndIf} - ${SetNativeRegView} - ; install a JRE, if necessary ${If} $InstallJRE == 1 ; choose a 64-bit JRE for 64-bit systems @@ -912,20 +910,28 @@ ; kill the registry tree if empty DeleteRegKey /ifempty HKLM "Software\vassalengine.org\VASSAL" - DeleteRegKey /ifempty HKLM "Software\\vassalengine.org" + DeleteRegKey /ifempty HKLM "Software\vassalengine.org" - ; remove file associations - DeleteRegKey HKLM "${AROOT}\.vmod" - DeleteRegKey HKLM "${AROOT}\VASSALModule" + ; remove file associations if they are ours + ReadRegStr $0 HKLM "${AROOT}\VASSALModule\shell\open\command" "" + ${If} $0 != "" + ; the file associations are ours if they start with our $INSTDIR + StrLen $1 "$INSTDIR\" + StrCpy $0 $0 $1 0 + ${If} $0 == "$INSTDIR\" + DeleteRegKey HKLM "${AROOT}\.vmod" + DeleteRegKey HKLM "${AROOT}\VASSALModule" - DeleteRegKey HKLM "${AROOT}\.vlog" - DeleteRegKey HKLM "${AROOT}\VASSALGameLog" + DeleteRegKey HKLM "${AROOT}\.vlog" + DeleteRegKey HKLM "${AROOT}\VASSALGameLog" - DeleteRegKey HKLM "${AROOT}\.vsav" - DeleteRegKey HKLM "${AROOT}\VASSALSavedGame" + DeleteRegKey HKLM "${AROOT}\.vsav" + DeleteRegKey HKLM "${AROOT}\VASSALSavedGame" - ; notify Windows that file associations have changed - ${RefreshShellIcons} + ; notify Windows that file associations have changed + ${RefreshShellIcons} + ${EndIf} + ${EndIf} ; delete the installed files and directories !include "${TMPDIR}/uninstall_files.inc" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ------------------------------------------------------------------------------ Flow-based real-time traffic analytics software. Cisco certified tool. Monitor traffic, SLAs, QoS, Medianet, WAAS etc. with NetFlow Analyzer Customize your own dashboards, set traffic alerts and generate reports. Network behavioral analysis & security monitoring. All-in-one tool. http://pubads.g.doubleclick.net/gampad/clk?id=126839071&iu=/4140/ostg.clktrk _______________________________________________ vassalengine-svn mailing list vas...@li... https://lists.sourceforge.net/lists/listinfo/vassalengine-svn |
From: <uck...@us...> - 2014-07-10 17:08:34
|
Revision: 9125 http://sourceforge.net/p/vassalengine/svn/9125 Author: uckelman Date: 2014-07-10 17:08:30 +0000 (Thu, 10 Jul 2014) Log Message: ----------- Fixed Bug 11148: Windows installer fails to uninstall old versions since 3.2.9 Solution is to check Software\Microsoft\Windows\CurrentVersion\Uninstall instead, which works for all versions. Modified Paths: -------------- VASSAL-src/trunk/dist/windows/nsis/installer.nsi Modified: VASSAL-src/trunk/dist/windows/nsis/installer.nsi =================================================================== --- VASSAL-src/trunk/dist/windows/nsis/installer.nsi 2014-07-01 21:19:19 UTC (rev 9124) +++ VASSAL-src/trunk/dist/windows/nsis/installer.nsi 2014-07-10 17:08:30 UTC (rev 9125) @@ -28,7 +28,6 @@ !define SRCDIR "${TMPDIR}/VASSAL-${VERSION}" !define UNINST "Software\Microsoft\Windows\CurrentVersion\Uninstall" -!define VROOT "Software\vassalengine.org\VASSAL" !define VNAME "VASSAL (${VERSION})" !define UROOT "${UNINST}\${VNAME}" !define AROOT "Software\Classes" @@ -309,11 +308,14 @@ !macro FindVASSALVersions StrCpy $R0 0 ${Do} - EnumRegKey $0 HKLM "${VROOT}" $R0 - ${WordFind} "$RemoveOtherVersions" "$\n" "E/$R0" $1 - IfErrors 0 +2 - StrCpy $RemoveOtherVersions "$RemoveOtherVersions$0$\n" - ClearErrors + EnumRegKey $0 HKLM "${UNINST}" $R0 + StrCpy $R1 "$0" 8 + ${If} $R1 == "VASSAL (" + ${WordFind} "$RemoveOtherVersions" "$\n" "E/$R0" $1 + IfErrors 0 +2 + StrCpy $RemoveOtherVersions "$RemoveOtherVersions$0$\n" + ClearErrors + ${EndIf} IntOp $R0 $R0 + 1 ${LoopUntil} $0 == "" !macroend @@ -753,12 +755,10 @@ ; clean up leftover reg keys ${If} ${RunningX64} SetRegView 64 - DeleteRegKey HKLM "${VROOT}\$1" DeleteRegKey HKLM "${UNINST}\$1" ${EndIf} SetRegView 32 - DeleteRegKey HKLM "${VROOT}\$1" DeleteRegKey HKLM "${UNINST}\$1" ${Loop} ${EndIf} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ------------------------------------------------------------------------------ Open source business process management suite built on Java and Eclipse Turn processes into business applications with Bonita BPM Community Edition Quickly connect people, data, and systems into organized workflows Winner of BOSSIE, CODIE, OW2 and Gartner awards http://p.sf.net/sfu/Bonitasoft _______________________________________________ vassalengine-svn mailing list vas...@li... https://lists.sourceforge.net/lists/listinfo/vassalengine-svn |