From 06e2046bb2205e7aeaf0204418ac52f95ceffd2b Mon Sep 17 00:00:00 2001
From: Baptiste Fontaine
Date: Tue, 20 Jan 2015 11:04:20 +0100
Subject: fantom 1.0.67

Closes #36059.

Signed-off-by: Mike McQuaid <mike@mikemcquaid.com>
---
 Library/Formula/fantom.rb | 54 ++++++++++++++++++-----------------------------
 1 file changed, 20 insertions(+), 34 deletions(-)

(limited to 'Library/Formula')

diff --git a/Library/Formula/fantom.rb b/Library/Formula/fantom.rb
index 02d91d22f..174cf8813 100644
--- a/Library/Formula/fantom.rb
+++ b/Library/Formula/fantom.rb
@@ -1,45 +1,31 @@
-require 'formula'
-
 class Fantom < Formula
-  homepage 'http://fantom.org'
-  url 'https://bitbucket.org/fantom/fan-1.0/downloads/fantom-1.0.66.zip'
-  sha1 '8389fc5111970e89b7b4cbe395e85a48872b4131'
-
-  option 'with-src', 'Also install fantom source'
-  option 'with-examples', 'Also install fantom examples'
+  homepage "http://fantom.org"
+  url "https://bitbucket.org/fantom/fan-1.0/downloads/fantom-1.0.67.zip"
+  sha1 "36e45cc713c14b56df2bdbb19a8ccee98420ad1e"
 
-  # Select the OS X JDK path in the config file
-  patch :DATA
+  option "with-src", "Also install fantom source"
+  option "with-examples", "Also install fantom examples"
 
   def install
-    rm_f Dir["bin/*.exe", "lib/dotnet/*"]
+    rm_f Dir["bin/*.exe", "bin/*.dll", "lib/dotnet/*"]
     rm_rf "examples" if build.without? "examples"
     rm_rf "src" if build.without? "src"
 
-    libexec.install Dir['*']
-    system "chmod 0755 #{libexec}/bin/*"
+    # Select the OS X JDK path in the config file
+    inreplace "etc/build/config.props", "//jdkHome=/System", "jdkHome=/System"
+
+    libexec.install Dir["*"]
+    chmod 0755, Dir["#{libexec}/bin/*"]
     bin.install_symlink Dir["#{libexec}/bin/*"]
   end
-end
-
-__END__
-diff --git a/etc/build/config.props b/etc/build/config.props
-index 368bce3..ebbff42 100755
---- a/etc/build/config.props
-+++ b/etc/build/config.props
-@@ -22,8 +22,8 @@ buildVersion=1.0.65
- javacParams=-target 1.5
-
- // Windows setup
--jdkHome=/C:/Program Files/Java/jdk1.6/
--dotnetHome=/C:/WINDOWS/Microsoft.NET/Framework/v2.0.50727/
-+//jdkHome=/C:/Program Files/Java/jdk1.6/
-+//dotnetHome=/C:/WINDOWS/Microsoft.NET/Framework/v2.0.50727/
-
- // Mac setup
--//jdkHome=/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home/
-\ No newline at end of file
-+jdkHome=/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home/
-\ No newline at end of file
 
+  test do
+    (testpath/"test.fan").write <<-EOS.undent
+      class ATest {
+        static Void main() { echo("a test") }
+      }
+    EOS
 
+    assert_match "a test", shell_output("#{bin}/fan test.fan").chomp
+  end
+end
-- 
cgit v1.2.3