Merge lp:~hile/mixxx/osxbuildfixes into lp:~mixxxdevelopers/mixxx/trunk

[Ilkka Tuohela]

This patch branch fixes library linking issues building the OS/X version when Qt is not installed to the default version expected, by giving qtdir= variable. Without this patch, qtdir= does not work at all on OS/X (without the patch you must link Qt to now obsolete /Developer/Frameworks path).

Also fixes some minor issues in 'bundle package' scons target, specifically install_name_tool failing because the copied file permissions seem to be 0444.

[lp:~hile/mixxx/osxbuildfixes]

3166. By Ilkka Tuohela on 2012-08-04

Merged from trunk

3167. By Ilkka Tuohela on 2012-08-04

Add explicit -L for qt library directory for commercial Qt compilations

3168. By Ilkka Tuohela on 2012-08-07

Look for Qt frameworks in Frameworks and lib under QTDIR

3169. By Ilkka Tuohela on 2012-08-14

Imported from trunk

3170. By Ilkka Tuohela on 2012-08-14

Improved Qt build directory detection

Unmerged revisions

3170. By Ilkka Tuohela on 2012-08-14

Improved Qt build directory detection

3169. By Ilkka Tuohela on 2012-08-14

Imported from trunk

3168. By Ilkka Tuohela on 2012-08-07

Look for Qt frameworks in Frameworks and lib under QTDIR

3167. By Ilkka Tuohela on 2012-08-04

Add explicit -L for qt library directory for commercial Qt compilations

3166. By Ilkka Tuohela on 2012-08-04

Merged from trunk

3165. By Ilkka Tuohela on 2012-05-17

Fix permissions before running install_name_tool

3164. By Ilkka Tuohela on 2012-05-16

Removed accidentally added presetinfo

3163. By Ilkka Tuohela on 2012-05-16

Imported OS/X build fixes

=== modified file 'mixxx/build/depends.py'
--- mixxx/build/depends.py	2012-07-08 07:30:32 +0000
+++ mixxx/build/depends.py	2012-08-14 05:15:28 +0000
@@ -105,11 +105,6 @@
         return ['soundsourceflac.cpp',]
 
 class Qt(Dependence):
-    DEFAULT_QTDIRS = {'linux': '/usr/share/qt4',
-                      'bsd': '/usr/local/lib/qt4',
-                      'osx': '/Library/Frameworks',
-                      'windows': 'C:\\qt\\4.6.0'}
-
     def satisfy(self):
         pass
 
@@ -118,36 +113,43 @@
         build.env.Append(CPPDEFINES = ['QT_SHARED',
                                        'QT_TABLET_SUPPORT'])
 
+        qt_modules = [
+            'QtCore', 'QtGui', 'QtOpenGL', 'QtXml', 'QtSvg', 
+            'QtSql', 'QtScript', 'QtXmlPatterns', 'QtWebKit',
+            'QtNetwork'
+            #'QtUiTools', #'QtDesigner',
+        ]
+
         # Enable Qt include paths
         if build.platform_is_linux:
             if not conf.CheckForPKG('QtCore', '4.6'):
                 raise Exception('QT >= 4.6 not found')
 
-            #Try using David's qt4.py's Qt4-module finding thingy instead of pkg-config.
             #(This hopefully respects our qtdir=blah flag while linking now.)
-            build.env.EnableQt4Modules(['QtCore',
-                                        'QtGui',
-                                        'QtOpenGL',
-                                        'QtXml',
-                                        'QtSvg',
-                                        'QtSql',
-                                        'QtScript',
-                                        'QtXmlPatterns',
-                                        'QtWebKit'
-                                        #'QtUiTools',
-                                        #'QtDesigner',
-                                        ],
-                                       debug=False)
+            build.env.EnableQt4Modules(qt_modules,debug=False)
+
         elif build.platform_is_osx:
