From: Graydon Hoare <graydon@mozilla.com>
Date: Fri, 6 Jan 2012 01:03:02 +0000 (-0800)
Subject: Simplify NSIS package script.
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=a2acb052cae2252e45f09a79ba48a15bb4d2bbd9;p=rust.git

Simplify NSIS package script.
---

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