Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 68db9dd

Browse files
tim-onetim-one
committed
Now that the dialogs have some breathing room, split the combo of Tcl/Tk,
IDLE and pydoc into a separate component. That's almost as big as the rest of Python (excl. docs and test suite) combined. Pop up a confimation box if they choose to install at least one of {Tcl/Tk/IDLE/pydoc, Tools, Test suite} but do not choose to install Python -- doesn't make much sense, so ask whether that's really what they want.
1 parent 84e58ab commit 68db9dd

1 file changed

Lines changed: 130 additions & 56 deletions

File tree

‎PCbuild/python20.wse‎

Lines changed: 130 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -300,20 +300,23 @@ item: Remark
300300
Text=COMPONENTS values:
301301
end
302302
item: Remark
303-
Text=A: interpreter, libraries and IDLE
303+
Text=A: interpreter and libraries
304304
end
305305
item: Remark
306-
Text=B: docs
306+
Text=B: Tcl/Tk
307307
end
308308
item: Remark
309-
Text=C: tools
309+
Text=C: docs
310310
end
311311
item: Remark
312-
Text=D: test suite
312+
Text=D: tools
313+
end
314+
item: Remark
315+
Text=E: test suite
313316
end
314317
item: Set Variable
315318
Variable=COMPONENTS
316-
Value=ABCD
319+
Value=ABCDE
317320
end
318321
item: Remark
319322
end
@@ -407,7 +410,7 @@ item: If/While Statement
407410
end
408411
item: Set Variable
409412
Variable=SUMMARY
410-
Value= Python interpreter, libraries and IDLE%CRLF%
413+
Value= Python interpreter and libraries%CRLF%
411414
Flags=00000001
412415
end
413416
item: End Block
@@ -419,7 +422,7 @@ item: If/While Statement
419422
end
420423
item: Set Variable
421424
Variable=SUMMARY
422-
Value= Python documentation%CRLF%
425+
Value= Tcl/Tk (Tkinter, IDLE, pydoc)%CRLF%
423426
Flags=00000001
424427
end
425428
item: End Block
@@ -431,7 +434,7 @@ item: If/While Statement
431434
end
432435
item: Set Variable
433436
Variable=SUMMARY
434-
Value= Tool and utility scripts%CRLF%
437+
Value= Python documentation%CRLF%
435438
Flags=00000001
436439
end
437440
item: End Block
@@ -441,6 +444,18 @@ item: If/While Statement
441444
Value=D
442445
Flags=00000010
443446
end
447+
item: Set Variable
448+
Variable=SUMMARY
449+
Value= Tool and utility scripts%CRLF%
450+
Flags=00000001
451+
end
452+
item: End Block
453+
end
454+
item: If/While Statement
455+
Variable=COMPONENTS
456+
Value=E
457+
Flags=00000010
458+
end
444459
item: Set Variable
445460
Variable=SUMMARY
446461
Value= Python test suite%CRLF%
@@ -936,7 +951,8 @@ item: Custom Dialog Set
936951
Variable=COMPONENTS
937952
Create Flags=01010000000000010000000000000011
938953
Flags=0000000000000110
939-
Text=Python interpreter, library and IDLE
954+
Text=Python interpreter and libraries
955+
Text=Tcl/Tk (Tkinter, IDLE, pydoc)
940956
Text=Python HTML docs
941957
Text=Python utility scripts (Tools/)
942958
Text=Python test suite (Lib/test/)
@@ -1030,6 +1046,49 @@ item: Custom Dialog Set
10301046
Action=1
10311047
Create Flags=01010000000000000000000000000111
10321048
end
1049+
item: If/While Statement
1050+
Variable=DLG_EVENT_TYPE
1051+
Value=VERIFY
1052+
end
1053+
item: Remark
1054+
Text=If they're installing Tcl/Tk, Tools, or the test suite, doesn't make much sense unless they're installing Python too.
1055+
end
1056+
item: If/While Statement
1057+
Variable=COMPONENTS
1058+
Value=BDE
1059+
Flags=00001010
1060+
end
1061+
item: If/While Statement
1062+
Variable=COMPONENTS
1063+
Value=A
1064+
Flags=00000011
1065+
end
1066+
item: Display Message
1067+
Title=Are you sure?
1068+
Text=Installing Tcl/Tk, Tools or the test suite doesn't make much sense unless you install the Python interpreter and libraries too.
1069+
Text=
1070+
Text=Click Yes if that's really what you want.
1071+
Flags=00101101
1072+
end
1073+
item: Remark
1074+
Text=Nothing -- just proceed to the next dialog.
1075+
end
1076+
item: Else Statement
1077+
end
1078+
item: Remark
1079+
Text=Return to the dialog.
1080+
end
1081+
item: Set Variable
1082+
Variable=DLG_EVENT_TYPE
1083+
end
1084+
item: End Block
1085+
end
1086+
item: End Block
1087+
end
1088+
item: End Block
1089+
end
1090+
item: End Block
1091+
end
10331092
end
10341093
item: Dialog
10351094
Title=Advanced Options
@@ -1585,7 +1644,7 @@ end
15851644
item: Remark
15861645
end
15871646
item: Remark
1588-
Text=A: interpreter, libraries and IDLE
1647+
Text=A: interpreter and libraries
15891648
end
15901649
item: If/While Statement
15911650
Variable=COMPONENTS
@@ -1899,6 +1958,33 @@ item: Install File
18991958
end
19001959
item: Remark
19011960
end
1961+
item: Remark
1962+
Text=Microsoft C runtime libraries
1963+
end
1964+
item: Install File
1965+
Source=%_SYS_%\MSVCIRT.DLL
1966+
Destination=%DLLDEST%\MSVCIRT.DLL
1967+
Description=Visual C++ Runtime DLLs
1968+
Flags=0000011000010011
1969+
end
1970+
item: Install File
1971+
Source=%_SYS_%\MSVCRT.DLL
1972+
Destination=%DLLDEST%\MSVCRT.DLL
1973+
Description=Visual C++ Runtime DLLs
1974+
Flags=0000011000010011
1975+
end
1976+
item: End Block
1977+
end
1978+
item: Remark
1979+
end
1980+
item: Remark
1981+
Text=B: Tcl/Tk (Tkinter, IDLE, pydoc)
1982+
end
1983+
item: If/While Statement
1984+
Variable=COMPONENTS
1985+
Value=B
1986+
Flags=00000010
1987+
end
19021988
item: Remark
19031989
Text=Tcl/Tk
19041990
end
@@ -1952,30 +2038,24 @@ end
19522038
item: Remark
19532039
end
19542040
item: Remark
1955-
Text=Microsoft C runtime libraries
1956-
end
1957-
item: Install File
1958-
Source=%_SYS_%\MSVCIRT.DLL
1959-
Destination=%DLLDEST%\MSVCIRT.DLL
1960-
Description=Visual C++ Runtime DLLs
1961-
Flags=0000011000010011
2041+
Text=Windows pydoc driver
19622042
end
19632043
item: Install File
1964-
Source=%_SYS_%\MSVCRT.DLL
1965-
Destination=%DLLDEST%\MSVCRT.DLL
1966-
Description=Visual C++ Runtime DLLs
1967-
Flags=0000011000010011
2044+
Source=..\tools\scripts\*.pyw
2045+
Destination=%MAINDIR%\Tools\Scripts
2046+
Description=Windows pydoc driver
2047+
Flags=0000000000000010
19682048
end
19692049
item: End Block
19702050
end
19712051
item: Remark
19722052
end
19732053
item: Remark
1974-
Text=B: docs
2054+
Text=C: docs
19752055
end
19762056
item: If/While Statement
19772057
Variable=COMPONENTS
1978-
Value=B
2058+
Value=C
19792059
Flags=00000010
19802060
end
19812061
item: Install File
@@ -1989,11 +2069,11 @@ end
19892069
item: Remark
19902070
end
19912071
item: Remark
1992-
Text=C: tools
2072+
Text=D: tools
19932073
end
19942074
item: If/While Statement
19952075
Variable=COMPONENTS
1996-
Value=C
2076+
Value=D
19972077
Flags=00000010
19982078
end
19992079
item: Install File
@@ -2105,11 +2185,11 @@ end
21052185
item: Remark
21062186
end
21072187
item: Remark
2108-
Text=D: test suite
2188+
Text=E: test suite
21092189
end
21102190
item: If/While Statement
21112191
Variable=COMPONENTS
2112-
Value=D
2192+
Value=E
21132193
Flags=00000010
21142194
end
21152195
item: Install File
@@ -2154,24 +2234,6 @@ item: End Block
21542234
end
21552235
item: Remark
21562236
end
2157-
item: Remark
2158-
Text=Windows pydoc driver
2159-
end
2160-
item: If/While Statement
2161-
Variable=COMPONENTS
2162-
Value=AC
2163-
Flags=00001010
2164-
end
2165-
item: Install File
2166-
Source=..\tools\scripts\*.pyw
2167-
Destination=%MAINDIR%\Tools\Scripts
2168-
Description=Windows pydoc driver
2169-
Flags=0000000000000010
2170-
end
2171-
item: End Block
2172-
end
2173-
item: Remark
2174-
end
21752237
item: Remark
21762238
Text=DONE with file copying.
21772239
end
@@ -2530,7 +2592,7 @@ item: Remark
25302592
end
25312593
item: If/While Statement
25322594
Variable=COMPONENTS
2533-
Value=B
2595+
Value=C
25342596
Flags=00000010
25352597
end
25362598
item: If/While Statement
@@ -2660,20 +2722,16 @@ item: If/While Statement
26602722
Value=B
26612723
Flags=00000010
26622724
end
2663-
item: If/While Statement
2664-
Variable=COMPONENTS
2665-
Value=B
2666-
Flags=00000010
2725+
item: Remark
2726+
Text=Shortcut to installer no matter what.
26672727
end
26682728
item: Create Shortcut
2669-
Source=%MAINDIR%\Doc\index.html
2670-
Destination=%GROUP%\Python Manuals.lnk
2729+
Source=%MAINDIR%\unwise.exe
2730+
Destination=%GROUP%\Uninstall Python.lnk
26712731
Working Directory=%MAINDIR%
26722732
Key Type=1536
26732733
Flags=00000001
26742734
end
2675-
item: End Block
2676-
end
26772735
item: Remark
26782736
end
26792737
item: If/While Statement
@@ -2689,6 +2747,15 @@ item: Create Shortcut
26892747
Key Type=1536
26902748
Flags=00000001
26912749
end
2750+
item: End Block
2751+
end
2752+
item: Remark
2753+
end
2754+
item: If/While Statement
2755+
Variable=COMPONENTS
2756+
Value=B
2757+
Flags=00000010
2758+
end
26922759
item: Create Shortcut
26932760
Source=%MAINDIR%\pythonw.exe
26942761
Destination=%GROUP%\IDLE (Python GUI).lnk
@@ -2709,15 +2776,22 @@ item: End Block
27092776
end
27102777
item: Remark
27112778
end
2779+
item: If/While Statement
2780+
Variable=COMPONENTS
2781+
Value=C
2782+
Flags=00000010
2783+
end
27122784
item: Create Shortcut
2713-
Source=%MAINDIR%\unwise.exe
2714-
Destination=%GROUP%\Uninstall Python.lnk
2785+
Source=%MAINDIR%\Doc\index.html
2786+
Destination=%GROUP%\Python Manuals.lnk
27152787
Working Directory=%MAINDIR%
27162788
Key Type=1536
27172789
Flags=00000001
27182790
end
27192791
item: End Block
27202792
end
2793+
item: End Block
2794+
end
27212795
item: Remark
27222796
end
27232797
item: Remark

0 commit comments

Comments
 (0)