<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[142930] trunk/dports/devel</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/142930">142930</a></dd>
<dt>Author</dt> <dd>mcalhoun@macports.org</dd>
<dt>Date</dt> <dd>2015-11-28 09:51:32 -0800 (Sat, 28 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>qt5-creator-mac and subports:
* rename qt5-creator-mac -> qt5-creator
* rename qt5-creator-mac-docs -> qt5-creator-docs
* discontinue qt5-creator-mac-examples since it installed examples from qbs build system and not Qt Creator
* fix dependencies of new qt5-creator (#49825)
* install files to allow Qt Creator to find Qt from MacPorts (qtversion.xml and profiles.xml)
* remove delete commands that do not do anything</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsdevelqt5creatorPortfile">trunk/dports/devel/qt5-creator/Portfile</a></li>
<li><a href="#trunkdportsdevelqt5creatormacPortfile">trunk/dports/devel/qt5-creator-mac/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/dports/devel/qt5-creator/</li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsdevelqt5creatorPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/qt5-creator/Portfile (142913 => 142930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/qt5-creator-mac/Portfile 2015-11-27 13:32:37 UTC (rev 142913)
+++ trunk/dports/devel/qt5-creator/Portfile 2015-11-28 17:51:32 UTC (rev 142930)
</span><span class="lines">@@ -3,11 +3,12 @@
</span><span class="cx">
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><del>-name qt5-creator-mac
</del><ins>+name qt5-creator
</ins><span class="cx">
</span><del>-if { ${subport} eq "${name}-docs" || ${subport} eq "${name}-examples" } {
</del><ins>+if { ${subport} eq "${name}-docs" } {
</ins><span class="cx"> universal_variant no
</span><span class="cx"> supported_archs noarch
</span><ins>+ set qt5_qmake_request_no_debug 1
</ins><span class="cx"> }
</span><span class="cx"> PortGroup qmake5 1.0
</span><span class="cx">
</span><span class="lines">@@ -27,6 +28,12 @@
</span><span class="cx"> sha256 029e22307e79c4fb3a34be854dedddaa56476c6c6374c312125b9302bcbc0fd9
</span><span class="cx">
</span><span class="cx"> if { ${subport} eq ${name} } {
</span><ins>+ depends_lib-append \
+ port:qt5-qtscript \
+ port:qt5-qtdeclarative \
+ port:qt5-qttools \
+ port:qt5-qtmacextras
+
</ins><span class="cx"> depends_lib-append port:botan
</span><span class="cx"> configure.args-append "USE_SYSTEM_BOTAN=1"
</span><span class="cx">
</span><span class="lines">@@ -46,18 +53,81 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+
+ # put following in post-destroot so it works with universal
+ post-destroot {
+ # sdktool is a tool located in "Qt Creator.app/Contents/Resources"
+ #
+ # two necessary files that sdktool creates are:
+ # "${qt_apps_dir}/Qt Creator.app/Contents/Resources/QtProject/qtcreator/qtversion.xml"
+ # "${qt_apps_dir}/Qt Creator.app/Contents/Resources/QtProject/qtcreator/profiles.xml"
+ #
+ # from the installer.dat file, it seems the following are run by the binary installer of Qt Creator version 5.5.1
+ # sdktool addQt --id qt.55.clang_64 --name "Qt %{Qt:Version} clang 64bit" --qmake qmakeBinary --type Qt4ProjectManager.QtVersion.Desktop
+ # sdktool addKit --id qt.55.clang_64_kit --name "Desktop Qt %{Qt:Version} clang 64bit" --devicetype Desktop --qt qt.55.clang_64 --toolchain x86-macos-generic-mach_o-64bit
+ # modify for our purposes
+ #
+ # for unknownd reason, using system instead of exec results in "QWidget: Cannot create a QWidget without QApplication"
+ set sdktool ${destroot}${qt_apps_dir}/Qt\ Creator.app/Contents/Resources/sdktool
+
+ exec \
+ "${sdktool}" \
+ addQt \
+ --id qt.5.macports \
+ --name "Qt %{Qt:Version} from MacPorts" \
+ --qmake "${qt_qmake_cmd}" \
+ --type Qt4ProjectManager.QtVersion.Desktop
+
+ if { [variant_isset universal] } {
+ foreach arch ${universal_archs_to_use} {
+ if { ${arch} eq "i386" } {
+ set toolchain_bit 32
+ set qt_qmake_spec_arch ${qt_qmake_spec_32}
+ } else {
+ set toolchain_bit 64
+ set qt_qmake_spec_arch ${qt_qmake_spec_64}
+ }
+
+ exec \
+ "${sdktool}" \
+ addKit \
+ --id qt.5.macports_${arch}_kit \
+ --name "Desktop Qt %{Qt:Version} from MacPorts ${arch}" \
+ --devicetype Desktop \
+ --qt qt.5.macports \
+ --toolchain x86-macos-generic-mach_o-${toolchain_bit}bit \
+ --mkspec ${qt_qmake_spec_arch}
+ }
+ } else {
+ if { ${build_arch} eq "i386" } {
+ set toolchain_bit 32
+ } else {
+ set toolchain_bit 64
+ }
+
+ exec \
+ "${sdktool}" \
+ addKit \
+ --id qt.5.macports_${build_arch}_kit \
+ --name "Desktop Qt %{Qt:Version} from MacPorts ${build_arch}" \
+ --devicetype Desktop \
+ --qt qt.5.macports \
+ --toolchain x86-macos-generic-mach_o-${toolchain_bit}bit \
+ --mkspec ${qt_qmake_spec}
+
+ }
+
+ # N.B. that at some point in the future, QtCreator.ini may need to be created
+ # to include more search locations for documentation and examples
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> subport ${name}-docs {
</span><del>- depends_lib-append port:${name} port:qt5-mac-sqlite3-plugin
</del><ins>+ depends_build-append port:qt5-sqlite-plugin
+ depends_run-append port:${name}
</ins><span class="cx"> build.target docs
</span><span class="cx">
</span><span class="cx"> destroot {
</span><del>- delete "${worksrcpath}/bin/Qt Creator.app/Contents/Info.plist"
- delete "${worksrcpath}/bin/Qt Creator.app/Contents/MacOS/qml2puppet.app/Contents/Info.plist"
- delete "${worksrcpath}/bin/Qt Creator.app/Contents/MacOS/qmlpuppet.app/Contents/Info.plist"
- delete "${worksrcpath}/bin/Qt Creator.app/Contents/Resources/qml/qmldump/Info.plist"
-
</del><span class="cx"> xinstall -m 755 -d ${destroot}${qt_apps_dir}
</span><span class="cx"> copy "${worksrcpath}/bin/Qt Creator.app" "${destroot}${qt_apps_dir}"
</span><span class="cx">
</span><span class="lines">@@ -66,13 +136,6 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-subport ${name}-examples {
- depends_lib-append port:${name}
- build {}
- destroot.dir ${worksrcpath}/src/shared/qbs
- destroot.target -f Makefile.static INSTALL_ROOT=${destroot}${prefix} install_examples
-}
-
</del><span class="cx"> livecheck.type regex
</span><span class="cx"> livecheck.url http://www.qt.io/download-open-source/
</span><span class="cx"> livecheck.regex qt-creator-opensource-src-(\[a-z0-9.\]+)${extract.suffix}"
</span></span></pre></div>
<a id="trunkdportsdevelqt5creatormacPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/qt5-creator-mac/Portfile (142929 => 142930)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/qt5-creator-mac/Portfile 2015-11-28 17:23:32 UTC (rev 142929)
+++ trunk/dports/devel/qt5-creator-mac/Portfile 2015-11-28 17:51:32 UTC (rev 142930)
</span><span class="lines">@@ -4,75 +4,19 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name qt5-creator-mac
</span><del>-
-if { ${subport} eq "${name}-docs" || ${subport} eq "${name}-examples" } {
- universal_variant no
- supported_archs noarch
-}
-PortGroup qmake5 1.0
-
</del><span class="cx"> version 3.4.1
</span><ins>+revision 1
</ins><span class="cx"> categories devel aqua
</span><del>-platforms darwin
</del><span class="cx"> license LGPL-2.1
</span><del>-maintainers mcalhoun openmaintainer
-description Cross-platform integrated development environment (IDE) tailored to the needs of Qt developers.
-long_description Qt Creator is a cross-platform integrated development environment (IDE) tailored to the needs of Qt developers.
</del><span class="cx">
</span><del>-homepage http://qt-project.org/wiki/Category:Tools::QtCreator
-distname qt-creator-opensource-src-${version}
-master_sites https://download.qt-project.org/official_releases/qtcreator/[join [lrange [split ${version} .] 0 1] .]/${version}/
-
-checksums rmd160 e4fc59e156514e6c29697c414c655efdc410e337 \
- sha256 029e22307e79c4fb3a34be854dedddaa56476c6c6374c312125b9302bcbc0fd9
-
-if { ${subport} eq ${name} } {
- depends_lib-append port:botan
- configure.args-append "USE_SYSTEM_BOTAN=1"
-
- if { ![variant_isset universal] } {
- destroot {
- # make install attempts to install command line tools into /bin, etc.
- xinstall -m 755 -d ${destroot}${qt_apps_dir}
- copy "${worksrcpath}/bin/Qt Creator.app" "${destroot}${qt_apps_dir}"
- }
- } else {
- # We should really just override destroot, but the muniversal Portgroup would override our override.
- destroot.cmd "true"
- merger-post-destroot {
- foreach arch ${universal_archs_to_use} {
- xinstall -m 755 -d ${destroot}-${arch}${qt_apps_dir}
- copy "${worksrcpath}-${arch}/bin/Qt Creator.app" "${destroot}-${arch}${qt_apps_dir}"
- }
- }
- }
</del><ins>+if { ${subport} eq ${name} } {
+ replaced_by qt5-creator
+} elseif { ${subport} eq "${name}-docs" } {
+ replaced_by qt5-creator-docs
+} elseif { ${subport} eq "${name}-examples" } {
+ # this port installed examples from qbs build system not Qt Creator
</ins><span class="cx"> }
</span><ins>+PortGroup obsolete 1.0
</ins><span class="cx">
</span><del>-subport ${name}-docs {
- depends_lib-append port:${name} port:qt5-mac-sqlite3-plugin
- build.target docs
-
- destroot {
- delete "${worksrcpath}/bin/Qt Creator.app/Contents/Info.plist"
- delete "${worksrcpath}/bin/Qt Creator.app/Contents/MacOS/qml2puppet.app/Contents/Info.plist"
- delete "${worksrcpath}/bin/Qt Creator.app/Contents/MacOS/qmlpuppet.app/Contents/Info.plist"
- delete "${worksrcpath}/bin/Qt Creator.app/Contents/Resources/qml/qmldump/Info.plist"
-
- xinstall -m 755 -d ${destroot}${qt_apps_dir}
- copy "${worksrcpath}/bin/Qt Creator.app" "${destroot}${qt_apps_dir}"
-
- xinstall -m 755 -d ${destroot}${qt_docs_dir}
- copy ${worksrcpath}/doc/html ${worksrcpath}/doc/html-dev ${destroot}${qt_docs_dir}
- }
-}
-
-subport ${name}-examples {
- depends_lib-append port:${name}
- build {}
- destroot.dir ${worksrcpath}/src/shared/qbs
- destroot.target -f Makefile.static INSTALL_ROOT=${destroot}${prefix} install_examples
-}
-
-livecheck.type regex
-livecheck.url http://www.qt.io/download-open-source/
-livecheck.regex qt-creator-opensource-src-(\[a-z0-9.\]+)${extract.suffix}"
</del><ins>+subport ${name}-docs { }
+subport ${name}-examples { }
</ins></span></pre>
</div>
</div>
</body>
</html>