[matroska] r1168 - trunk/MatroskaPack/Satsuki

Author: robux4
Date: 2005-05-12 13:31:05 +0400 (Thu, 12 May 2005)
New Revision: 1168

Modified:
   trunk/MatroskaPack/Satsuki/Matroska_Pack_Full.nsi
   trunk/MatroskaPack/Satsuki/Matroska_Pack_Lite.nsi
   trunk/MatroskaPack/Satsuki/Matroska_Pack_var.nsh
Log:
Pack : allow making release candidates

Modified: trunk/MatroskaPack/Satsuki/Matroska_Pack_Full.nsi
===================================================================
--- trunk/MatroskaPack/Satsuki/Matroska_Pack_Full.nsi	2005-05-12 07:47:34 UTC (rev 1167)
+++ trunk/MatroskaPack/Satsuki/Matroska_Pack_Full.nsi	2005-05-12 09:31:05 UTC (rev 1168)
@@ -13,11 +13,14 @@
 !include "sections.nsh"
 !include "Matroska_Pack_var.nsh" ; Contains all dynamic versioning-specific parameters
 
-!ifdef BETA
-OutFile "Matroska_Pack_Full_v${VERSION_MAJOR}b${VERSION_MINOR}.exe"
+!ifdef RELEASE_CAN
+OutFile "Matroska_Pack_Full_v${VERSION_MAJOR}rc${VERSION_RC}.exe"
+!else ifdef BETA
+OutFile "Matroska_Pack_Full_v${VERSION_MAJOR}b${VERSION_BETA}.exe"
 !else
 OutFile "Matroska_Pack_Full_v${VERSION_MAJOR}.exe"
 !endif
+
 Name "Matroska Pack"
 InstallDir "$PROGRAMFILES\Matroska Pack"
 InstallDirRegKey HKCU "Software\Matroska Pack" ""
@@ -65,8 +68,10 @@
 ;--------------------------------
 ;Version Information
 
-!ifdef BETA
-  !define VERSION_LONG "${VERSION_MAJOR} Full Beta ${VERSION_MINOR}"
+!ifdef RELEASE_CAN
+  !define VERSION_LONG "${VERSION_MAJOR} Full RC ${VERSION_RC}"
+!else ifdef BETA
+  !define VERSION_LONG "${VERSION_MAJOR} Full Beta ${VERSION_BETA}"
 !else
   !define VERSION_LONG "${VERSION_MAJOR} Full"
 !endif

Modified: trunk/MatroskaPack/Satsuki/Matroska_Pack_Lite.nsi
===================================================================
--- trunk/MatroskaPack/Satsuki/Matroska_Pack_Lite.nsi	2005-05-12 07:47:34 UTC (rev 1167)
+++ trunk/MatroskaPack/Satsuki/Matroska_Pack_Lite.nsi	2005-05-12 09:31:05 UTC (rev 1168)
@@ -13,8 +13,10 @@
 !include "sections.nsh"
 !include "Matroska_Pack_var.nsh" ; Contains all dynamic versioning-specific parameters
 
-!ifdef BETA
-OutFile "Matroska_Pack_Lite_v${VERSION_MAJOR}b${VERSION_MINOR}.exe"
+!ifdef RELEASE_CAN
+OutFile "Matroska_Pack_Lite_v${VERSION_MAJOR}rc${VERSION_RC}.exe"
+!else ifdef BETA
+OutFile "Matroska_Pack_Lite_v${VERSION_MAJOR}b${VERSION_BETA}.exe"
 !else
 OutFile "Matroska_Pack_Lite_v${VERSION_MAJOR}.exe"
 !endif
@@ -65,8 +67,10 @@
 ;--------------------------------
 ;Version Information
 
-!ifdef BETA
-  !define VERSION_LONG "${VERSION_MAJOR} Lite Beta ${VERSION_MINOR}"
+!ifdef RELEASE_CAN
+  !define VERSION_LONG "${VERSION_MAJOR} Lite RC ${VERSION_RC}"
+!else ifdef BETA
+  !define VERSION_LONG "${VERSION_MAJOR} Lite Beta ${VERSION_BETA}"
 !else
   !define VERSION_LONG "${VERSION_MAJOR} Lite"
 !endif

Modified: trunk/MatroskaPack/Satsuki/Matroska_Pack_var.nsh
===================================================================
--- trunk/MatroskaPack/Satsuki/Matroska_Pack_var.nsh	2005-05-12 07:47:34 UTC (rev 1167)
+++ trunk/MatroskaPack/Satsuki/Matroska_Pack_var.nsh	2005-05-12 09:31:05 UTC (rev 1168)
@@ -1,8 +1,12 @@
 !define VERSION_MAJOR "1.1.0"
-!define VERSION_MINOR "6"
-!define BETA "yep"
+!define VERSION_MINOR "$Id$"      ; incremented by each SVN commit
+!define VERSION_RC    "1"
+!define VERSION_BETA  "6"
 
+!define RELEASE_CAN "yep"
+;!define BETA        "yep"
 
+
 !define VerHaali       "v03-05-2005" 
 !define VerFFDShow     "v03-04-2005"	 
 !define VerVSFilter    "v2.36"