Download Reference Manual
The Developer's Library for D
About Wiki Forums Source Search Contact

Changeset 2860

Show
Ignore:
Timestamp:
11/12/07 11:02:50 (1 year ago)
Author:
schveiguy
Message:

Since -v1 is now removed, and libphobos2 is no longer an issue, reverting back to trunk's version

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • branches/experimental/D2.0/lib/build-tango.sh

    r2854 r2860  
    1414DC= 
    1515LIB= 
    16 FLAGS="-v1 -inline" 
    1716 
    1817usage() { 
    19     echo 'Usage: build-tango.sh [--help] identifier 
     18    echo 'Usage: build-tango.sh [--help] identifier  
    2019Options: 
    2120  --help: Will print this help text 
    2221  <identifier> is one of {dmd, gdc, mac} and will build libtango.a, 
    2322                libgtango.a or universal Mac binaries respectively 
    24  
     23                 
    2524  The script must be called from within lib/ and the resulting 
    2625  binaries will be found there. The build requires that libdtango-base-dmd.a/ 
     
    3029 
    3130UNAME=`uname` 
     31INLINE="-inline" 
     32DMDVERSION= 
    3233 
    3334# Various functions to workaround bugs in the compilers 
     
    4445    if [ "$DMDVERSION" = "1.020" -o "$DMDVERSION" = "1.021" ] 
    4546    then 
    46         INLINE="" 
     47        INLINE=""     
    4748        echo ">> Removing -inline due to bugzilla 668" 
    4849    fi 
     
    5152# Checks for known compiler bugs 
    5253compilerbugs() { 
    53     echo ">> Checking compiler version $DC" 
     54    echo ">> Checking compiler version $DC"  
    5455    #`$DCbugs` 
    5556    if [ "$DC" = "dmd" ] 
    5657    then 
    57         . dmd-include 
    58     DEP=$PHOBOSLIB 
    59     FLAGS=$DMDFLAGS 
     58        dmdbugs 
    6059    fi 
    6160} 
     
    111110    DC=$1 
    112111    LIB=$2 
    113     DEP=$3 
    114112 
    115113    if ! $DC --help >& /dev/null 
     
    122120    compilerbugs 
    123121 
    124     if [ ! -e "$DEP" ] 
     122    if [ ! -e "$3" ] 
    125123    then 
    126         die "Dependency $DEP not present, run build-yourcompiler.sh first" 1 
     124        die "Dependency $3 not present, run build-yourcompiler.sh first" 1 
    127125    fi 
    128126 
     
    145143fi 
    146144 
    147  
    148145if [ "$1" = "--help" ] 
    149146then 
     
    158155then 
    159156    # build Universal Binary version of the Tango library 
    160     build powerpc-apple-darwin8-gdmd libgtango.a.ppc libgphobos.a.ppc 
    161     build i686-apple-darwin8-gdmd libgtango.a.i386 libgphobos.a.i386 
    162     lipo -create -output libgtango.a libgtango.a.ppc libgtango.a.i386 
     157    build powerpc-apple-darwin8-gdmd libgtango.a.ppc libgphobos.a.ppc  
     158    build i686-apple-darwin8-gdmd libgtango.a.i386 libgphobos.a.i386  
     159    lipo -create -output libgtango.a libgtango.a.ppc libgtango.a.i386  
    163160else 
    164161    usage 
  • branches/experimental/D2.0/lib/install-dmd.sh

    r2854 r2860  
    2525cd "`dirname $0`" 
    2626 
    27 # include dmd definitions 
    28 . dmd-include 
    29  
    3027# 0) Parse arguments 
    3128UNINSTALL=0 
     
    7269    # Revert to Phobos if earlier evidence of existense is found 
    7370    # Only relevant for pre 0.99.3 installations 
    74     if [ -e "$PREFIX/lib/$PHOBOSLIB.phobos" ] 
    75     then 
    76         mv     $PREFIX/lib/$PHOBOSLIB.phobos $PREFIX/lib/$PHOBOSLIB 
     71    if [ -e "$PREFIX/lib/libphobos.a.phobos" ] 
     72    then 
     73        mv     $PREFIX/lib/libphobos.a.phobos $PREFIX/lib/libphobos.a 
    7774    else 
    7875        if [ -e "$PREFIX/lib/libphobos.a" ] 
     
    165162    if [ ! "`grep '\-version=Tango' $PREFIX/bin/dmd.conf`" ] 
    166163    then 
    167         mv $PREFIX/bin/dmd.conf $PREFIX/bin/dmd.conf.phobos 
     164        mv $PREFIX/bin/dmd.conf $PREFIX/bin/dmd.conf.phobos  
    168165        create_dmd_conf 
    169166    else 
     
    188185    if [ ! -e "$PREFIX/lib/libdtango-base-dmd.a" ] 
    189186    then 
    190         die "libdtango-base-dmd.a not properly installed to $PREFIX/lib" 10 
     187        die "libdtango-base-dmd.a not properly installed to $PREFIX/lib" 10  
    191188    fi 
    192189    if [ ! -e "$PREFIX/bin/dmd.conf" ] 
    193190    then 
    194         die "dmd.conf not present in $PREFIX/bin" 11 
     191        die "dmd.conf not present in $PREFIX/bin" 11  
    195192    elif [ ! "`grep '\-version=Tango' $PREFIX/bin/dmd.conf`" ] 
    196193    then