[73402] trunk/dports/devel/qt4-creator-mac

[michaelld at macports.org]

Revision: 73402
          http://trac.macports.org/changeset/73402
Author:   michaelld at macports.org
Date:     2010-11-12 07:56:49 -0800 (Fri, 12 Nov 2010)
Log Message:
-----------
qt4-creator-mac changes:
* add support for ccache
* correct arch building
* correct build type to be just 'release'
* install into Qt's app director correctly

Modified Paths:
--------------
    trunk/dports/devel/qt4-creator-mac/Portfile

Added Paths:
-----------
    trunk/dports/devel/qt4-creator-mac/files/
    trunk/dports/devel/qt4-creator-mac/files/patch-remove_build_types.diff

Modified: trunk/dports/devel/qt4-creator-mac/Portfile
===================================================================
--- trunk/dports/devel/qt4-creator-mac/Portfile	2010-11-12 13:52:52 UTC (rev 73401)
+++ trunk/dports/devel/qt4-creator-mac/Portfile	2010-11-12 15:56:49 UTC (rev 73402)
@@ -22,20 +22,43 @@
                     sha1    367b5f148f46a31ab25342917f44992ee57a1558 \
                     rmd160  ac0f61a82d49fb5768331f548cdad44b48c4ca14
 
+# fix up QMake build files to remove debug and release building;
+# specify that here instead.
+patchfiles          patch-remove_build_types.diff
+
+post-patch {
+    # remove arch from QMake build scripts
+    reinplace "/ppc/d" ${worksrcpath}/qtcreator.pri
+}
+
+pre-configure {
+    # set arch type(s); done is a stage to make sure the 'options
+    # qt_arch_types' is evaluated -after- +universal (if selected).
+    configure.pre_args CONFIG+="${qt_arch_types}"
+
+    # always build just the release, no debug
+    configure.pre_args-append CONFIG+="release"
+}
+
 configure.cmd       ${qt_qmake_cmd}
-configure.pre_args
-configure.args
+configure.args      "-o Makefile qtcreator.pro"
 configure.post_args
 configure.universal_args
 
-destroot {
-    copy "${worksrcpath}/bin/Qt Creator.app" "${destroot}${applications_dir}"
+# allow ccache, if specified by the user
+pre-build {
+    if {[tbool configure.ccache]} {
+        build.post_args "CCACHE=ccache"
+    }
 }
 
-variant universal {
-    configure.args-append \"CONFIG+=[string map {i386 x86} ${universal_archs}]\"
+destroot {
+    xinstall -m 755 -d ${destroot}${qt_apps_dir}
+    copy "${worksrcpath}/bin/Qt Creator.app" "${destroot}${qt_apps_dir}"
 }
 
+universal_variant   yes
+
 livecheck.type      regex
 livecheck.url       http://get.qt.nokia.com/qtcreator/
 # Qt Creator 2.0.* requires Qt 4.7

Added: trunk/dports/devel/qt4-creator-mac/files/patch-remove_build_types.diff
===================================================================
--- trunk/dports/devel/qt4-creator-mac/files/patch-remove_build_types.diff	                        (rev 0)
+++ trunk/dports/devel/qt4-creator-mac/files/patch-remove_build_types.diff	2010-11-12 15:56:49 UTC (rev 73402)
@@ -0,0 +1,79 @@
+--- tests/manual/proparser/testreader.pro.orig	2010-11-12 10:05:03.000000000 -0500
++++ tests/manual/proparser/testreader.pro	2010-11-12 10:06:55.000000000 -0500
+@@ -10,11 +10,6 @@
+ CONFIG          += qt warn_on console
+ CONFIG          -= app_bundle
+ 
+-build_all:!build_pass {
+-    CONFIG -= build_all
+-    CONFIG += release
+-}
+-
+ SOURCES = main.cpp profileevaluator.cpp proitems.cpp ioutils.cpp
+ HEADERS = profileevaluator.h proitems.h ioutils.h
+ 
+--- src/tools/qtcreatorwidgets/qtcreatorwidgets.pro.orig	2010-11-12 10:05:03.000000000 -0500
++++ src/tools/qtcreatorwidgets/qtcreatorwidgets.pro	2010-11-12 10:06:46.000000000 -0500
+@@ -1,4 +1,4 @@
+-CONFIG      += designer plugin debug_and_release
++CONFIG      += designer plugin
+ TARGET      = $$qtLibraryTarget(qtcreatorwidgets)
+ TEMPLATE    = lib
+ 
+--- src/tools/qpatch/bootstrap.pri.orig	2010-11-12 10:05:03.000000000 -0500
++++ src/tools/qpatch/bootstrap.pri	2010-11-12 10:06:31.000000000 -0500
+@@ -1,9 +1,5 @@
+ CONFIG 	       += console qtinc
+ CONFIG         -= qt
+-build_all:!build_pass {
+-    CONFIG -= build_all
+-    CONFIG += release
+-}
+ CONFIG     -= app_bundle
+ 
+ DEFINES	       += \
+--- src/plugins/debugger/dumper.pro.orig	2010-11-12 10:05:03.000000000 -0500
++++ src/plugins/debugger/dumper.pro	2010-11-12 10:06:22.000000000 -0500
+@@ -8,8 +8,6 @@
+ DESTDIR = $$IDE_LIBRARY_PATH # /tmp would be better in some respect ...
+ 
+ linux-* {
+-CONFIG -= release
+-CONFIG += debug
+ # The following line works around a linker issue with gcc 4.1.2
+ QMAKE_CXXFLAGS *= -O2
+ }
+--- src/libs/utils/process_stub.pro.orig	2010-11-12 10:05:03.000000000 -0500
++++ src/libs/utils/process_stub.pro	2010-11-12 10:06:04.000000000 -0500
+@@ -7,11 +7,6 @@
+ CONFIG          += warn_on console use_c_linker
+ CONFIG          -= qt app_bundle
+ 
+-build_all:!build_pass {
+-    CONFIG -= build_all
+-    CONFIG += release
+-}
+-
+ unix {
+     SOURCES += process_stub_unix.c
+     solaris-.*: LIBS += -lsocket
+--- share/qtcreator/templates/qt4project/customwidgetwizard/tpl_plugin.pro.orig	2010-11-12 10:05:03.000000000 -0500
++++ share/qtcreator/templates/qt4project/customwidgetwizard/tpl_plugin.pro	2010-11-12 10:05:52.000000000 -0500
+@@ -1,4 +1,4 @@
+-CONFIG      += designer plugin debug_and_release
++CONFIG      += designer plugin
+ TARGET      = $$qtLibraryTarget(@PLUGIN_NAME@)
+ TEMPLATE    = lib
+ 
+--- share/qtcreator/gdbmacros/gdbmacros.pro.orig	2010-11-12 10:05:03.000000000 -0500
++++ share/qtcreator/gdbmacros/gdbmacros.pro	2010-11-12 10:05:43.000000000 -0500
+@@ -1,9 +1,5 @@
+ TEMPLATE = lib
+ CONFIG += shared
+-linux-* {
+-    CONFIG -= release
+-    CONFIG += debug
+-}
+ SOURCES = gdbmacros.cpp
+ false {
+     DEFINES += USE_QT_GUI=0
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20101112/775255f5/attachment.html>