From baf26bf201d36d491727e29ff124dd20aa00b5d3 Mon Sep 17 00:00:00 2001 From: Iain Buclaw Date: Thu, 9 May 2024 23:53:06 +0200 Subject: [PATCH] Remove all references to optlink --- create_dmd_release/build_all.d | 4 ---- create_dmd_release/create_dmd_release.d | 9 --------- .../extras/windows/dmd2/windows/bin/README.TXT | 1 - 3 files changed, 14 deletions(-) diff --git a/create_dmd_release/build_all.d b/create_dmd_release/build_all.d index 0466f5c7..b54e8b25 100644 --- a/create_dmd_release/build_all.d +++ b/create_dmd_release/build_all.d @@ -574,7 +574,6 @@ int main(string[] args) immutable isPreRelease = isBranch || !verMatch.captures[4].empty; immutable dubTag = isBranch ? gitTag : getDubTag(isPreRelease); - enum optlink = "optlink.zip"; enum libC = "snn.lib"; enum libCurl = "libcurl-7.68.0-WinSSL-zlib-x86-x64.zip"; enum mingwtag = "mingw-libs-8.0.0"; @@ -599,7 +598,6 @@ int main(string[] args) const hasWindows = platforms.any!(p => p.os == OS.windows); if (hasWindows) { - fetchFile("http://ftp.digitalmars.com/"~optlink, cacheDir~"/"~optlink); fetchFile("http://ftp.digitalmars.com/"~libC, cacheDir~"/"~libC); fetchFile("https://downloads.dlang.org/other/"~libCurl, cacheDir~"/"~libCurl, verifySignature); fetchFile("https://downloads.dlang.org/other/"~lld, cacheDir~"/"~lld, verifySignature, lld_sha); @@ -628,8 +626,6 @@ int main(string[] args) if (hasWindows) { - // add latest optlink - extract(cacheDir~"/"~optlink, workDir~"/windows/extraBins/dmd2/windows/bin/"); if (exists(workDir~"/windows/extraBins/dmd2/windows/bin/link.exe")) remove(workDir~"/windows/extraBins/dmd2/windows/bin/link.exe"); // add latest dmc libC (snn.lib) diff --git a/create_dmd_release/create_dmd_release.d b/create_dmd_release/create_dmd_release.d index 2350a0a1..86b78df1 100644 --- a/create_dmd_release/create_dmd_release.d +++ b/create_dmd_release/create_dmd_release.d @@ -16,8 +16,6 @@ Prerequisites to Run: Examples: set LDC_VSDIR="C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\" - Windows: A GNU make, found in PATH as mingw32-make (to avoid DM make.exe bundled with DMC). -- Windows: A version of OPTLINK with the /LA[RGEADDRESSAWARE] flag: - - Windows: Microsoft's HTML Help Workshop on the PATH. Typical Usage: @@ -523,13 +521,6 @@ void createRelease(string branch) if(do64Bit) { copyFile(cloneDir~"/dmd/generated/"~osDirName~"/release/64/dmd"~exe, releaseBin64Dir~"/dmd"~exe); - version(Windows) - { - // patch sc.ini to point to optlink.exe in bin folder - auto sc_ini = cast(string)std.file.read(cloneDir~"/dmd/compiler/ini/windows/bin/sc.ini"); - sc_ini = sc_ini.replace(`%@P%\optlink.exe`, `%@P%\..\bin\optlink.exe`); - std.file.write(releaseBin64Dir~"/sc.ini", sc_ini); - } copyDir(cloneDir~"/tools/generated/"~osDirName~"/64", releaseBin64Dir, file => !file.endsWith(obj)); copyFile(cloneDir~"/dub/bin/dub64"~exe, releaseBin64Dir~"/dub"~exe); if (codesign) diff --git a/create_dmd_release/extras/windows/dmd2/windows/bin/README.TXT b/create_dmd_release/extras/windows/dmd2/windows/bin/README.TXT index 94d0227a..e4845d2c 100644 --- a/create_dmd_release/extras/windows/dmd2/windows/bin/README.TXT +++ b/create_dmd_release/extras/windows/dmd2/windows/bin/README.TXT @@ -11,7 +11,6 @@ lib.exe Librarian http://www.digitalmars.com/ctg/lib.html libcurl.dll Curl Library https://curl.haxx.se/ lld-link.exe LLVM Linker https://lld.llvm.org/ make.exe Make program http://www.digitalmars.com/ctg/make.html -optlink.exe Linker http://www.digitalmars.com/ctg/optlink.html rdmd.exe Run D program as a script http://dlang.org/rdmd.html replace.exe Find/replace text in file(s) shell.exe Test script runner http://www.digitalmars.com/ctg/shell.html