Merge pull request #2846 from PaulBoersma/master

made the term "Intel64" less vendor-specific

Author: PaulBoersma

README.md

@@ -49,13 +49,13 @@ The meaning of the names of binary files available on GitHub is as follows (edit
 
 ### 1.1. Windows binaries
 - **`praatXXXX_win-arm64.zip`: zipped executable for ARM64 Windows (11 and higher)**
-- **`praatXXXX_win-intel64.zip`: zipped executable for Intel64 Windows (7 and higher)**
+- **`praatXXXX_win-intel64.zip`: zipped executable for Intel64/AMD64 Windows (7 and higher)**
 - **`praatXXXX_win-intel32.zip`: zipped executable for Intel32 Windows (7 and higher)**
-- `praatXXXX_win64.zip`: zipped executable for 64-bit Intel Windows (XP and higher, or 7 and higher)
-- `praatXXXX_win32.zip`: zipped executable for 32-bit Intel Windows (XP and higher, or 7 and higher)
-- `praatconXXXX_win64.zip`: zipped executable for 64-bit Intel Windows, console edition
-- `praatconXXXX_win32.zip`: zipped executable for 32-bit Intel Windows, console edition
-- `praatconXXXX_win32sit.exe`: self-extracting StuffIt archive with executable for 32-bit Intel Windows, console edition
+- `praatXXXX_win64.zip`: zipped executable for Intel64/AMD64 Windows (XP and higher, or 7 and higher)
+- `praatXXXX_win32.zip`: zipped executable for Intel32 Windows (XP and higher, or 7 and higher)
+- `praatconXXXX_win64.zip`: zipped executable for Intel64/AMD64 Windows, console edition
+- `praatconXXXX_win32.zip`: zipped executable for Intel32 Windows, console edition
+- `praatconXXXX_win32sit.exe`: self-extracting StuffIt archive with executable for Intel32 Windows, console edition
 - `praatXXXX_win98.zip`: zipped executable for Windows 98
 - `praatXXXX_win98sit.exe`: self-extracting StuffIt archive with executable for Windows 98
 
@@ -79,21 +79,21 @@ The meaning of the names of binary files available on GitHub is as follows (edit
 - **`praatXXXX_linux-s390x.tar.gz`: gzipped tarred executable for s390x Linux (GTK 3)**
 - **`praatXXXX_linux-arm64-barren.tar.gz`: gzipped tarred executable for ARM64 Linux, without GUI, sound and graphics**
 - **`praatXXXX_linux-arm64.tar.gz`: gzipped tarred executable for ARM64 Linux (GTK 3)**
-- **`praatXXXX_linux-intel64-barren.tar.gz`: gzipped tarred executable for Intel64 Linux, without GUI, sound and graphics**
-- **`praatXXXX_linux-intel64.tar.gz`: gzipped tarred executable for Intel64 Linux (GTK 3)**
+- **`praatXXXX_linux-intel64-barren.tar.gz`: gzipped tarred executable for Intel64/AMD64 Linux, without GUI, sound and graphics**
+- **`praatXXXX_linux-intel64.tar.gz`: gzipped tarred executable for Intel64/AMD64 Linux (GTK 3)**
 - `praatXXXX_linux-arm64-nogui.tar.gz`: gzipped tarred executable for ARM64 Linux, without GUI and sound but with graphics (Cairo and Pango)
-- `praatXXXX_linux-intel64-nogui.tar.gz`: gzipped tarred executable for Intel64 Linux, without GUI and sound but with graphics (Cairo and Pango)
-- `praatXXXX_linux64barren.tar.gz`: gzipped tarred executable for 64-bit Intel Linux, without GUI, sound and graphics
-- `praatXXXX_linux64nogui.tar.gz`: gzipped tarred executable for 64-bit Intel Linux, without GUI and sound but with graphics (Cairo and Pango)
-- `praatXXXX_linux64.tar.gz`: gzipped tarred executable for 64-bit Intel Linux (GTK 2 or 3)
-- `praatXXXX_linux32.tar.gz`: gzipped tarred executable for 32-bit Intel Linux (GTK 2)
-- `praatXXXX_linux_motif64.tar.gz`: gzipped tarred executable for 64-bit Intel Linux (Motif)
-- `praatXXXX_linux_motif32.tar.gz`: gzipped tarred executable for 32-bit Intel Linux (Motif)
+- `praatXXXX_linux-intel64-nogui.tar.gz`: gzipped tarred executable for Intel64/AMD64 Linux, without GUI and sound but with graphics (Cairo and Pango)
+- `praatXXXX_linux64barren.tar.gz`: gzipped tarred executable for Intel64/AMD64 Linux, without GUI, sound and graphics
+- `praatXXXX_linux64nogui.tar.gz`: gzipped tarred executable for Intel64/AMD64 Linux, without GUI and sound but with graphics (Cairo and Pango)
+- `praatXXXX_linux64.tar.gz`: gzipped tarred executable for Intel64/AMD64 Linux (GTK 2 or 3)
+- `praatXXXX_linux32.tar.gz`: gzipped tarred executable for Intel32 Linux (GTK 2)
+- `praatXXXX_linux_motif64.tar.gz`: gzipped tarred executable for Intel64/AMD64 Linux (Motif)
+- `praatXXXX_linux_motif32.tar.gz`: gzipped tarred executable for Intel32 Linux (Motif)
 
 ### 1.4. Chromebook binaries
 - **`praatXXXX_chrome-arm64.tar.gz`: gzipped tarred executable for Linux on ARM64 Chromebooks (GTK 3)**
-- **`praatXXXX_chrome-intel64.tar.gz`: gzipped tarred executable for Intel64 Linux on Intel64 Chromebooks (GTK 3)**
-- `praatXXXX_chrome64.tar.gz`: gzipped tarred executable for 64-bit Linux on Intel64 Chromebooks (GTK 2 or 3)
+- **`praatXXXX_chrome-intel64.tar.gz`: gzipped tarred executable for Intel64/AMD64 Linux on Intel64/AMD64 Chromebooks (GTK 3)**
+- `praatXXXX_chrome64.tar.gz`: gzipped tarred executable for 64-bit Linux on Intel64/AMD64 Chromebooks (GTK 2 or 3)
 
 ### 1.5. Raspberry Pi binaries
 - **`praatXXXX_rpi-armv7.tar.gz`: gzipped tarred executable for (32-bit) ARMv7 Linux on the Raspberry Pi 4B (GTK 3)**
@@ -177,10 +177,10 @@ and of the Praat scripting language is tested as follows:
 
 On Windows, Praat is **built** through the makefiles provided in Praat’s source tree.
 
-One could use Cygwin or MSYS2. As we like to provide not only an Intel64 and Intel32 edition,
+One could use Cygwin or MSYS2. As we like to provide not only an Intel64/AMD64 and Intel32 edition,
 but an ARM64 edition as well, and Cygwin has no toolchains for ARM64, we work with MSYS2 instead.
 
-After installing MSYS2, we see that a `mingw64` toolchain (for Praat’s Intel64 edition)
+After installing MSYS2, we see that a `mingw64` toolchain (for Praat’s Intel64/AMD64 edition)
 and a `mingw32` toolchain (for Praat’s Intel32 edition) are already available.
 Make sure you have installed at least `make`, `gcc`, `g++` and `pkg-config` to make those work.
 To also install a `clangarm64` toolchain (for Praat’s ARM64 edition),
@@ -201,7 +201,7 @@ If you now want to build Praat’s ARM64 edition, start the shell `clangarm64` a
     cp makefiles/makefile.defs.msys-clang ./makefile.defs
     make -j12
 
-If you want to build Praat’s Intel64 edition, start the shell `clang64` and type
+If you want to build Praat’s Intel64/AMD64 edition, start the shell `clang64` and type
 
     cd ~/praats-intel64
     cp makefiles/makefile.defs.msys-clang ./makefile.defs
@@ -226,7 +226,7 @@ or start the shell `mingw32` and type
     make -j12
 
 (With Cygwin, you would install the Devel package mingw64-x86_64-gcc-g++
-for Praat’s Intel64 edition and mingw64-i686-gcc-g++ for Praat’s Intel32 edition,
+for Praat’s Intel64/AMD64 edition and mingw64-i686-gcc-g++ for Praat’s Intel32 edition,
 plus perhaps `make` and `pkg-config` if you dont’t have those yet.)
 
 **Code-signing.** From version 6.4.25 on, we have signed the three Praat executables
@@ -237,7 +237,7 @@ on Windows 11. Early testing shows that the signature is seen by SmartScreen,
 but that SmartScreen can still block Praat, so that users still have to
 click “Run Anyway” (or “Unblock” under Properties).
 It seems that the card reader for this certificate cannot be used yet for code-signing on ARM64 Windows
-or on MacOS Sonoma/Sequoia, so for the moment we have to fall back on an obsolete Intel64 Windows 10 machine
+or on MacOS Sonoma/Sequoia, so for the moment we have to fall back on an obsolete Intel64/AMD64 Windows 10 machine
 and are looking for a more robust solution.
 
 **Testing** on multiple platform versions can be done with virtual machines
@@ -250,7 +250,7 @@ On an ARM64 Mac with Parallels Desktop, you can test only on Windows 11.
 To **build** Praat on the Mac, extract the *praatXXXX_xcodeproj.zip* file
 from [Praat’s latest release](https://github.com/praat/praat/releases)
 into the folder that contains `sys`, `fon`, `dwtools` and so on (e.g. `~/Dropbox/Praats/src`).
-Then open the project `praat.xcodeproj` in Xcode 15.1 (or perhaps later, but not in Xcode 15.0),
+Then open the project `praat.xcodeproj` in Xcode 16.3 (or later),
 and edit the Intermediate and Product build paths to something that suits you
 (Xcode -> Settings... -> Locations -> Derived Data -> Advanced... -> Custom -> Absolute,
 then type something after Products, e.g. `~/Dropbox/Praats/bin/macos`,
@@ -273,7 +273,7 @@ try the target `praat_mac_a` (static) or `praat_mac_so` (dynamic).
 
 **Notarization.** If you want others to be able to use your Mac app,
 you will probably have to not only *sign* the executable, but also *notarize* it. To this end,
-do Xcode (version 15) -> Product -> Archive -> Distribute App -> Developer ID -> Upload ->
+do Xcode (version 16) -> Product -> Archive -> Distribute App -> Developer ID -> Upload ->
 Automatically manage signing -> Upload -> ...wait... (“Package Approved”) ...wait...
 (“Ready to distribute”) -> Export Notarized App). If your Praat.app was built into
 `~/Dropbox/Praats/bin/macos/Configuration64`, then you can save the notarized
@@ -282,12 +282,11 @@ Automatically manage signing -> Upload -> ...wait... (“Package Approved”) ..
 Praat.app that was already there. If on the way you receive an error
 “App Store Connect Operation Error -- You must first sign the relevant contracts online”,
 or “Couldn’t communicate with a helper application“,
-or just a crash (happens with Xcode 15.0),
 you will have to log in to `developer.apple.com` and do Review Agreement -> Agree;
 you may then also have to go (or log in) to App Store Connect, then Business (or Agreements, Tax, and Banking)
 -> Paid Apps Agreement -> View and Agree to Terms (even if you have no paid apps).
 
-**Testing** on multiple Intel64 platform versions can be done on older Intel64 Macs,
+**Testing** on multiple Intel64/AMD64 platform versions can be done on older Intel64 Macs,
 using virtual machines with Parallels Desktop. For instance, a 2013 Macbook Pro can handle
 OS X 10.11 El Capitan, 10.12 Sierra, 10.13 High Sierra, macOS 10.14 Mojave, 10.15 Catalina,
 and macOS 11 Big Sur, while a 2018 Macbook Pro can handle macOS 10.14 Mojave, 10.15 Catalina,
@@ -315,7 +314,7 @@ install the necessary build tools as well as some graphics and sound packages:
 To set up your source tree for Linux, go to Praat's sources directory (where the folders `fon` and `sys` are)
 and type one of the four following commands:
 
-    # on Ubuntu command line (Intel64 or ARM64 processor)
+    # on Ubuntu command line (Intel64/AMD64 or ARM64 processor)
     # either:
         cp makefiles/makefile.defs.linux.pulse-clang ./makefile.defs
     # or:
@@ -342,7 +341,7 @@ gthread-2.0, rt, glib-2.0, asound, jack).
 When compiling Praat on an external supercomputer or so, you will not have sound.
 If you do have `libgtk-3-dev` (and its dependencies), do
 
-    # on Ubuntu command line (Intel64 or ARM64 processor)
+    # on Ubuntu command line (Intel64/AMD64 or ARM64 processor)
     cp makefiles/makefile.defs.linux.silent ./makefile.defs
 
 Then type `make -j12` or so to build the program. If your Unix isn’t Linux,
@@ -353,7 +352,7 @@ freetype, fontconfig, gobject-2.0, gmodule-2.0, gthread-2.0, rt, glib-2.0).
 When compiling Praat for use as a server for commands from your web pages,
 you may not need sound, a GUI, amd graphics. In that case, do
 
-    # on Ubuntu command line (Intel64 or ARM64 processor)
+    # on Ubuntu command line (Intel64/AMD64 or ARM64 processor)
     # either:
         cp makefiles/makefile.defs.linux.barren-clang ./makefile.defs
     # or:
@@ -365,7 +364,7 @@ you may not need sound, a GUI, amd graphics. In that case, do
 which creates the executable `praat_barren`. Then type `make` or `make -j15` to build the program.
 If your Unix isn’t Linux, you may have to edit the library names in the makefile.
 
-The above works exactly the same for Intel64 and ARM64 processors, with the same makefiles.
+The above works exactly the same for Intel64/AMD64 and ARM64 processors, with the same makefiles.
 
 **Testing** on multiple platform versions can be done with virtual machines
 for e.g. Ubuntu 20.04, Ubuntu 22.04, Fedora 35, Fedora 37, Mint 20.2,
@@ -392,7 +391,7 @@ We hope that our example will be useful to you.
 Your source code folders, such as `fon` and `sys`,
 will reside in a folder like `~/Dropbox/Praats/src`,
 where you also put `praat.xcodeproj`, as described above in 3.2.
-On our 2023 Mac with Xcode 15.1, building Praat with Command-B or Command-R,
+On our 2023 Mac with Xcode 16.3, building Praat with Command-B or Command-R,
 after cleaning the build folder with Shift-Command-K,
 takes only 56 seconds for the ARM64 part and Intel64 part together (optimization level O3).
 
@@ -423,7 +422,7 @@ add the following definitions into `/home/yourname/.bashrc` (i.e. in your MSYS2
 so that `bash` will automatically execute them whenever you start your
 MSYS shell or Cygwin terminal (you will need to have installed `rsync` and `make`).
 On our 2023 Mac, the ARM64 edition will be the default,
-but the Intel64 and Intel32 versions will also be available;
+but the Intel64/AMD64 and Intel32 versions will also be available;
 as the same `.bashrc` file is shared among all three editions,
 we use the environment variable `MSYSTEM` to differentiate between the three:
 
@@ -454,7 +453,7 @@ The cycle from editing Praat on the Mac to running the new version on Windows th
 2. type `praat-run` on your Windows 11 (under Parallels Desktop on your Mac) in one of the three MSYS2 shells.
 
 On our 2023 Mac, the three builds cost 86 seconds for ARM64,
-212 seconds for Intel64 (under emulation), and 390 seconds for Intel32 (also under emulation).
+212 seconds for Intel64/AMD64 (under emulation), and 390 seconds for Intel32 (also under emulation).
 
 ### 4.3. Linux development set-up
 
@@ -469,7 +468,7 @@ Your MacOS home folder (i.e. `/Users/yourname`) is now visible on the Ubuntu des
 as `Home`, and from the `Terminal` you can access it as `/media/psf/Home`.
 
 However, on an ARM64 Mac this procedure with Parallels Desktop works only for the ARM64 edition.
-With OrbStack we can instead create the Intel64 edition as well
+With OrbStack we can instead create the Intel64/AMD64 edition as well
 (and building the ARM64 edition is also faster). Your Mac home folder is known
 simply as `/Users/yourname` or so.
 
@@ -500,7 +499,7 @@ in your OrbStack window (or into your `.bashrc` file), followed by `praat` into
 the Praat-for-Linux Objects and Picture windows will then show up on your Mac screen.
 
 On our 2023 Mac, building Praat this way from scratch takes 42 seconds for the ARM64 edition
-and 130 seconds (under emulation) for the Intel64 edition (optimization level O3).
+and 130 seconds (under emulation) for the Intel64/AMD64 edition (optimization level O3).
 
 To build `praat_barren`, create a folder `praatsb`, and define
 
@@ -540,7 +539,7 @@ a forbidding 27 minutes.
 
 So we choose to build Praat on Ubuntu (under Parallels Desktop on an Intel64 Mac),
 because building the Intel Chrome64 edition on OrbStack Ubuntu 20.04 takes only
-63 seconds (ARM64) or 215 seconds (Intel64). If you have the Linux set-up described in 4.3,
+63 seconds (ARM64) or 215 seconds (Intel64/AMD64). If you have the Linux set-up described in 4.3,
 you can do this with the `praatc-build` command.
 
 Next, you need a way to get the executable `praat` from Mac/Ubuntu to your Chromebook.
@@ -739,7 +738,7 @@ namely to the folder `~/Dropbox/Praats/bin/linux_intel64` or `~/Dropbox/Praats/b
 (which will contain only `praat`).
 On Ubuntu you can define
 
-    # in MSYS2 Intel64 Ubuntu:~/.bash_aliases
+    # in MSYS2 Intel64/AMD64 Ubuntu:~/.bash_aliases
     alias praat-dist="praat-build && rsync -t ~/praats/praat /Users/yourname/Dropbox/Praats/bin/linux-intel64"
     alias praatb-dist="praatb-build && rsync -t ~/praatsb/praat_barren /Users/yourname/Dropbox/Praats/bin/linux-intel64"
     alias praatc-dist="praatc-build && rsync -t ~/praatsc/praat /Users/yourname/Dropbox/Praats/bin/chrome-intel64"