[matroska] r1190 - trunk/MatroskaPack/Satsuki

Author: robux4
Date: 2005-05-23 14:30:38 +0400 (Mon, 23 May 2005)
New Revision: 1190

Modified:
   trunk/MatroskaPack/Satsuki/Matroska_Pack_Full.nsi
   trunk/MatroskaPack/Satsuki/Matroska_Pack_Lite.nsi
   trunk/MatroskaPack/Satsuki/Matroska_Pack_var.nsh
Log:
pack: unregister Gabest's splitter prior to our installation (otherwise Haali's is never used)

Modified: trunk/MatroskaPack/Satsuki/Matroska_Pack_Full.nsi
===================================================================
--- trunk/MatroskaPack/Satsuki/Matroska_Pack_Full.nsi	2005-05-23 09:14:40 UTC (rev 1189)
+++ trunk/MatroskaPack/Satsuki/Matroska_Pack_Full.nsi	2005-05-23 10:30:38 UTC (rev 1190)
@@ -119,7 +119,7 @@
     
     ; Check for Windows
     call VerifWindowsVersion
-    strcmp $UNCICODEF "oui" nonw9x
+   strcmp $UNCICODEF "oui" nonw9x
     MessageBox MB_OK|MB_ICONEXCLAMATION $(SecNotFullW9x) IDOK 0
     Abort
     
@@ -148,6 +148,11 @@
 	ExecWait '"$R1\uninstall.exe" /S _?=$R1'
   suiteuninstall:
 ; version 1.0.3-
+;  Gabest's Splitter
+    ReadRegStr $R1 HKCR "CLSID\{0A68C3B5-9164-4A54-AFAF-995B2FF0E0D4}\InprocServer32" ""
+    IfFileExists "$R1" 0 nogabest
+    ExecWait 'regsvr32 /u /s "$R1"'
+  nogabest:
     ReadRegStr $R1 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Matroska Pack" UninstallString
     IfFileExists "$R1" 0 suiteinstall
     ExecWait "$R1 /S"

Modified: trunk/MatroskaPack/Satsuki/Matroska_Pack_Lite.nsi
===================================================================
--- trunk/MatroskaPack/Satsuki/Matroska_Pack_Lite.nsi	2005-05-23 09:14:40 UTC (rev 1189)
+++ trunk/MatroskaPack/Satsuki/Matroska_Pack_Lite.nsi	2005-05-23 10:30:38 UTC (rev 1190)
@@ -135,10 +135,21 @@
 functionend
 
 Section "-UninstallPrevious"
+; version 1.1.0+
 	ReadRegStr $R1 HKCU "Software\Matroska Pack" ""
-	IfFileExists "$R1\uninstall.exe" desinstallpack suiteinstall
+	IfFileExists "$R1\uninstall.exe" desinstallpack suiteuninstall
   desinstallpack:
 	ExecWait '"$R1\uninstall.exe" /S _?=$R1'
+  suiteuninstall:
+; version 1.0.3-
+;  Gabest's Splitter
+    ReadRegStr $R1 HKCR "CLSID\{0A68C3B5-9164-4A54-AFAF-995B2FF0E0D4}\InprocServer32" ""
+    IfFileExists "$R1" 0 nogabest
+    ExecWait 'regsvr32 /u /s "$R1"'
+  nogabest:
+    ReadRegStr $R1 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Matroska Pack" UninstallString
+    IfFileExists "$R1" 0 suiteinstall
+    ExecWait "$R1 /S"
   suiteinstall:
 	WriteRegStr HKCU "Software\Matroska Pack" "" $INSTDIR
 	!insertmacro MUI_STARTMENU_WRITE_BEGIN Application

Modified: trunk/MatroskaPack/Satsuki/Matroska_Pack_var.nsh
===================================================================
--- trunk/MatroskaPack/Satsuki/Matroska_Pack_var.nsh	2005-05-23 09:14:40 UTC (rev 1189)
+++ trunk/MatroskaPack/Satsuki/Matroska_Pack_var.nsh	2005-05-23 10:30:38 UTC (rev 1190)
@@ -1,13 +1,13 @@
 !define VERSION_MAJOR "1.1.1"
-!define VERSION_MINOR "1187"      ; should correspond to the latest SVN version
+!define VERSION_MINOR "1188"      ; should correspond to the latest SVN version
 !define VERSION_RC    "1"
 !define VERSION_BETA  "2"
 
 ;!define RELEASE_CAN "yep"
-!define BETA        "yep"
+;!define BETA        "yep"
 
 
-!define VerHaali       "v03-05-2005"
+!define VerHaali       "v21-05-2005"
 !define VerFFDShow     "v03-04-2005"
 !define VerVSFilter    "v2.36"
 !define VerGabestMPEG2 "v0.1.2.0"