Skip to content

Commit 912963b

Browse files
committed
Remove legacy InnoSetup GUI installer
On Windows the InnoSetup installer was superseded by the MSI installer. It's no longer needed.
1 parent 997d953 commit 912963b

File tree

8 files changed

+0
-423
lines changed

8 files changed

+0
-423
lines changed

.github/workflows/ci.yml

Lines changed: 0 additions & 9 deletions
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
@@ -200,9 +197,6 @@ jobs:
200197
- name: install WIX
201198
run: src/ci/scripts/install-wix.sh
202199
if: success() && !env.SKIP_JOB
203-
- name: install InnoSetup
204-
run: src/ci/scripts/install-innosetup.sh
205-
if: success() && !env.SKIP_JOB
206200
- name: ensure the build happens on a partition with enough space
207201
run: src/ci/scripts/symlink-build-dir.sh
208202
if: success() && !env.SKIP_JOB
@@ -552,9 +546,6 @@ jobs:
552546
- name: install WIX
553547
run: src/ci/scripts/install-wix.sh
554548
if: success() && !env.SKIP_JOB
555-
- name: install InnoSetup
556-
run: src/ci/scripts/install-innosetup.sh
557-
if: success() && !env.SKIP_JOB
558549
- name: ensure the build happens on a partition with enough space
559550
run: src/ci/scripts/symlink-build-dir.sh
560551
if: success() && !env.SKIP_JOB

src/bootstrap/dist.rs

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1859,28 +1859,7 @@ impl Step for Extended {
18591859
prepare("rust-mingw");
18601860
}
18611861

1862-
builder.install(&xform(&etc.join("exe/rust.iss")), &exe, 0o644);
1863-
builder.install(&etc.join("exe/modpath.iss"), &exe, 0o644);
1864-
builder.install(&etc.join("exe/upgrade.iss"), &exe, 0o644);
18651862
builder.install(&etc.join("gfx/rust-logo.ico"), &exe, 0o644);
1866-
builder.create(&exe.join("LICENSE.txt"), &license);
1867-
1868-
// Generate exe installer
1869-
builder.info("building `exe` installer with `iscc`");
1870-
let mut cmd = Command::new("iscc");
1871-
cmd.arg("rust.iss").arg("/Q").current_dir(&exe);
1872-
if target.contains("windows-gnu") {
1873-
cmd.arg("/dMINGW");
1874-
}
1875-
add_env(builder, &mut cmd, target);
1876-
let time = timeit(builder);
1877-
builder.run(&mut cmd);
1878-
drop(time);
1879-
builder.install(
1880-
&exe.join(format!("{}-{}.exe", pkgname(builder, "rust"), target)),
1881-
&distdir(builder),
1882-
0o755,
1883-
);
18841863

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

src/ci/azure-pipelines/steps/run.yml

Lines changed: 0 additions & 4 deletions
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))

src/ci/github-actions/ci.yml

Lines changed: 0 additions & 4 deletions
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

src/ci/scripts/install-innosetup.sh

Lines changed: 0 additions & 18 deletions
This file was deleted.

src/etc/installer/exe/modpath.iss

Lines changed: 0 additions & 219 deletions
This file was deleted.

0 commit comments

Comments
 (0)