-            build.env.Append(LINKFLAGS = '-framework QtCore -framework QtOpenGL -framework QtGui -framework QtSql -framework QtXml -framework QtXmlPatterns  -framework QtNetwork -framework QtSql -framework QtScript -framework QtWebKit')
-            build.env.Append(CPPPATH = ['/Library/Frameworks/QtCore.framework/Headers/',
-                                        '/Library/Frameworks/QtOpenGL.framework/Headers/',
-                                        '/Library/Frameworks/QtGui.framework/Headers/',
-                                        '/Library/Frameworks/QtXml.framework/Headers/',
-                                        '/Library/Frameworks/QtNetwork.framework/Headers/',
-                                        '/Library/Frameworks/QtSql.framework/Headers/',
-                                        '/Library/Frameworks/QtWebKit.framework/Headers/',
-                                        '/Library/Frameworks/QtScript.framework/Headers/'])
+            qtdir = build.env['QTDIR']
+            build.env.Append(
+                LINKFLAGS=' '.join('-framework %s' % m for m in qt_modules)
+            )
+            found_frameworks = False
+            for d in [os.path.join(qtdir,x) for x in ['Frameworks','lib']]:
+                core = os.path.join(d,'QtCore.framework')
+                if not os.path.isdir(core):
+                    continue
+                build.env.Append(CPPPATH = [
+                    os.path.join(d,'%s.framework' % m,'Headers') for m in qt_modules
+                ])
+                build.env.Append(LINKFLAGS = [ 
+                    '-F%s' % os.path.join(d)
+                ])
+                found_frameworks = True
+                break
+            if not found_frameworks:
+                raise Exception(
+                    'Could not find frameworks in Qt directory: %s' % qtdir
+                )
 
         # Setup Qt library includes for non-OSX
         if build.platform_is_linux or build.platform_is_bsd:
@@ -742,16 +744,19 @@
 
         elif build.platform_is_osx:
             #Stuff you may have compiled by hand
-            build.env.Append(LIBPATH = ['/usr/local/lib'])
-            build.env.Append(CPPPATH = ['/usr/local/include'])
+            if os.path.isdir('/usr/local/include'):
+                build.env.Append(LIBPATH = ['/usr/local/lib'])
+                build.env.Append(CPPPATH = ['/usr/local/include'])
 
             #Non-standard libpaths for fink and certain (most?) darwin ports
-            build.env.Append(LIBPATH = ['/sw/lib'])
-            build.env.Append(CPPPATH = ['/sw/include'])
+            if os.path.isdir('/sw/include'):
+                build.env.Append(LIBPATH = ['/sw/lib'])
+                build.env.Append(CPPPATH = ['/sw/include'])
 
             #Non-standard libpaths for darwin ports
-            build.env.Append(LIBPATH = ['/opt/local/lib'])
-            build.env.Append(CPPPATH = ['/opt/local/include'])
+            if os.path.isdir('/opt/local/include'):
+                build.env.Append(LIBPATH = ['/opt/local/lib'])
+                build.env.Append(CPPPATH = ['/opt/local/include'])
 
         elif build.platform_is_bsd:
             build.env.Append(CPPDEFINES='__BSD__')

=== modified file 'mixxx/build/mixxx.py'
--- mixxx/build/mixxx.py	2012-07-08 07:30:32 +0000
+++ mixxx/build/mixxx.py	2012-08-14 05:15:28 +0000
@@ -4,14 +4,68 @@
 import sys
 import os
 import re
+import glob
 
 import SCons
 from SCons import Script
 
 import util
 
+# Note: for globs, last entry matching from match list is selected
+DEFAULT_PLATFORM_QTDIRS = {
+    'linux': [
+        '/usr/share/qt4'
+    ],
+    'bsd': [
+        '/usr/local/lib/qt4'
+    ],
+    'osx': [
+        '/Library/Frameworks',
+        glob.glob('/usr/local/lib/qt-4*'),
+        glob.glob('/usr/local/Cellar/qt/4*'),
+    ],
+    'windows': [
+        glob.glob('C:\\qt\\4*'),
+    ]
+}
+
 class MixxxBuild(object):
 
