Changeset 1561 for trunk/set_externals


Ignore:
Timestamp:
Jun 10, 2010 8:50:32 PM (11 years ago)
Author:
lou
Message:

Correctly handle case where directory used for external does not match the
project name, e.g., FlopC++/trunk/FlopCpp. Also add libtool library version
functions in coin-functions and correct output redirection.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/set_externals

    r1556 r1561  
    4141
    4242# Process the parameters. A parameter without an opening `-' is assumed to be
    43 # the spec for the stable branch.
     43# the dependency file.
    4444
    4545  while test $# -gt 0 && test $exitValue = 0 && test $printHelp = 0 ; do
     
    9898            echo "Keeping $ext_url"
    9999          else
    100             # Normal (not BuildTools/ThirdParty/Data) need a project name
     100            # Normal (not BuildTools/ThirdParty/Data) need a directory name,
     101            # and it may differ from the project name. Carefully preserve it.
    101102            # ThirdParty URLs include BuildTools ; both named for emphasis
    102103            case $ext_rel_url in
    103               *BuildTools* | *ThirdParty* | *Data* ) ;;
    104               *) ext_proj=`extractProjFromURL $ext_rel_url`
    105                  ext_rel_url=${ext_rel_url}${ext_proj}
     104              */BuildTools/* | */ThirdParty/* | */Data/* ) ;;
     105              *) ext_tail=`extractTailFromExt $ext_url`
     106                 ext_rel_url=${ext_rel_url}${ext_tail}
    106107                 ;;
    107108            esac
Note: See TracChangeset for help on using the changeset viewer.