Changeset e4f08bf for configure


Ignore:
Timestamp:
2015-06-08T18:25:08Z (10 years ago)
Author:
dequis <dx@…>
Children:
29ff5c2
Parents:
c720890 (diff), 61e7e02 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'develop' into feat/hip-cat

Conflicts:

configure

File:
1 edited

Legend:

Unmodified
Added
Removed
  • configure

    rc720890 re4f08bf  
    7979                branch=$(cd $srcdir; git rev-parse --abbrev-ref HEAD)
    8080
    81                 search="(.+)-([0-9]+)-(g[0-9a-f]+)"
     81                search='\(.*\)-\([0-9]*\)-\(g[0-9a-f]*\)'
    8282                replace="\1+$timestamp+$branch+\2-\3-git"
    8383
    84                 BITLBEE_VERSION=$(cd $srcdir; git describe --long --tags | sed -r "s#$search#$replace#")
    85 
    86                 unset timestamp branch search replace
     84                describe=$(cd $srcdir; git describe --long --tags 2>/dev/null)
     85                if [ $? -ne 0 ]; then
     86                        describe=${REAL_BITLBEE_VERSION}-0-g$(cd $srcdir; git rev-parse --short HEAD)
     87                fi
     88
     89                BITLBEE_VERSION=$(echo $describe | sed "s#$search#$replace#")
     90
     91                unset timestamp branch search replace describe
    8792        fi
    8893}
     
    680685fi
    681686
     687if [ -z "$PYTHON" ]; then
     688        PYTHON=python
     689fi
     690
    682691if [ "$doc" = "1" ]; then
    683692        # check this here just in case someone tries to install it in python2.4...
    684         if ! python -m xml.etree.ElementTree > /dev/null 2>&1; then
     693        if ! $PYTHON -m xml.etree.ElementTree > /dev/null 2>&1; then
    685694                echo
    686695                echo 'ERROR: Python (>=2.5 or 3.x) is required to generate docs'
     696                echo "(Use the PYTHON environment variable if it's in a weird location)"
    687697                exit 1
    688698        fi
    689699        echo "DOC=1" >> Makefile.settings
     700        echo "PYTHON=$PYTHON" >> Makefile.settings
    690701fi
    691702
Note: See TracChangeset for help on using the changeset viewer.