<pre style='margin:0'>
Mihai Moldovan (Ionic) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/91b6be4b947ec0153f75d8eeab99597f23b37130">https://github.com/macports/macports-ports/commit/91b6be4b947ec0153f75d8eeab99597f23b37130</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 91b6be4b947ec0153f75d8eeab99597f23b37130
</span>Author: Mihai Moldovan <ionic@ionic.de>
AuthorDate: Wed Apr 24 06:22:39 2019 +0200
<span style='display:block; white-space:pre;color:#404040;'> qmake-1.0 PG: sync debug variant generation with qmake5-1.0 PG.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Adds a new option qt4.debug_variant - defaulting to yes, but the
</span><span style='display:block; white-space:pre;color:#404040;'> PG-generated debug variant can be disabled by setting it to no.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Note that the variant checking code can stay in pre-extract, since it's
</span><span style='display:block; white-space:pre;color:#404040;'> only checking information available in the database, not any actual file
</span><span style='display:block; white-space:pre;color:#404040;'> location. Otherwise, it would have needed to be moved from pre-extract
</span><span style='display:block; white-space:pre;color:#404040;'> to pre-configure in order to work correctly in trace mode, or if we ever
</span><span style='display:block; white-space:pre;color:#404040;'> decide to implement something like background pre-fetching and
</span><span style='display:block; white-space:pre;color:#404040;'> -extraction of ports.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/58229
</span>---
_resources/port1.0/group/qmake-1.0.tcl | 35 +++++++++++++++++++++++++++++-----
1 file changed, 30 insertions(+), 5 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/qmake-1.0.tcl b/_resources/port1.0/group/qmake-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index db9ba0f..9a9f0ce 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/qmake-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/qmake-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,6 +6,10 @@
</span> # PortGroup qmake 1.0
PortGroup qt4 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup active_variants 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+options qt4.debug_variant
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default qt4.debug_variant yes
</span>
pre-configure {
configure.cmd ${qt_qmake_cmd}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,8 +32,17 @@ pre-configure {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant debug description "Enable debug binaries" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.pre_args-append "CONFIG+=debug"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# add debug variant if one does not exist and one is requested via qt4.debug_variant
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# variant is added in eval_variants so that qt4.debug_variant can be set anywhere in the Portfile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+rename ::eval_variants ::real_qmake_eval_variants
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+proc eval_variants {variations} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global qt4.debug_variant
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ![variant_exists debug] && [tbool qt4.debug_variant] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant debug description {Build both release and debug binaries and libraries} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.pre_args-append "CONFIG+=debug"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uplevel ::real_qmake_eval_variants $variations
</span> }
# check for +debug variant of this port, and make sure Qt was
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,10 +52,22 @@ platform darwin {
</span> if {[variant_exists debug] && \
[variant_isset debug] && \
![info exists building_qt4]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![file exists ${qt_frameworks_dir}/QtCore.framework/QtCore_debug]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![catch {set result [active_variants "qt4-mac" "debug" ""]}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$result} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # code to be executed if $depspec is active with at least all variants in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # $required and none from $forbidden
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # code to be executed if $depspec is active, but either not with all
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # variants in $required or any variant in $forbidden
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "\n\nERROR:\n\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+In order to install this port with variant +debug,\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+qt4-mac must also be installed with variant +debug.\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # code to be executed if $depspec isn't active
</span> return -code error "\n\nERROR:\n\
<span style='display:block; white-space:pre;background:#ffe0e0;'>-In order to install this port as +debug,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Qt4 must also be installed with +debug.\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Requested to install this port with variant +debug,\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+but qt4-mac is not installed or installed but not active.\n"
</span> }
}
}
</pre><pre style='margin:0'>
</pre>