Skip to content

Commit a2acb05

Browse files
committed
Simplify NSIS package script.
1 parent 8634c23 commit a2acb05

File tree

1 file changed

+8
-22
lines changed

1 file changed

+8
-22
lines changed

src/etc/pkg/rust.nsi

Lines changed: 8 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,8 @@ Section
2323
SectionEnd
2424

2525
Section "Compiler"
26-
SetOutPath $INSTDIR\bin
27-
File /oname=rustc.exe stage3\bin\rustc.exe
28-
29-
SetOutPath $INSTDIR\lib
30-
File /oname=rustllvm.dll stage3\lib\rustllvm.dll
31-
File /oname=rustrt.dll stage3\lib\rustrt.dll
32-
File /oname=std.dll stage3\lib\std.dll
33-
34-
SetOutPath $INSTDIR\lib\rustc\i686-pc-mingw32\lib
35-
File /oname=rustrt.dll stage3\lib\rustc\i686-pc-mingw32\lib\rustrt.dll
36-
File /oname=std.dll stage3\lib\rustc\i686-pc-mingw32\lib\std.dll
37-
File /oname=main.o stage3\lib\rustc\i686-pc-mingw32\lib\main.o
38-
File /oname=intrinsics.bc stage3\lib\rustc\i686-pc-mingw32\lib\intrinsics.bc
26+
SetOutPath $INSTDIR
27+
File /nonfatal /r i686-pc-mingw32\stage3\*.*
3928
SectionEnd
4029

4130
Section "Documentation"
@@ -46,21 +35,18 @@ SectionEnd
4635

4736
Section "Uninstall"
4837
Delete $INSTDIR\uninstall.exe
49-
Delete $INSTDIR\bin\rustc.exe
50-
Delete $INSTDIR\lib\rustllvm.dll
51-
Delete $INSTDIR\lib\rustrt.dll
52-
Delete $INSTDIR\lib\std.dll
53-
Delete $INSTDIR\lib\rustc\i686-pc-mingw32\lib\rustrt.dll
54-
Delete $INSTDIR\lib\rustc\i686-pc-mingw32\lib\std.dll
55-
Delete $INSTDIR\lib\rustc\i686-pc-mingw32\lib\main.o
56-
Delete $INSTDIR\lib\rustc\i686-pc-mingw32\lib\intrinsics.bc
38+
Delete $INSTDIR\bin\*.*
39+
Delete $INSTDIR\lib\*.*
40+
Delete $INSTDIR\lib\rustc\i686-pc-mingw32\bin\*.*
41+
Delete $INSTDIR\lib\rustc\i686-pc-mingw32\lib\*.*
5742
Delete $INSTDIR\doc\rust.html
5843
Delete $INSTDIR\doc\rust.pdf
5944
RMDir $INSTDIR\bin
45+
RMDir $INSTDIR\lib\rustc\i686-pc-mingw32\bin
6046
RMDir $INSTDIR\lib\rustc\i686-pc-mingw32\lib
6147
RMDir $INSTDIR\lib\rustc\i686-pc-mingw32
6248
RMDir $INSTDIR\lib\rustc
6349
RMDir $INSTDIR\lib
6450
RMDir $INSTDIR\doc
6551
RMDir $INSTDIR
66-
SectionEnd
52+
SectionEnd

0 commit comments

Comments
 (0)