Added 'Experimental' (tcl) option

git-svn-id: svn://tug.org/texlive/trunk@49165 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 22 insertions, 4 deletions

diff --git a/Master/tlpkg/libexec/install-tl.nsi b/Master/tlpkg/libexec/install-tl.nsi
index 1a6a8317801..8703d5a0557 100644
--- a/Master/tlpkg/libexec/install-tl.nsi
+++ b/Master/tlpkg/libexec/install-tl.nsi
@@ -1,5 +1,5 @@
 ; $Id$
-; Copyright 2013 Siep Kroonenberg
+; Copyright 2013, 2018 Siep Kroonenberg
 ; This file is licensed under the GNU General Public License version 2
 ; or any later version.
 ;
@@ -43,6 +43,7 @@ Var Dialog
 Var Label
 Var RadioSimple
 Var RadioAdvanced
+Var RadioExperimental
 Var RadioUnpack
 
 ; Controls: confirmation page
@@ -69,9 +70,9 @@ Page instfiles
 
 Function .onInit
 
-  ${If} ${AtMostWin2000}
+  ${If} ${AtMostWin2003}
     MessageBox MB_OK|MB_ICONSTOP \
-      "Windows XP earliest supported version; aborting..."
+      "Windows Vista earliest supported version; aborting..."
     Abort
   ${EndIf}
 
@@ -141,7 +142,11 @@ Function tlOptionsPage
  Pop $RadioAdvanced
  ${NSD_SetUserData} $RadioAdvanced "advanced"
 
- ${NSD_CreateRadioButton} 0 65u 100% 9u "Unpack only"
+ ${NSD_CreateRadioButton} 0 65u 100% 9u "Experimental install"
+ Pop $RadioExperimental
+ ${NSD_SetUserData} $RadioExperimental "experimental"
+
+ ${NSD_CreateRadioButton} 0 80u 100% 9u "Unpack only"
  Pop $RadioUnpack
  ${NSD_SetUserData} $RadioUnpack "unpack"
 
@@ -149,6 +154,7 @@ Function tlOptionsPage
 
  ${NSD_OnClick} $RadioSimple UpdateRadio
  ${NSD_OnClick} $RadioAdvanced UpdateRadio
+ ${NSD_OnClick} $RadioExperimental UpdateRadio
  ${NSD_OnClick} $RadioUnpack UpdateRadio
 
  nsDialogs::Show
@@ -176,6 +182,7 @@ Function Value_to_States
 
   ${NSD_Uncheck} $RadioSimple
   ${NSD_Uncheck} $RadioAdvanced
+  ${NSD_Uncheck} $RadioExperimental
   ${NSD_Uncheck} $RadioUnpack
   ${NSD_GetUserData} $RadioSimple $Radio_Temp
   ${If} $Radio_Temp == $Radio_Value
@@ -185,6 +192,10 @@ Function Value_to_States
   ${If} $Radio_Temp == $Radio_Value
     ${NSD_Check} $RadioAdvanced
   ${EndIf}
+  ${NSD_GetUserData} $RadioExperimental $Radio_Temp
+  ${If} $Radio_Temp == $Radio_Value
+    ${NSD_Check} $RadioExperimental
+  ${EndIf}
   ${NSD_GetUserData} $RadioUnpack $Radio_Temp
   ${If} $Radio_Temp == $Radio_Value
     ${NSD_Check} $RadioUnpack
@@ -215,6 +226,9 @@ Function ConfirmPage
   ${If} $Radio_Value == "unpack"
     ${NSD_CreateLabel} 0 30% 100% 80u \
       "The main installer will be unpacked into $INSTDIR\${INST_TL_NAME}.$\r$\n$\r$\nStart the main installer with install-tl-windows.bat or install-tl-advanced.bat."
+  ${ElseIf} $Radio_Value == "experimental"
+    ${NSD_CreateLabel} 0 30% 100% 80u \
+      "Click 'Install' to start the main installer,$\r$\nwhich lets you select components and an installation directory.$\r$\n$\r$\nUnpacking the main installer may take a few moments..."
   ${ElseIf} $Radio_Value == "advanced"
     ${NSD_CreateLabel} 0 30% 100% 80u \
       "Click 'Install' to start the main installer,$\r$\nwhich lets you select components and an installation directory.$\r$\n$\r$\nUnpacking the main installer may take a few moments..."
@@ -271,6 +285,10 @@ Section
     DetailPrint '"$INSTDIR\${INST_TL_NAME}\inst_mod.bat" -gui perltk $PARMS'
     nsExec::ExecToLog '"$INSTDIR\${INST_TL_NAME}\inst_mod.bat" -gui perltk $PARMS'
     Pop $0
+  ${ElseIf} $Radio_Value == "experimental"
+    DetailPrint '"$INSTDIR\${INST_TL_NAME}\inst_mod.bat" -gui tcl $PARMS'
+    nsExec::ExecToLog '"$INSTDIR\${INST_TL_NAME}\inst_mod.bat" $PARMS'
+    Pop $0
   ${ElseIf} $Radio_Value == "simple"
     DetailPrint '"$INSTDIR\${INST_TL_NAME}\inst_mod.bat" $PARMS'
     nsExec::ExecToLog '"$INSTDIR\${INST_TL_NAME}\inst_mod.bat" $PARMS'