Skip to content

Commit b621d5b

Browse files
eliotmirandaeliotmiranda
committed
Rename the Cygwin-specific SETPATH.BAT files to SETPATH_CYGWIN.BAT to match SETPATH_MSYS2.BAT
Give a section heading to tailoring the plugins.int/ext files & correct a typo in the win HowToBuild files.
1 parent f7bb9c6 commit b621d5b

File tree

6 files changed

+28
-1
lines changed

6 files changed

+28
-1
lines changed

‎building/win32x86/HowToBuild

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ Contents:
66
- Overview
77
- Checking out sources to build out-of-the-box
88
- Building out of the box
9+
- Tailoring the VM build
910
- Building a Specific Plugin Dll
1011
- Building the VM Simulator Support Libraries
1112
- Optimization level and gcc version (please read!)
@@ -120,14 +121,22 @@ Option C - WinSDK via x86 Native Tools Command Prompt
120121
- Needs "MSVC v143 - VS 2022 C++ x64/86 Buildtool" for "Native Tools Command Prompt"
121122
2. Open an x86 Native Tools Command Prompt
122123
3. Change to the vm flavor of your choice, e.g. squeak.cog.spur, and
123-
execute "..\common\SETPATH_MSYS2.BAT "
124+
execute "..\common\SETPATH_MSYS2.BAT"
124125
4. Then execute the other batch files to build the VM
125126
..\common\MAKEDEBUG.BAT
126127
..\common\MAKEASSERT.BAT
127128
..\common\MAKEFAST.BAT
128129

129130

131+
Option C' - WinSDK via x86 Native Tools Command Prompt substitutes Cygwin for MSYS.
132+
Follow the instructions for Option C but
133+
install Cygwin instead of MSYS2, and use "..\common\SETPATH_CYGWIN.BAT"
134+
instead of "..\common\SETPATH_MSYS2.BAT"
130135

136+
137+
138+
Tailoring the VM build
139+
----------------------
131140
Each build directory contains two files
132141
plugins.int
133142
plugins.ext

‎building/win32x86/common/SETPATH.BAT renamed to ‎building/win32x86/common/SETPATH_CYGWIN.BAT

File renamed without changes.

‎building/win64ARMv8/HowToBuild

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ Contents:
66
- Overview
77
- Checking out sources to build out-of-the-box
88
- Building out of the box
9+
- Tailoring the VM build
910
- Building a Specific Plugin Dll
1011
- Building the VM Simulator Support Libraries
1112
- Optimization level and gcc version (please read!)
@@ -126,7 +127,15 @@ Option C - WinSDK via arm64 Native Tools Command Prompt
126127
..\common\MAKEFAST.BAT
127128

128129

130+
Option C' - WinSDK via x86 Native Tools Command Prompt substitutes Cygwin for MSYS.
131+
Follow the instructions for Option C but
132+
install Cygwin instead of MSYS2, and use "..\common\SETPATH_CYGWIN.BAT"
133+
instead of "..\common\SETPATH_MSYS2.BAT"
129134

135+
136+
137+
Tailoring the VM build
138+
----------------------
130139
Each build directory contains two files
131140
plugins.int
132141
plugins.ext

‎building/win64ARMv8/common/SETPATH.BAT renamed to ‎building/win64ARMv8/common/SETPATH_CYGWIN.BAT

File renamed without changes.

‎building/win64x64/HowToBuild

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ Contents:
66
- Overview
77
- Checking out sources to build out-of-the-box
88
- Building out of the box
9+
- Tailoring the VM build
910
- Building a Specific Plugin Dll
1011
- Building the VM Simulator Support Libraries
1112
- Optimization level and gcc version (please read!)
@@ -126,7 +127,15 @@ Option C - WinSDK via x64 Native Tools Command Prompt
126127
..\common\MAKEFAST.BAT
127128

128129

130+
Option C' - WinSDK via x86 Native Tools Command Prompt substitutes Cygwin for MSYS.
131+
Follow the instructions for Option C but
132+
install Cygwin instead of MSYS2, and use "..\common\SETPATH_CYGWIN.BAT"
133+
instead of "..\common\SETPATH_MSYS2.BAT"
129134

135+
136+
137+
Tailoring the VM build
138+
----------------------
130139
Each build directory contains two files
131140
plugins.int
132141
plugins.ext

‎building/win64x64/common/SETPATH.BAT renamed to ‎building/win64x64/common/SETPATH_CYGWIN.BAT

File renamed without changes.

0 commit comments

Comments
 (0)