Merge pull request #12 from sanelson/v0.15_support

V0.15 support

Author: sanelson

README.md

@@ -4,7 +4,7 @@ This is a collection of recipes that make it easier to build FreeCAD and depende
 
 # Installation
 
-These steps have been tested on Mavericks 10.9.2 through 10.10.1 with Xcode 5.1.
+These steps have been tested on Mavericks 10.9.2 through 10.10.3 with Xcode 6.3.2.
 
 ## Common Prerequisites
 
@@ -20,22 +20,18 @@ Tap this repository (you can safely ignore warnings about coin recipe conflicts)
 
     brew tap sanelson/freecad
 
-## Building Current Release Version of FreeCAD
+Install the coin dependency using the following command
 
-For the v0.14 release of FreeCAD you will need to build Coin without frameworks enabled but *with* soqt included.  Install the modified coin/soqt recipe from this tap
+    brew install --without-framework --without-soqt sanelson/freecad/coin
 
-    brew install --without-framework sanelson/freecad/coin
+## Building Current Release Version of FreeCAD
 
-Once the prerequisites are in place you can build FreeCAD.  The current STABLE version is v0.14.  To build this version, run the following command
+Once the prerequisites are in place you can build FreeCAD.  The current STABLE version is v0.15.  To build this version, run the following command
 
     brew install sanelson/freecad/freecad
 
 ## Building HEAD Version of FreeCAD
 
-If instead you'd like to build the very latest bleeding edge version (HEAD) from the [FreeCAD repo](https://github.com/FreeCAD/FreeCAD_sf_master), first install the coin dependency using the following command
-
-    brew install --without-framework --without-soqt sanelson/freecad/coin
-
 Then install FreeCAD
 
     brew install --HEAD sanelson/freecad/freecad

freecad.rb

@@ -3,8 +3,8 @@
 class Freecad < Formula
   homepage "http://sourceforge.net/projects/free-cad/"
   head "git://git.code.sf.net/p/free-cad/code"
-  url "http://downloads.sourceforge.net/project/free-cad/FreeCAD%20Source/freecad-0.14.3702.tar.gz"
-  sha1 "048f2aa9cabc71fa4e2b6e10c9a61d8e728faa36"
+  url "http://downloads.sourceforge.net/project/free-cad/FreeCAD%20Source/freecad_0.15.4671.tar.gz"
+  sha256 "8dda8f355cb59866a55c9c6096f39a3ebc5347892284db4c305352cc9be03bbc"
 
   # Debugging Support
   option 'with-debug', 'Enable debugging build'
@@ -37,7 +37,7 @@ class Freecad < Formula
   depends_on 'sip'
   depends_on 'xerces-c'
   depends_on 'eigen'
-  depends_on 'coin'
+  depends_on 'coin' => ['--without-framework', '--without-soqt']
   depends_on 'qt'
   depends_on 'pyqt'
   depends_on 'shiboken'
@@ -48,9 +48,8 @@ class Freecad < Formula
   # Recommended dependencies
   depends_on 'freetype' => :recommended
 
-  # v0.14 vs HEAD fixes
-  # TODO: When v0.15 is released, these fixes will be removed
-  unless build.without? 'external-pivy' or not build.head?
+  # Allow building with internal pivy
+  unless build.without? 'external-pivy'
     depends_on 'pivy' => [:recommended, '--HEAD']
   end
 
@@ -62,10 +61,9 @@ def install
       ohai "Creating debugging build..."
     end
 
-    # v0.14 vs HEAD fixes
-    # TODO: When v0.15 is released, these fixes will be removed
+    # Allow building with internal pivy
     use_external_pivy='ON'
-    if build.without? 'external-pivy' or not build.head?
+    if build.without? 'external-pivy'
       ohai "Building without external Pivy"
       use_external_pivy='OFF'
     end
@@ -84,25 +82,9 @@ def install
     # TODO add opencascade support/detection
     oce_dir = "#{Formula['oce'].opt_prefix}/OCE.framework/Versions/#{Formula['oce'].version}/Resources"
 
-    # v0.14 vs HEAD fixes
-    # TODO: When v0.15 is released, these fixes will be removed
-    # Handle recent CMAKE build prefix changes
-    cmake_build_robot_arg = ''
-    if build.head?
-      cmake_build_robot_arg = '-DBUILD_ROBOT=OFF'
-    else
-      cmake_build_robot_arg = '-DFREECAD_BUILD_ROBOT=OFF'
-    end
-
-    # Fix FindPySideTools.cmake script issues
-    if build.head?
-      inreplace "cMake/FindPySideTools.cmake", "FIND_PROGRAM( PYSIDEUIC4BINARY PYSIDEUIC4", 'FIND_PROGRAM( PYSIDEUIC4BINARY pyside-uic'
-      inreplace "cMake/FindPySideTools.cmake", "FIND_PROGRAM(PYSIDERCC4BINARY PYSIDERCC4", 'FIND_PROGRAM(PYSIDERCC4BINARY pyside-rcc'
-    end
-
     # Set up needed cmake args
     args = std_cmake_args + %W[
-      #{cmake_build_robot_arg}
+      -DBUILD_ROBOT=OFF
       -DFREECAD_USE_EXTERNAL_PIVY=#{use_external_pivy}
       -DPYTHON_LIBRARY=#{python_library}
       -DPYTHON_INCLUDE_DIR=#{python_include_dir}