Skip to content

Commit 8f540c2

Browse files
authored
Rollup merge of rust-lang#72569 - ChrisDenton:remove-innosetup, r=nikomatsakis
Remove legacy InnoSetup GUI installer On Windows the InnoSetup `.exe` installer was superseded by the MSI installer long ago. It's no longer needed. The `.exe` installer hasn't been linked from the [other installation methods](https://forge.rust-lang.org/infra/other-installation-methods.html#standalone) page in many years. As far as I can tell the intent was always to remove this installer once the MSI proved itself. Though admittedly both installers feel very "legacy" at this point. Removing this would mean we only maintain one Windows GUI installer and would speed up the distribution phase. As a result of removing InnoSetup, this closes rust-lang#24397
2 parents 9491f18 + 912963b commit 8f540c2

File tree

8 files changed

+0
-423
lines changed

8 files changed

+0
-423
lines changed

Diff for: .github/workflows/ci.yml

-9
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,6 @@ jobs:
9090
- name: install WIX
9191
run: src/ci/scripts/install-wix.sh
9292
if: success() && !env.SKIP_JOB
93-
- name: install InnoSetup
94-
run: src/ci/scripts/install-innosetup.sh
95-
if: success() && !env.SKIP_JOB
9693
- name: ensure the build happens on a partition with enough space
9794
run: src/ci/scripts/symlink-build-dir.sh
9895
if: success() && !env.SKIP_JOB
@@ -193,9 +190,6 @@ jobs:
193190
- name: install WIX
194191
run: src/ci/scripts/install-wix.sh
195192
if: success() && !env.SKIP_JOB
196-
- name: install InnoSetup
197-
run: src/ci/scripts/install-innosetup.sh
198-
if: success() && !env.SKIP_JOB
199193
- name: ensure the build happens on a partition with enough space
200194
run: src/ci/scripts/symlink-build-dir.sh
201195
if: success() && !env.SKIP_JOB
@@ -537,9 +531,6 @@ jobs:
537531
- name: install WIX
538532
run: src/ci/scripts/install-wix.sh
539533
if: success() && !env.SKIP_JOB
540-
- name: install InnoSetup
541-
run: src/ci/scripts/install-innosetup.sh
542-
if: success() && !env.SKIP_JOB
543534
- name: ensure the build happens on a partition with enough space
544535
run: src/ci/scripts/symlink-build-dir.sh
545536
if: success() && !env.SKIP_JOB

Diff for: src/bootstrap/dist.rs

-21
Original file line numberDiff line numberDiff line change
@@ -1875,28 +1875,7 @@ impl Step for Extended {
18751875
prepare("rust-mingw");
18761876
}
18771877

1878-
builder.install(&xform(&etc.join("exe/rust.iss")), &exe, 0o644);
1879-
builder.install(&etc.join("exe/modpath.iss"), &exe, 0o644);
1880-
builder.install(&etc.join("exe/upgrade.iss"), &exe, 0o644);
18811878
builder.install(&etc.join("gfx/rust-logo.ico"), &exe, 0o644);
1882-
builder.create(&exe.join("LICENSE.txt"), &license);
1883-
1884-
// Generate exe installer
1885-
builder.info("building `exe` installer with `iscc`");
1886-
let mut cmd = Command::new("iscc");
1887-
cmd.arg("rust.iss").arg("/Q").current_dir(&exe);
1888-
if target.contains("windows-gnu") {
1889-
cmd.arg("/dMINGW");
1890-
}
1891-
add_env(builder, &mut cmd, target);
1892-
let time = timeit(builder);
1893-
builder.run(&mut cmd);
1894-
drop(time);
1895-
builder.install(
1896-
&exe.join(format!("{}-{}.exe", pkgname(builder, "rust"), target)),
1897-
&distdir(builder),
1898-
0o755,
1899-
);
19001879

19011880
// Generate msi installer
19021881
let wix = PathBuf::from(env::var_os("WIX").unwrap());

Diff for: src/ci/azure-pipelines/steps/run.yml

-4
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,6 @@ steps:
6666
displayName: Install wix
6767
condition: and(succeeded(), not(variables.SKIP_JOB))
6868

69-
- bash: src/ci/scripts/install-innosetup.sh
70-
displayName: Install InnoSetup
71-
condition: and(succeeded(), not(variables.SKIP_JOB))
72-
7369
- bash: src/ci/scripts/symlink-build-dir.sh
7470
displayName: Ensure the build happens on a partition with enough space
7571
condition: and(succeeded(), not(variables.SKIP_JOB))

Diff for: src/ci/github-actions/ci.yml

-4
Original file line numberDiff line numberDiff line change
@@ -131,10 +131,6 @@ x--expand-yaml-anchors--remove:
131131
run: src/ci/scripts/install-wix.sh
132132
<<: *step
133133

134-
- name: install InnoSetup
135-
run: src/ci/scripts/install-innosetup.sh
136-
<<: *step
137-
138134
- name: ensure the build happens on a partition with enough space
139135
run: src/ci/scripts/symlink-build-dir.sh
140136
<<: *step

Diff for: src/ci/scripts/install-innosetup.sh

-18
This file was deleted.

Diff for: src/etc/installer/exe/modpath.iss

-219
This file was deleted.

0 commit comments

Comments
 (0)