nevans-iphone_testify 0.1.14

data/History.txt

@@ -0,0 +1,26 @@
+== 0.0.1 / 2009-02-25
+
+* Getting started
+
+== 0.0.6 / 2009-02-25
+
+* Tidy up.  
+
+* Adding growl pass/fail images for autotesting
+* Adding UnitTests directory as part of skeleton
+
+== 0.0.7
+
+* added .gitignore
+* detects more failure conditions in growl message: segmentation faults, more build errors
+* moved bulk of Rake into separate file
+* changed tasks to auto:test, an auto:test:all
+
+== 0.1.10
+
+* ./autoiphonetest.rb no longer goes through rake
+
+== 0.1.11
+
+* Default task added to Rakefile
+* fix to .gitignore to ignore build

data/README.rdoc

@@ -0,0 +1,90 @@
+iphone_testify
+    by Paul Wilson
+    http://merecomplexities.com
+
+== DESCRIPTION:
+
+Utility to help set up and iPhone project for testing using code from {The Google Toolbox for Mac}[http://code.google.com/p/google-toolbox-for-mac/].
+
+== FEATURES:
+
+* Copies google test files into the "google_testing" directory
+* Creates a UnitTests directory
+* Adds Rakefile for compiling (via xcode) and reporting test failures (on console and via Growl) 
+* Adds an 'autoiphonetest.rb' file for _autotest_ style running of all tests when a change has been detected.
+
+== TODO:
+
+There are a few more things I'd like this gem to do.
+
+* Generation of test stubs
+* Automatic setup of _Unit Test_ target through XCode (via automation?)
+* Automatic addition of test files to _Unit Test_ target 
+
+== SYNOPSIS:
+
+From console cd to your project root directory.  Type
+  % iphone_testify
+
+Unfortunately there are some manual stages needed to add a _Unit Test_ target  to your Xcode project.  This is based on the {Google Toolbox Wiki instructions}[http://code.google.com/p/google-toolbox-for-mac/wiki/iPhoneUnitTesting]
+
+1. Create a new iPhone Target (Cocoa Touch Application) via "Project Menu > New Target..." called "Unit Test".
+2. Add all the ObjectiveC files that have been copied to your 'google_testing' directory to this target
+3. Add your project files to this target
+4. Add a new 'run script' build phase as the last step of your target build via "Project Menu > New Build Phase > New Run Script Build Phase", and dragging it to the end of the build steps if needed.
+5. Edit your Run Script Build Phase by double clicking it, and set the shell to "/bin/sh" and the script to "google_testing/RunIPhoneUnitTest.sh"
+
+
+To autocompile/autorun all tests every time code changes
+
+  % ./autoiphonetest.rb
+
+
+To compile and run tests if code has changed since the last run
+
+  % rake auto:test
+
+To compile and run all tests even if nothing has changed since the last time
+  
+  % rake auto:test:all
+  
+  
+
+== REQUIREMENTS:
+
+* OS X Leopard
+* XCode 3.1 (containing the iPhone SDK)
+* Ruby (comes on Leopard)
+
+== INSTALL:
+
+  % sudo gem sources -a http://gems.github.com # (you only need to do this once)
+  % sudo gem install paulanthonywilson-iphone_testify
+
+== LICENSE:
+
+Contains file taken from {The Google Toolbox for Mac}[http://code.google.com/p/google-toolbox-for-mac/].  See skeleton/google_testing/GoogleToolboxForMac.license which is also copied into the google_testing directory.
+
+
+(The MIT License)
+
+Copyright (c) 2009
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+'Software'), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Rakefile

@@ -0,0 +1,34 @@
+# Look in the tasks/setup.rb file for the various options that can be
+# configured in this Rakefile. The .rake files in the tasks directory
+# are where the options are used.
+
+begin
+  require 'bones'
+  Bones.setup
+rescue LoadError
+  begin
+    load 'tasks/setup.rb'
+  rescue LoadError
+    raise RuntimeError, '### please install the "bones" gem ###'
+  end
+end
+
+ensure_in_path 'lib'
+require 'iphone_testify'
+
+task :default => 'test:run'
+
+PROJ.name = 'iphone_testify'
+PROJ.authors = 'Paul Wilson'
+PROJ.email = 'paul.wilson@merecomplexities.com'
+PROJ.url = 'http://github.com/paulanthonywilson/iphone_testify/'
+PROJ.version = IphoneTestify::VERSION
+
+PROJ.exclude += ['\.gitignore', '\.DS_Store', '\.gem']
+PROJ.notes.exclude = %w(^README\.txt$ ^data/)
+PROJ.readme_file = 'README.rdoc'
+
+depend_on "paulanthonywilson-osx_watchfolder"
+depend_on "rake"
+
+# EOF

data/bin/iphone_testify

@@ -0,0 +1,9 @@
+#!/usr/bin/env ruby
+
+require File.expand_path(
+    File.join(File.dirname(__FILE__), %w[.. lib iphone_testify]))
+
+# Put your code here
+IphoneTestify::Setup::setup
+
+# EOF

data/lib/iphone_testify.rb

@@ -0,0 +1,49 @@
+
+module IphoneTestify
+  GEMDIR = File.expand_path(File.dirname(__FILE__) + "/..")
+  # :stopdoc:
+  VERSION = '0.1.12'
+  LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR
+  PATH = ::File.dirname(LIBPATH) + ::File::SEPARATOR
+  # :startdoc:
+
+  # Returns the version string for the library.
+  #
+  def self.version
+    VERSION
+  end
+
+  # Returns the library path for the module. If any arguments are given,
+  # they will be joined to the end of the libray path using
+  # <tt>File.join</tt>.
+  #
+  def self.libpath( *args )
+    args.empty? ? LIBPATH : ::File.join(LIBPATH, args.flatten)
+  end
+
+  # Returns the lpath for the module. If any arguments are given,
+  # they will be joined to the end of the path using
+  # <tt>File.join</tt>.
+  #
+  def self.path( *args )
+    args.empty? ? PATH : ::File.join(PATH, args.flatten)
+  end
+
+  # Utility method used to require all files ending in .rb that lie in the
+  # directory below this file that has the same name as the filename passed
+  # in. Optionally, a specific _directory_ name can be passed in such that
+  # the _filename_ does not have to be equivalent to the directory.
+  #
+  def self.require_all_libs_relative_to( fname, dir = nil )
+    dir ||= ::File.basename(fname, '.*')
+    search_me = ::File.expand_path(
+        ::File.join(::File.dirname(fname), dir, '**', '*.rb'))
+
+    Dir.glob(search_me).sort.each {|rb| require rb}
+  end
+
+end  # module IphoneTestify
+
+IphoneTestify.require_all_libs_relative_to(__FILE__)
+
+# EOF

data/lib/iphone_testify/setup.rb

@@ -0,0 +1,14 @@
+require 'fileutils'
+
+module IphoneTestify
+  
+  module Setup
+    SKELETONDIR = GEMDIR + "/skeleton"
+    extend FileUtils
+    def self.setup
+      cp_r "#{SKELETONDIR}/.", "."
+      mv 'gitignore', '.gitignore', :force=>true
+      mkdir_p "UnitTests"
+    end
+  end
+end

data/skeleton/Autotest.rake

@@ -0,0 +1,26 @@
+require File.dirname(__FILE__) + '/autotest'
+
+BUILD_STATUS_FILE=".built"
+
+
+file BUILD_STATUS_FILE => Dir.glob("Classes/*.[hm]") + Dir.glob("UnitTests/*.m") do
+  notice = AutoTest::test_and_report
+  File.open(BUILD_STATUS_FILE, 'w') {|f| f.write(notice * ": ")}  
+end
+
+
+task 'auto:remove_built_file' do
+  FileUtils.rm_f(BUILD_STATUS_FILE)
+end
+
+desc "build and run the tests "
+task 'auto:test:all'=>['auto:remove_built_file', 'auto:test']
+
+desc "build and run the tests if changed"
+task 'auto:test'=>[BUILD_STATUS_FILE] do
+  out =  File.open('.built') {|f| f.read}
+  print out.coloured(out =~ /Pass/ ? :green : :red) + "\n"
+end
+
+
+

data/skeleton/Rakefile

@@ -0,0 +1,4 @@
+load 'Autotest.rake'
+
+
+task :default => ['auto:test']

data/skeleton/UnitTests/put_unit_tests_here.txt

@@ -0,0 +1 @@
+Put unit tests in this directory.

data/skeleton/autoiphonetest.rb

@@ -0,0 +1,20 @@
+#!/usr/bin/env ruby
+
+require File.dirname(__FILE__) + '/autotest'
+
+require 'rubygems'
+
+gem 'paulanthonywilson-osx_watchfolder'
+gem 'rake'
+
+require 'osx_watchfolder'
+
+ARGV.clear
+ARGV << 'auto:test:all'
+
+
+AutoTest::test_and_report
+
+OsxWatchfolder::FolderWatcher.new("Classes", "UnitTests") do 
+  AutoTest::test_and_report
+end.start

data/skeleton/autotest.rb

@@ -0,0 +1,76 @@
+SIMULATOR_VERSION = "3.0"
+class String
+  attr_accessor :colour
+  RESET="\e[00;m"
+
+  def coloured(colour = nil)
+    colour||=@colour
+    "#{colour_code(colour)}#{self}#{RESET}"
+  end
+
+  private 
+  def colour_code colour
+    case colour
+    when :red : "\e[01;31m"
+    when :green : "\e[01;32m"
+    end
+  end
+end
+
+module AutoTest
+  def self.test_and_report
+    failure_line = test
+    report failure_line   
+  end
+  
+  def self.report failure_line
+    if failure_line
+      notice = ['Fail', failure_line.chomp]
+    else
+      notice = ['Pass']
+    end
+    AutoTest::growl *notice
+    puts failure_line.coloured if failure_line
+    notice    
+  end
+  
+  def self.run_test
+    puts "Build: #{Time::now}"
+    output = `xcodebuild -target "Unit Test" -configuration Debug -sdk iphonesimulator#{SIMULATOR_VERSION} 2>&1`
+    failure_line = nil
+    output.each do |line|
+      if line =~ /error:|^Executed.*(\d+) failures|Undefined symbols|PurpleSystemEventPort|FAILED|Segmentation fault/
+        if $1.nil? || $1.to_i > 0
+          failure_line||= line
+          line.colour = :red
+        else
+          line.colour = :green
+        end
+      end
+      print line.coloured unless line =~/Merge mismatch|setenv/
+    end
+    failure_line
+  end
+  
+  def self.unable_to_run_test
+    "Unable to run tests as the simulator is already running"
+  end
+  
+  def self.simulator_running?
+    !`ps -AO command`.split("\n").grep(/iPhoneSimulator.platform\/Developer\/Applications\/iPhone Simulator\.app/).empty?
+  end
+  
+  def self.test
+    if simulator_running?
+      unable_to_run_test
+    else
+      run_test
+    end
+  end
+
+  def self.growl title, msg =""
+    img = "~/.autotest_images/#{title.downcase}.png"
+    `growlnotify -H localhost -n autotest --image #{img} -p 0 -m #{msg.inspect} #{title}` 
+  end
+
+end

data/skeleton/gitignore

@@ -0,0 +1,20 @@
+.built
+*tm_build_errors
+# xcode noise
+
+build/*
+*.pbxuser
+*.mode2v3
+*.mode1v3
+*.perspective
+*.perspectivev3
+
+
+# osx noise
+.DS_Store
+profile
+
+
+*.swp
+*~.nib
+

data/skeleton/google_testing/GTMDefines.h

@@ -0,0 +1,268 @@
+// 
+// GTMDefines.h
+//
+//  Copyright 2008 Google Inc.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License"); you may not
+//  use this file except in compliance with the License.  You may obtain a copy
+//  of the License at
+// 
+//  http://www.apache.org/licenses/LICENSE-2.0
+// 
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+//  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+//  License for the specific language governing permissions and limitations under
+//  the License.
+//
+ 
+// ============================================================================
+
+#include <AvailabilityMacros.h>
+#include <TargetConditionals.h>
+
+// Not all MAC_OS_X_VERSION_10_X macros defined in past SDKs
+#ifndef MAC_OS_X_VERSION_10_5
+  #define MAC_OS_X_VERSION_10_5 1050
+#endif
+#ifndef MAC_OS_X_VERSION_10_6
+  #define MAC_OS_X_VERSION_10_6 1060
+#endif
+
+// These definitions exist to allow headerdoc to parse this file.
+// Headerdoc 8.6 gives warnings about misuses of MAC_OS_X_VERSION_MIN_REQUIRED
+// and MAC_OS_X_VERSION_MAX_ALLOWED if you use them directly. 
+// By defining GTM versions with slightly different names (MIN vs MINIMUM) 
+// we get around headerdoc's issues. Hopefully we can work around this in the
+// future and get rid of the GTM versions, so please use the default ones
+// wherever you can.
+#ifndef GTM_MAC_OS_X_VERSION_MINIMUM_REQUIRED
+  #define GTM_MAC_OS_X_VERSION_MINIMUM_REQUIRED MAC_OS_X_VERSION_MIN_REQUIRED
+#endif
+
+#ifndef GTM_MAC_OS_X_VERSION_MAXIMUM_ALLOWED
+  #define GTM_MAC_OS_X_VERSION_MAXIMUM_ALLOWED MAC_OS_X_VERSION_MAX_ALLOWED
+#endif
+
+// ----------------------------------------------------------------------------
+// CPP symbols that can be overridden in a prefix to control how the toolbox
+// is compiled.
+// ----------------------------------------------------------------------------
+
+
+// By setting the GTM_CONTAINERS_VALIDATION_FAILED_LOG and 
+// GTM_CONTAINERS_VALIDATION_FAILED_ASSERT macros you can control what happens
+// when a validation fails. If you implement your own validators, you may want
+// to control their internals using the same macros for consistency.
+#ifndef GTM_CONTAINERS_VALIDATION_FAILED_ASSERT
+  #define GTM_CONTAINERS_VALIDATION_FAILED_ASSERT 0
+#endif
+
+// Give ourselves a consistent way to do inlines.  Apple's macros even use
+// a few different actual definitions, so we're based off of the foundation
+// one.
+#if !defined(GTM_INLINE)
+  #if defined (__GNUC__) && (__GNUC__ == 4)
+    #define GTM_INLINE static __inline__ __attribute__((always_inline))
+  #else
+    #define GTM_INLINE static __inline__
+  #endif
+#endif
+
+// Give ourselves a consistent way of doing externs that links up nicely
+// when mixing objc and objc++
+#if !defined (GTM_EXTERN)
+  #if defined __cplusplus
+    #define GTM_EXTERN extern "C"
+  #else
+    #define GTM_EXTERN extern
+  #endif
+#endif
+
+// Give ourselves a consistent way of exporting things if we have visibility
+// set to hidden.
+#if !defined (GTM_EXPORT)
+  #define GTM_EXPORT __attribute__((visibility("default")))
+#endif
+
+// _GTMDevLog & _GTMDevAssert
+//
+// _GTMDevLog & _GTMDevAssert are meant to be a very lightweight shell for
+// developer level errors.  This implementation simply macros to NSLog/NSAssert.
+// It is not intended to be a general logging/reporting system.
+//
+// Please see http://code.google.com/p/google-toolbox-for-mac/wiki/DevLogNAssert
+// for a little more background on the usage of these macros.
+//
+//    _GTMDevLog           log some error/problem in debug builds
+//    _GTMDevAssert        assert if conditon isn't met w/in a method/function
+//                           in all builds.
+// 
+// To replace this system, just provide different macro definitions in your
+// prefix header.  Remember, any implementation you provide *must* be thread
+// safe since this could be called by anything in what ever situtation it has
+// been placed in.
+// 
+
+// We only define the simple macros if nothing else has defined this.
+#ifndef _GTMDevLog
+
+#ifdef DEBUG
+  #define _GTMDevLog(...) NSLog(__VA_ARGS__)
+#else
+  #define _GTMDevLog(...) do { } while (0)
+#endif
+
+#endif // _GTMDevLog
+
+// Declared here so that it can easily be used for logging tracking if
+// necessary. See GTMUnitTestDevLog.h for details.
+@class NSString;
+GTM_EXTERN void _GTMUnitTestDevLog(NSString *format, ...);
+
+#ifndef _GTMDevAssert
+// we directly invoke the NSAssert handler so we can pass on the varargs
+// (NSAssert doesn't have a macro we can use that takes varargs)
+#if !defined(NS_BLOCK_ASSERTIONS)
+  #define _GTMDevAssert(condition, ...)                                       \
+    do {                                                                      \
+      if (!(condition)) {                                                     \
+        [[NSAssertionHandler currentHandler]                                  \
+            handleFailureInFunction:[NSString stringWithUTF8String:__PRETTY_FUNCTION__] \
+                               file:[NSString stringWithUTF8String:__FILE__]  \
+                         lineNumber:__LINE__                                  \
+                        description:__VA_ARGS__];                             \
+      }                                                                       \
+    } while(0)
+#else // !defined(NS_BLOCK_ASSERTIONS)
+  #define _GTMDevAssert(condition, ...) do { } while (0)
+#endif // !defined(NS_BLOCK_ASSERTIONS)
+
+#endif // _GTMDevAssert
+
+// _GTMCompileAssert
+// _GTMCompileAssert is an assert that is meant to fire at compile time if you
+// want to check things at compile instead of runtime. For example if you
+// want to check that a wchar is 4 bytes instead of 2 you would use
+// _GTMCompileAssert(sizeof(wchar_t) == 4, wchar_t_is_4_bytes_on_OS_X)
+// Note that the second "arg" is not in quotes, and must be a valid processor
+// symbol in it's own right (no spaces, punctuation etc).
+
+// Wrapping this in an #ifndef allows external groups to define their own
+// compile time assert scheme.
+#ifndef _GTMCompileAssert
+  // We got this technique from here:
+  // http://unixjunkie.blogspot.com/2007/10/better-compile-time-asserts_29.html
+
+  #define _GTMCompileAssertSymbolInner(line, msg) _GTMCOMPILEASSERT ## line ## __ ## msg
+  #define _GTMCompileAssertSymbol(line, msg) _GTMCompileAssertSymbolInner(line, msg)
+  #define _GTMCompileAssert(test, msg) \
+    typedef char _GTMCompileAssertSymbol(__LINE__, msg) [ ((test) ? 1 : -1) ]
+#endif // _GTMCompileAssert
+
+// Macro to allow fast enumeration when building for 10.5 or later, and
+// reliance on NSEnumerator for 10.4.  Remember, NSDictionary w/ FastEnumeration
+// does keys, so pick the right thing, nothing is done on the FastEnumeration
+// side to be sure you're getting what you wanted.
+#ifndef GTM_FOREACH_OBJECT
+  #if TARGET_OS_IPHONE || (GTM_MAC_OS_X_VERSION_MINIMUM_REQUIRED >= MAC_OS_X_VERSION_10_5)
+    #define GTM_FOREACH_ENUMEREE(element, enumeration) \
+      for (element in enumeration)
+    #define GTM_FOREACH_OBJECT(element, collection) \
+      for (element in collection)
+    #define GTM_FOREACH_KEY(element, collection) \
+      for (element in collection)
+  #else
+    #define GTM_FOREACH_ENUMEREE(element, enumeration) \
+      for (NSEnumerator *_ ## element ## _enum = enumeration; \
+           (element = [_ ## element ## _enum nextObject]) != nil; )
+    #define GTM_FOREACH_OBJECT(element, collection) \
+      GTM_FOREACH_ENUMEREE(element, [collection objectEnumerator])
+    #define GTM_FOREACH_KEY(element, collection) \
+      GTM_FOREACH_ENUMEREE(element, [collection keyEnumerator])
+  #endif
+#endif
+
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// CPP symbols defined based on the project settings so the GTM code has
+// simple things to test against w/o scattering the knowledge of project
+// setting through all the code.
+// ----------------------------------------------------------------------------
+
+// Provide a single constant CPP symbol that all of GTM uses for ifdefing
+// iPhone code.
+#if TARGET_OS_IPHONE // iPhone SDK
+  // For iPhone specific stuff
+  #define GTM_IPHONE_SDK 1
+  #if TARGET_IPHONE_SIMULATOR
+    #define GTM_IPHONE_SIMULATOR 1
+  #else
+    #define GTM_IPHONE_DEVICE 1
+  #endif  // TARGET_IPHONE_SIMULATOR
+#else
+  // For MacOS specific stuff
+  #define GTM_MACOS_SDK 1
+#endif
+
+// Some of our own availability macros
+#if GTM_MACOS_SDK
+#define GTM_AVAILABLE_ONLY_ON_IPHONE UNAVAILABLE_ATTRIBUTE
+#define GTM_AVAILABLE_ONLY_ON_MACOS
+#else 
+#define GTM_AVAILABLE_ONLY_ON_IPHONE
+#define GTM_AVAILABLE_ONLY_ON_MACOS UNAVAILABLE_ATTRIBUTE
+#endif 
+
+// Provide a symbol to include/exclude extra code for GC support.  (This mainly
+// just controls the inclusion of finalize methods).
+#ifndef GTM_SUPPORT_GC
+  #if GTM_IPHONE_SDK
+    // iPhone never needs GC
+    #define GTM_SUPPORT_GC 0
+  #else
+    // We can't find a symbol to tell if GC is supported/required, so best we
+    // do on Mac targets is include it if we're on 10.5 or later.
+    #if GTM_MAC_OS_X_VERSION_MAXIMUM_ALLOWED <= MAC_OS_X_VERSION_10_4
+      #define GTM_SUPPORT_GC 0
+    #else
+      #define GTM_SUPPORT_GC 1
+    #endif
+  #endif
+#endif
+
+// To simplify support for 64bit (and Leopard in general), we provide the type
+// defines for non Leopard SDKs
+#if GTM_MAC_OS_X_VERSION_MAXIMUM_ALLOWED <= MAC_OS_X_VERSION_10_4
+ // NSInteger/NSUInteger and Max/Mins
+  #ifndef NSINTEGER_DEFINED
+    #if __LP64__ || NS_BUILD_32_LIKE_64
+      typedef long NSInteger;
+      typedef unsigned long NSUInteger;
+    #else
+      typedef int NSInteger;
+      typedef unsigned int NSUInteger;
+    #endif
+    #define NSIntegerMax    LONG_MAX
+    #define NSIntegerMin    LONG_MIN
+    #define NSUIntegerMax   ULONG_MAX
+    #define NSINTEGER_DEFINED 1
+  #endif  // NSINTEGER_DEFINED
+  // CGFloat
+  #ifndef CGFLOAT_DEFINED
+    #if defined(__LP64__) && __LP64__
+      // This really is an untested path (64bit on Tiger?)
+      typedef double CGFloat;
+      #define CGFLOAT_MIN DBL_MIN
+      #define CGFLOAT_MAX DBL_MAX
+      #define CGFLOAT_IS_DOUBLE 1
+    #else /* !defined(__LP64__) || !__LP64__ */
+      typedef float CGFloat;
+      #define CGFLOAT_MIN FLT_MIN
+      #define CGFLOAT_MAX FLT_MAX
+      #define CGFLOAT_IS_DOUBLE 0
+    #endif /* !defined(__LP64__) || !__LP64__ */
+    #define CGFLOAT_DEFINED 1
+  #endif // CGFLOAT_DEFINED
+#endif  // GTM_MAC_OS_X_VERSION_MAXIMUM_ALLOWED <= MAC_OS_X_VERSION_10_4