<!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>[133698] trunk/dports/_resources/port1.0/group/xcode-1.0.tcl</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/133698">133698</a></dd>
<dt>Author</dt> <dd>ryandesign@macports.org</dd>
<dt>Date</dt> <dd>2015-03-08 22:42:13 -0700 (Sun, 08 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>xcode-1.0.tcl: support schemes; use eq/ne for string comparisons instead of ==/!=; use curly braces for some variables that weren't using them</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdports_resourcesport10groupxcode10tcl">trunk/dports/_resources/port1.0/group/xcode-1.0.tcl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdports_resourcesport10groupxcode10tcl"></a>
<div class="modfile"><h4>Modified: trunk/dports/_resources/port1.0/group/xcode-1.0.tcl (133697 => 133698)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/_resources/port1.0/group/xcode-1.0.tcl 2015-03-09 03:53:27 UTC (rev 133697)
+++ trunk/dports/_resources/port1.0/group/xcode-1.0.tcl 2015-03-09 05:42:13 UTC (rev 133698)
</span><span class="lines">@@ -57,6 +57,7 @@
</span><span class="cx"> # out.
</span><span class="cx"> # xcode.configuration xcode buildstyle/configuration. Default is Deployment.
</span><span class="cx"> # xcode.target if present, overrides build.target and destroot.target
</span><ins>+# xcode.scheme if present, supersedes target
</ins><span class="cx"> # xcode.build.settings additional settings passed to $xcodebuildcmd (in
</span><span class="cx"> # the X=Y form)
</span><span class="cx"> # xcode.destroot.type install type (application or framework). Default is
</span><span class="lines">@@ -101,6 +102,8 @@
</span><span class="cx"> default xcode.project ""
</span><span class="cx"> options xcode.target
</span><span class="cx"> default xcode.target ""
</span><ins>+options xcode.scheme
+default xcode.scheme ""
</ins><span class="cx"> options xcode.configuration
</span><span class="cx"> default xcode.configuration Deployment
</span><span class="cx"> options xcode.build.settings
</span><span class="lines">@@ -118,7 +121,7 @@
</span><span class="cx"> # get the project directory (where build/ is).
</span><span class="cx"> proc xcode::get_project_path {} {
</span><span class="cx"> global xcode.project worksrcpath
</span><del>- if {${xcode.project} == ""} {
</del><ins>+ if {${xcode.project} eq ""} {
</ins><span class="cx"> set suffix ""
</span><span class="cx"> } else {
</span><span class="cx"> set suffix [file dirname [join ${xcode.project}]]
</span><span class="lines">@@ -146,11 +149,11 @@
</span><span class="cx"> # get the configuration/buildstyle argument.
</span><span class="cx"> proc xcode::get_configuration_arg { style } {
</span><span class="cx"> global xcodeversion
</span><del>- if {$style != ""} {
- if {[vercmp $xcodeversion 2.1] >= 0} {
- return "-configuration $style"
</del><ins>+ if {${style} ne ""} {
+ if {[vercmp ${xcodeversion} 2.1] >= 0} {
+ return "-configuration ${style}"
</ins><span class="cx"> } else {
</span><del>- return "-buildstyle $style"
</del><ins>+ return "-buildstyle ${style}"
</ins><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="cx"> return ""
</span><span class="lines">@@ -159,8 +162,8 @@
</span><span class="cx">
</span><span class="cx"> # get the project argument.
</span><span class="cx"> proc xcode::get_project_arg { project } {
</span><del>- if {$project != ""} {
- return "-project \"[join $project]\""
</del><ins>+ if {${project} ne ""} {
+ return "-project \"[join ${project}]\""
</ins><span class="cx"> } else {
</span><span class="cx"> return ""
</span><span class="cx"> }
</span><span class="lines">@@ -170,10 +173,10 @@
</span><span class="cx"> # remark: xcodebuild take care of creating the directory if required.
</span><span class="cx"> proc xcode::get_install_path_setting { path type } {
</span><span class="cx"> global applications_dir frameworks_dir
</span><del>- if {$path == ""} {
- if {$type == "application"} {
</del><ins>+ if {${path} eq ""} {
+ if {${type} eq "application"} {
</ins><span class="cx"> return "INSTALL_PATH=${applications_dir}"
</span><del>- } elseif {$type == "framework"} {
</del><ins>+ } elseif {${type} eq "framework"} {
</ins><span class="cx"> return "INSTALL_PATH=${frameworks_dir}"
</span><span class="cx"> } else {
</span><span class="cx"> return ""
</span><span class="lines">@@ -189,7 +192,7 @@
</span><span class="cx"> ${command}.args ${command}.post_args
</span><span class="cx">
</span><span class="cx"> # Check that xcode is installed.
</span><del>- if {[set ${command}.cmd] == "none"} {
</del><ins>+ if {[set ${command}.cmd] eq "none"} {
</ins><span class="cx"> return -code error "This port requires 'xcodebuild', which \
</span><span class="cx"> couldn't be found (not Mac OS X?)"
</span><span class="cx"> }
</span><span class="lines">@@ -251,7 +254,6 @@
</span><span class="cx">
</span><span class="cx"> set xcode_build_args "OBJROOT=build/ SYMROOT=build/"
</span><span class="cx">
</span><del>- # MACOSX_DEPLOYMENT_TARGET
</del><span class="cx"> append xcode_build_args " MACOSX_DEPLOYMENT_TARGET=${macosx_deployment_target}"
</span><span class="cx">
</span><span class="cx"> # ARCHS
</span><span class="lines">@@ -282,63 +284,65 @@
</span><span class="cx"> return $xcode_build_args
</span><span class="cx"> }
</span><span class="cx">
</span><del>-# build procedure.
</del><span class="cx"> build {
</span><del>- # determine the targets.
- if {${xcode.target} != ""} {
- set xcode_targets ${xcode.target}
- } else {
- set xcode_targets ${build.target}
- }
-
- # set some arguments.
</del><span class="cx"> set xcode_configuration_arg [xcode::get_configuration_arg ${xcode.configuration}]
</span><span class="cx"> set xcode_project_arg [xcode::get_project_arg ${xcode.project}]
</span><span class="cx"> set xcode_build_args [xcode::get_build_args]
</span><span class="cx">
</span><del>- # iterate on targets if there is any, do -alltargets otherwise.
- if {"$xcode_targets" == ""} {
</del><ins>+ if {${xcode.scheme} ne ""} {
</ins><span class="cx"> xcode::build_one_target \
</span><del>- "$xcode_project_arg -alltargets $xcode_configuration_arg" \
- "$xcode_build_args ${xcode.build.settings}"
</del><ins>+ "${xcode_project_arg} -scheme \"${xcode.scheme}\" ${xcode_configuration_arg}" \
+ "${xcode_build_args} ${xcode.build.settings}"
</ins><span class="cx"> } else {
</span><del>- foreach target $xcode_targets {
</del><ins>+ if {${xcode.target} ne ""} {
+ set xcode_targets ${xcode.target}
+ } else {
+ set xcode_targets ${build.target}
+ }
+ if {${xcode_targets} eq ""} {
</ins><span class="cx"> xcode::build_one_target \
</span><del>- "$xcode_project_arg -target \"$target\" $xcode_configuration_arg" \
- "$xcode_build_args ${xcode.build.settings}"
</del><ins>+ "${xcode_project_arg} -alltargets ${xcode_configuration_arg}" \
+ "${xcode_build_args} ${xcode.build.settings}"
+ } else {
+ foreach target ${xcode_targets} {
+ xcode::build_one_target \
+ "${xcode_project_arg} -target \"${target}\" ${xcode_configuration_arg}" \
+ "${xcode_build_args} ${xcode.build.settings}"
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-# destroot procedure.
</del><span class="cx"> destroot {
</span><span class="cx"> # let Xcode 2.1+ find resources.
</span><span class="cx"> xcode::fix_resource_dependencies
</span><span class="cx">
</span><del>- # determine the targets.
- if {${xcode.target} != ""} {
- set xcode_targets ${xcode.target}
- } else {
- set xcode_targets ${destroot.target}
- }
-
- # set some arguments.
</del><span class="cx"> set xcode_configuration_arg [xcode::get_configuration_arg ${xcode.configuration}]
</span><span class="cx"> set xcode_project_arg [xcode::get_project_arg ${xcode.project}]
</span><span class="cx"> set xcode_install_path_setting [xcode::get_install_path_setting \
</span><span class="cx"> ${xcode.destroot.path} ${xcode.destroot.type}]
</span><span class="cx"> set xcode_build_args [xcode::get_build_args]
</span><span class="cx">
</span><del>- # iterate on targets if there is any, do -alltargets otherwise.
- if {"$xcode_targets" == ""} {
</del><ins>+ if {${xcode.scheme} ne ""} {
</ins><span class="cx"> xcode::destroot_one_target \
</span><del>- "$xcode_project_arg -alltargets $xcode_configuration_arg" \
- "$xcode_install_path_setting $xcode_build_args ${xcode.destroot.settings}"
</del><ins>+ "${xcode_project_arg} -scheme \"${xcode.scheme}\" ${xcode_configuration_arg}" \
+ "${xcode_install_path_setting} ${xcode_build_args} ${xcode.destroot.settings}"
</ins><span class="cx"> } else {
</span><del>- foreach target $xcode_targets {
</del><ins>+ if {${xcode.target} ne ""} {
+ set xcode_targets ${xcode.target}
+ } else {
+ set xcode_targets ${destroot.target}
+ }
+ if {${xcode_targets} eq ""} {
</ins><span class="cx"> xcode::destroot_one_target \
</span><del>- "$xcode_project_arg -target \"$target\" $xcode_configuration_arg" \
- "$xcode_install_path_setting $xcode_build_args ${xcode.destroot.settings}"
</del><ins>+ "${xcode_project_arg} -alltargets ${xcode_configuration_arg}" \
+ "${xcode_install_path_setting} ${xcode_build_args} ${xcode.destroot.settings}"
+ } else {
+ foreach target ${xcode_targets} {
+ xcode::destroot_one_target \
+ "${xcode_project_arg} -target \"${target}\" ${xcode_configuration_arg}" \
+ "${xcode_install_path_setting} ${xcode_build_args} ${xcode.destroot.settings}"
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>