Changeset 18794 for trunk/base


Ignore:
Timestamp:
Jul 29, 2006, 6:42:43 AM (14 years ago)
Author:
pguyot (Paul Guyot)
Message:

Avoid conflicts between variables of xcode group and globals in port1.0 code.
Such a conflict broke the auto-clean feature by overriding the targets global.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/base/src/port1.0/resources/group/xcode-1.0.tcl

    r18648 r18794  
    22# xcode.tcl
    33#
    4 # $Id: xcode-1.0.tcl,v 1.8 2006/07/19 07:29:01 pguyot Exp $
     4# $Id: xcode-1.0.tcl,v 1.9 2006/07/29 06:42:43 pguyot Exp $
    55#
    66# Copyright (c) 2005 Paul Guyot <pguyot@kallisys.net>,
     
    247247        # determine the targets.
    248248        if {${xcode.target} != ""} {
    249                 set targets ${xcode.target}
    250         } else {
    251                 set targets ${build.target}
     249                set xcode_targets ${xcode.target}
     250        } else {
     251                set xcode_targets ${build.target}
    252252        }
    253253       
    254254        # set some arguments.
    255         set configuration_arg [xcode::get_configuration_arg ${xcode.configuration}]
    256         set project_arg [xcode::get_project_arg ${xcode.project}]
     255        set xcode_configuration_arg [xcode::get_configuration_arg ${xcode.configuration}]
     256        set xcode_project_arg [xcode::get_project_arg ${xcode.project}]
    257257       
    258258        # iterate on targets if there is any, do -alltargets otherwise.
    259         if {"$targets" == ""} {
     259        if {"$xcode_targets" == ""} {
    260260                xcode::build_one_target \
    261                         "$project_arg -alltargets $configuration_arg" \
     261                        "$xcode_project_arg -alltargets $xcode_configuration_arg" \
    262262                        "${xcode.build.settings}"
    263263        } else {
    264                 foreach target $targets {
     264                foreach target $xcode_targets {
    265265                        xcode::build_one_target \
    266                                 "$project_arg -target \"$target\" $configuration_arg" \
     266                                "$xcode_project_arg -target \"$target\" $xcode_configuration_arg" \
    267267                                "${xcode.build.settings}"
    268268                }
     
    277277        # determine the targets.
    278278        if {${xcode.target} != ""} {
    279                 set targets ${xcode.target}
    280         } else {
    281                 set targets ${destroot.target}
     279                set xcode_targets ${xcode.target}
     280        } else {
     281                set xcode_targets ${destroot.target}
    282282        }
    283283       
    284284        # set some arguments.
    285         set configuration_arg [xcode::get_configuration_arg ${xcode.configuration}]
    286         set project_arg [xcode::get_project_arg ${xcode.project}]
    287         set install_path_setting [xcode::get_install_path_setting \
     285        set xcode_configuration_arg [xcode::get_configuration_arg ${xcode.configuration}]
     286        set xcode_project_arg [xcode::get_project_arg ${xcode.project}]
     287        set xcode_install_path_setting [xcode::get_install_path_setting \
    288288                ${xcode.destroot.path} ${xcode.destroot.type}]
    289289       
    290290        # iterate on targets if there is any, do -alltargets otherwise.
    291         if {"$targets" == ""} {
     291        if {"$xcode_targets" == ""} {
    292292                xcode::destroot_one_target \
    293                         "$project_arg -alltargets $configuration_arg" \
    294                         "$install_path_setting DSTROOT=$destroot ${xcode.destroot.settings}"
    295         } else {
    296                 foreach target $targets {
     293                        "$xcode_project_arg -alltargets $xcode_configuration_arg" \
     294                        "$xcode_install_path_setting DSTROOT=$destroot ${xcode.destroot.settings}"
     295        } else {
     296                foreach target $xcode_targets {
    297297                        xcode::destroot_one_target \
    298                                 "$project_arg -target \"$target\" $configuration_arg" \
    299                                 "$install_path_setting DSTROOT=$destroot ${xcode.destroot.settings}"
    300                 }
    301         }
    302 }
     298                                "$xcode_project_arg -target \"$target\" $xcode_configuration_arg" \
     299                                "$xcode_install_path_setting DSTROOT=$destroot ${xcode.destroot.settings}"
     300                }
     301        }
     302}
Note: See TracChangeset for help on using the changeset viewer.