Ticket #45881: patch-Nukefile.diff

Nukefile

@@ -100 +100 @@
 (ifDarwin
          (then (set @cflags ( "-Wall -g -fPIC -O2 -DMACOSX #{@sdk} #{@sdkflags}"))
                (set @mflags_nogc "-fobjc-exceptions")
-               (set @mflags (+ @mflags_nogc " -fobjc-gc"))) ;; To use garbage collection, add this flag: "-fobjc-gc"
+               (set @mflags @mflags_nogc)) ;; To use garbage collection, add this flag: "-fobjc-gc"
          (else (set @cflags "-Wall -g -std=gnu99 -fPIC")
                (set @mflags ((NSString stringWithShellCommand:"gnustep-config --objc-flags") chomp))))
 
@@ -112 +112 @@
 (set @cflags (+ @cflags " -DHAVE_CONFIG_H"))
 
 (ifDarwin
-         (then (set @arch '()))) ;; optionally add "ppc" or "ppc64" to the list
-
-(if (or isSnowLeopard isLion)
-        (then (set @arch (append @arch '("x86_64")))))
+        (then (set @arch '("x86_64"))))
 
 (set @includes
      ((@inc_dirs map: (do (inc) " -I#{inc}")) join))
@@ -201 +198 @@
 (task "install" => "nush" is
       ('("nuke" "nubile" "nutemplate" "nutest" "nudoc" "nubake" "nutmbundle") each:
         (do (program)
-            (SH "sudo cp tools/#{program} #{@installprefix}/bin")))
-      (SH "sudo cp nush #{@installprefix}/bin")
+            (SH "cp tools/#{program} #{@installprefix}/bin")))
+      (SH "cp nush #{@installprefix}/bin")
       (ifDarwin
                ;; install the framework
-               (SH "sudo rm -rf #{@destdir}/Library/Frameworks/#{@framework}.framework")
-               (SH "sudo ditto #{@framework}.framework #{@destdir}/Library/Frameworks/#{@framework}.framework"))
+               (SH "rm -rf #{@destdir}/Library/Frameworks/#{@framework}.framework")
+               (SH "ditto #{@framework}.framework #{@destdir}/Library/Frameworks/#{@framework}.framework"))
       (ifGNUstep
           ;; install the dynamic library
-          (SH "sudo cp #{@library_executable_name} #{@installprefix}/lib")
+          (SH "cp #{@library_executable_name} #{@installprefix}/lib")
           ;; copy the headers
-          (SH "sudo rm -rf #{@installprefix}/include/Nu")
-          (SH "sudo cp -rp include/Nu #{@installprefix}/include")
-          (SH "sudo cp -rp objc/*.h #{@installprefix}/include/Nu")
-          (SH "sudo cp -rp nu/ #{@installprefix}/share/libNu"))
-      (SH "sudo mkdir -p #{@installprefix}/share")
-      (SH "sudo rm -rf #{@installprefix}/share/nu")
-      (SH "sudo cp -rp share/nu #{@installprefix}/share/nu")
+          (SH "rm -rf #{@installprefix}/include/Nu")
+          (SH "cp -rp include/Nu #{@installprefix}/include")
+          (SH "cp -rp objc/*.h #{@installprefix}/include/Nu")
+          (SH "cp -rp nu/ #{@installprefix}/share/libNu"))
+      (SH "mkdir -p #{@installprefix}/share")
+      (SH "rm -rf #{@installprefix}/share/nu")
+      (SH "cp -rp share/nu #{@installprefix}/share/nu")
       (ifDarwin
-               (SH "sudo ditto examples #{@installprefix}/share/nu/examples")))
+               (SH "ditto examples #{@installprefix}/share/nu/examples")))
 
 ;; Build a disk image for distributing the framework.
 (task "framework_image" => "framework" is
@@ -234 +231 @@
 
 ;; Build an installer and wrap it in a disk image.
 (task "installer" => "framework" "nush" is
-      (SH "sudo rm -rf package dmg Nu.dmg")
+      (SH "rm -rf package dmg Nu.dmg")
       (SH "mkdir -p package/Library/Frameworks")
       (SH "mkdir -p package/usr/local/bin")
       (SH "mkdir -p package/usr/local/share")
@@ -243 +240 @@
       (SH "cp -pRfv examples package/usr/local/share/nu")
       (SH "cp nush package/usr/local/bin")
       (SH "cp tools/* package/usr/local/bin")
-      (SH "sudo chown -R root package")
-      (SH "sudo chgrp -R admin package")
+      (SH "chown -R root package")
+      (SH "chgrp -R admin package")
       (SH "#{PACKAGEMAKER} -build -f package -p Nu.pkg -d pkg/Description.plist -i pkg/Info.plist")
       (SH "mkdir dmg; mv Nu.pkg dmg")
       (set imagefile "Nu-#{(VERSION first)}.#{(VERSION second)}.#{(VERSION third)}.dmg")
-      (SH "sudo rm -f #{imagefile}")
+      (SH "rm -f #{imagefile}")
       (SH "hdiutil create -srcdir dmg #{imagefile} -volname Nu")
-      (SH "sudo rm -rf dmg package"))
+      (SH "rm -rf dmg package"))
 
 ;; alias for installer task
 (task "dmg" => "installer")