[73106] trunk/dports/devel/qtscriptgenerator
michaelld at macports.org
michaelld at macports.org
Wed Nov 3 18:44:39 PDT 2010
Revision: 73106
http://trac.macports.org/changeset/73106
Author: michaelld at macports.org
Date: 2010-11-03 18:44:36 -0700 (Wed, 03 Nov 2010)
Log Message:
-----------
qtscriptgenerator: fixes ticket #27024.
* fix phonon compile issue by forcing #include <phonon/phonon>.
* Move to using a QMake .pro file for building.
* allows for using ccache/distcc.
* allows universal and debug variants.
Modified Paths:
--------------
trunk/dports/devel/qtscriptgenerator/Portfile
Added Paths:
-----------
trunk/dports/devel/qtscriptgenerator/files/
trunk/dports/devel/qtscriptgenerator/files/patch-generator.diff
trunk/dports/devel/qtscriptgenerator/files/patch-qtbindings.diff
trunk/dports/devel/qtscriptgenerator/files/qtsg.pro
Modified: trunk/dports/devel/qtscriptgenerator/Portfile
===================================================================
--- trunk/dports/devel/qtscriptgenerator/Portfile 2010-11-04 01:40:58 UTC (rev 73105)
+++ trunk/dports/devel/qtscriptgenerator/Portfile 2010-11-04 01:44:36 UTC (rev 73106)
@@ -1,13 +1,14 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; truncate-lines: t; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4
# $Id$
PortSystem 1.0
-PortGroup kde4 1.1
+PortGroup qt4 1.0
name qtscriptgenerator
version 0.1.0
-revision 2
+revision 3
categories devel kde4
-maintainers nomaintainer
+maintainers michaelld openmaintainer
description QtScript bindings generator.
long_description Qt Script Generator is a tool that generates \
Qt bindings for Qt Script. With the generated bindings you get \
@@ -20,19 +21,39 @@
sha1 eeae733106369e289f257b754822bc372fd6ba75 \
rmd160 a02ce6fea2fbc3d3a6ae9e51c6b563ef4bcd51f3
-use_configure no
+depends_lib-append port:phonon port:automoc
-build {
- foreach dir {generator qtbindings} {
- if { ${dir}=="generator" } {
- system "cd ${worksrcpath}/${dir} && export QTDIR=${qt_dir} && ${qt_qmake_cmd} && make && ${worksrcpath}/${dir}/generator"
- } else {
- system "cd ${worksrcpath}/${dir} && export QTDIR=${qt_dir} && ${qt_qmake_cmd} && make"
- }
+patchfiles patch-generator.diff \
+ patch-qtbindings.diff
+
+post-patch {
+ # copy the QMake build script into place
+ copy ${filespath}/qtsg.pro ${worksrcpath}
+}
+
+# set up to use the installed QMake files
+configure.cmd ${qt_qmake_cmd}
+configure.pre_args CONFIG+="${qt_arch_types}"
+configure.args "-o Makefile qtsg.pro"
+
+# allow for debug variant
+if {[variant_isset debug]} {
+ configure.pre_args-append CONFIG+=debug_and_release
+} else {
+ configure.pre_args-append CONFIG+=release
+}
+
+# qmake does not handle these flags flags
+configure.universal_args-delete --disable-dependency-tracking
+configure.args-delete --disable-dependency-tracking
+
+# allow ccache, if specified by the user
+pre-build {
+ if {[tbool configure.ccache]} {
+ build.post_args "CCACHE=ccache"
}
}
-destroot {
- xinstall -m 0755 -d ${destroot}${qt_plugins_dir}/script
- eval xinstall -m 0644 [glob ${worksrcpath}/${qt_plugins_dir}/script/*] ${destroot}${qt_plugins_dir}/script/
-}
+universal_variant yes
+
+variant debug description "Build release and debug versions" {}
Added: trunk/dports/devel/qtscriptgenerator/files/patch-generator.diff
===================================================================
--- trunk/dports/devel/qtscriptgenerator/files/patch-generator.diff (rev 0)
+++ trunk/dports/devel/qtscriptgenerator/files/patch-generator.diff 2010-11-04 01:44:36 UTC (rev 73106)
@@ -0,0 +1,51 @@
+--- generator/generator.pro.orig 2010-11-03 13:59:43.000000000 -0400
++++ generator/generator.pro 2010-11-03 13:59:59.000000000 -0400
+@@ -23,5 +23,5 @@
+ setupgenerator.cpp \
+ docgenerator.cpp
+
+-CONFIG -= debug
++CONFIG -= debug debug_and_release
+ CONFIG += release
+--- generator/generator.pri.orig 2010-11-03 13:59:49.000000000 -0400
++++ generator/generator.pri 2010-11-03 14:00:59.000000000 -0400
+@@ -2,14 +2,12 @@
+ INCLUDEPATH += $$GENERATORPATH
+
+ TEMPLATE = app
+-TARGET +=
++TARGET = generator
+ DEPENDPATH += $$GENERATORPATH tests parser
+ mac:CONFIG -= app_bundle
+ INCLUDEPATH += $$GENERATORPATH/.
+ INCLUDEPATH += $$GENERATORPATH/../common
+
+-unix:CONFIG += debug_and_release
+-
+ CONFIG += console
+ RESOURCES += generator.qrc
+
+@@ -67,6 +65,10 @@
+ }
+
+ mac {
+- contains(QT_CONFIG, x86):contains(QT_CONFIG, ppc):CONFIG += x86 ppc
++ # generate just for the native arch, no others
++ CONFIG -= x86 x86_64 ppc ppc64
+ CONFIG -= precompile_header
+ }
++
++# execute the target after it is linked
++unix:QMAKE_POST_LINK=./$$TARGET
+--- generator/qtscript_masterinclude.h.orig 2010-11-03 14:17:45.000000000 -0400
++++ generator/qtscript_masterinclude.h 2010-11-03 14:17:50.000000000 -0400
+@@ -39,9 +39,7 @@
+ # include <QtWebKit/QtWebKit>
+ #endif
+
+-#ifndef QT_NO_PHONON
+ # include <phonon/phonon>
+-#endif
+
+ #include "../qtbindings/qtscript_core/qtscriptconcurrent.h"
+
Added: trunk/dports/devel/qtscriptgenerator/files/patch-qtbindings.diff
===================================================================
--- trunk/dports/devel/qtscriptgenerator/files/patch-qtbindings.diff (rev 0)
+++ trunk/dports/devel/qtscriptgenerator/files/patch-qtbindings.diff 2010-11-04 01:44:36 UTC (rev 73106)
@@ -0,0 +1,12 @@
+--- qtbindings/qtbindingsbase.pri.orig 2010-11-03 14:23:27.000000000 -0400
++++ qtbindings/qtbindingsbase.pri 2010-11-03 14:27:39.000000000 -0400
+@@ -3,6 +3,8 @@
+ INCLUDEPATH += .
+ DESTDIR = $$PWD/../plugins/script
+ QT += script
+-CONFIG += debug_and_release
++
+ GENERATEDCPP = $$PWD/../generated_cpp
+ TARGET=$$qtLibraryTarget($$TARGET)
++target.path = $$[QT_INSTALL_PLUGINS]/script
++INSTALLS += target
Added: trunk/dports/devel/qtscriptgenerator/files/qtsg.pro
===================================================================
--- trunk/dports/devel/qtscriptgenerator/files/qtsg.pro (rev 0)
+++ trunk/dports/devel/qtscriptgenerator/files/qtsg.pro 2010-11-04 01:44:36 UTC (rev 73106)
@@ -0,0 +1,6 @@
+# -*- mode: sh -*- ###########################
+
+TEMPLATE = subdirs
+CONFIG += ordered
+
+SUBDIRS = generator qtbindings
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20101103/e49ead8c/attachment.html>
More information about the macports-changes
mailing list