diff options
| author | Graydon Hoare <graydon@mozilla.com> | 2012-01-05 17:03:02 -0800 |
|---|---|---|
| committer | Graydon Hoare <graydon@mozilla.com> | 2012-01-05 17:03:02 -0800 |
| commit | a2acb052cae2252e45f09a79ba48a15bb4d2bbd9 (patch) | |
| tree | 5714e53884463b82955e483ff6359155563e0186 /src | |
| parent | 8634c238c66407a368fd1b577d371a4e40c360b2 (diff) | |
| download | rust-a2acb052cae2252e45f09a79ba48a15bb4d2bbd9.tar.gz rust-a2acb052cae2252e45f09a79ba48a15bb4d2bbd9.zip | |
Simplify NSIS package script.
Diffstat (limited to 'src')
| -rw-r--r-- | src/etc/pkg/rust.nsi | 30 |
1 files changed, 8 insertions, 22 deletions
diff --git a/src/etc/pkg/rust.nsi b/src/etc/pkg/rust.nsi index aea22530f34..c4deff8daa8 100644 --- a/src/etc/pkg/rust.nsi +++ b/src/etc/pkg/rust.nsi @@ -23,19 +23,8 @@ Section SectionEnd Section "Compiler" - SetOutPath $INSTDIR\bin - File /oname=rustc.exe stage3\bin\rustc.exe - - SetOutPath $INSTDIR\lib - File /oname=rustllvm.dll stage3\lib\rustllvm.dll - File /oname=rustrt.dll stage3\lib\rustrt.dll - File /oname=std.dll stage3\lib\std.dll - - SetOutPath $INSTDIR\lib\rustc\i686-pc-mingw32\lib - File /oname=rustrt.dll stage3\lib\rustc\i686-pc-mingw32\lib\rustrt.dll - File /oname=std.dll stage3\lib\rustc\i686-pc-mingw32\lib\std.dll - File /oname=main.o stage3\lib\rustc\i686-pc-mingw32\lib\main.o - File /oname=intrinsics.bc stage3\lib\rustc\i686-pc-mingw32\lib\intrinsics.bc + SetOutPath $INSTDIR + File /nonfatal /r i686-pc-mingw32\stage3\*.* SectionEnd Section "Documentation" @@ -46,21 +35,18 @@ SectionEnd Section "Uninstall" Delete $INSTDIR\uninstall.exe - Delete $INSTDIR\bin\rustc.exe - Delete $INSTDIR\lib\rustllvm.dll - Delete $INSTDIR\lib\rustrt.dll - Delete $INSTDIR\lib\std.dll - Delete $INSTDIR\lib\rustc\i686-pc-mingw32\lib\rustrt.dll - Delete $INSTDIR\lib\rustc\i686-pc-mingw32\lib\std.dll - Delete $INSTDIR\lib\rustc\i686-pc-mingw32\lib\main.o - Delete $INSTDIR\lib\rustc\i686-pc-mingw32\lib\intrinsics.bc + Delete $INSTDIR\bin\*.* + Delete $INSTDIR\lib\*.* + Delete $INSTDIR\lib\rustc\i686-pc-mingw32\bin\*.* + Delete $INSTDIR\lib\rustc\i686-pc-mingw32\lib\*.* Delete $INSTDIR\doc\rust.html Delete $INSTDIR\doc\rust.pdf RMDir $INSTDIR\bin + RMDir $INSTDIR\lib\rustc\i686-pc-mingw32\bin RMDir $INSTDIR\lib\rustc\i686-pc-mingw32\lib RMDir $INSTDIR\lib\rustc\i686-pc-mingw32 RMDir $INSTDIR\lib\rustc RMDir $INSTDIR\lib RMDir $INSTDIR\doc RMDir $INSTDIR -SectionEnd \ No newline at end of file +SectionEnd |