+    def locate_qtdir(self):
+        """
+        Try to locate Qt directory
+        """
+        qtdir = Script.ARGUMENTS.get('qtdir')
+        try:
+            default_dirs = DEFAULT_PLATFORM_QTDIRS[self.platform]
+        except KeyError:
+            raise Exception(
+                'QT directories for platform not configured: %s' % self.platform
+            )
+        for option in default_dirs:
+            if isinstance(option,list):
+                # Grab last entry from glob matches
+                try:
+                    option = option[-1] 
+                except IndexError:
+                    continue
+            if not os.path.isdir(option):
+                continue
+
+            moc = os.path.join(option,"bin","moc")
+            moc = self.platform == 'windows' and '%s.exe'%moc or moc
+            if not os.path.isfile(moc):
+                continue
+            qtdir = option
+            break
+
+        if not qtdir or not os.path.isdir(qtdir):
+            raise Exception('QT directory not found') 
+        if Script.ARGUMENTS.get('qtdir')!=qtdir:
+            Script.ARGUMENTS['qtdir'] = qtdir
+        print 'QT directory detected: %s' % qtdir
+        return qtdir
+
     def __init__(self, target, machine, build, toolchain, available_features=[]):
         self.available_features = available_features
         self.host_platform = self.detect_platform()
@@ -118,11 +172,7 @@
         tools.append('qt4')
         tools.append('protoc')
 
-        # Ugly hack to check the qtdir argument
-        import depends
-        default_qtdir = depends.Qt.DEFAULT_QTDIRS.get(self.platform, '')
-        qtdir = Script.ARGUMENTS.get('qtdir',
-                                    os.environ.get('QTDIR', default_qtdir))
+        qtdir = self.locate_qtdir()
 
         # Validate the specified qtdir exists
         if not os.path.exists(qtdir):

=== modified file 'mixxx/build/osx/otool.py'
--- mixxx/build/osx/otool.py	2012-05-16 15:19:32 +0000
+++ mixxx/build/osx/otool.py	2012-08-14 05:15:28 +0000
@@ -51,8 +51,15 @@
 SYSTEM_FRAMEWORKS = ["/System/Library/Frameworks"]
 SYSTEM_LIBPATH = ["/usr/lib"] #anything else?
 #paths to libs that we should copy in
-LOCAL_FRAMEWORKS = [os.path.expanduser("~/Library/Frameworks"), "/Library/Frameworks", "/Network/Library/Frameworks"]
-LOCAL_LIBPATH = ["/usr/local/lib", "/opt/local/lib", "/sw/local/lib"]
+LOCAL_FRAMEWORKS = [
+    os.path.expanduser("~/Library/Frameworks"), 
+    "/Library/Frameworks", 
+    "/Network/Library/Frameworks"
+]
+LOCAL_LIBPATH = filter(lambda x: 
+    os.path.isdir(x), 
+    ["/usr/local/lib", "/opt/local/lib", "/sw/local/lib"]
+)
 
 #however
 FRAMEWORKS = LOCAL_FRAMEWORKS + SYSTEM_FRAMEWORKS

=== modified file 'mixxx/src/SConscript'
--- mixxx/src/SConscript	2012-07-07 23:09:24 +0000
+++ mixxx/src/SConscript	2012-08-14 05:15:28 +0000
@@ -274,7 +274,13 @@
         for tfile in translation_files:
                 resource_map[str(tfile)] = 'translations'
 
+        qt_frameworks = os.path.join(build.env['QTDIR'],'Frameworks')
+        #qt_menu.nib for Cocoa Qt 4.7+
+        menu_nib = os.path.join(
+                qt_frameworks,'QtGui.framework','Resources','qt_menu.nib'
+        )
         otool_local_paths = [os.path.expanduser("~/Library/Frameworks"),
+                             qt_frameworks, 
                              "/Library/Frameworks",
                              "/Network/Library/Frameworks",
                              "/usr/local/lib",
@@ -289,7 +295,8 @@
 
         qtplugindir = SCons.ARGUMENTS.get('qtplugindir', None)
         if not qtplugindir:
-                qtplugindir = '/Developer/Applications/Qt/'
+                #qtplugindir = '/Developer/Applications/Qt/'
+                qtplugindir = build.env['QTDIR']
         bundle = env.App(
                 "Mixxx",
                 [mixxx_bin, '#res/osx/application.icns',
@@ -301,7 +308,7 @@
                  Dir('#res/ladspa_presets'),
                  Dir('#res/doc/'),
                  Dir('#res/promo/'),
-                 Dir('/Library/Frameworks/QtGui.framework/Resources/qt_menu.nib'),  #qt_menu.nib for Cocoa Qt 4.7+
+                 Dir(menu_nib),
                  File("#README"),
                  File("#LICENSE")],
                 PLUGINS=plugins, ##XXX test what happens if we don't pass any plugins