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

Changeset 894

Show
Ignore:
Timestamp:
10/09/06 14:32:58 (2 years ago)
Author:
Gregor
Message:

dsss.conf: More complete.

lib/gdc-posix.mak: For the moment, don't include configunix.d (I'd rather we did but can't solve it now)

lib/compiler/gdc/lifetime.d: This ASM code doesn't actually work, disabled.

lib/install-gdc.sh: Some updates.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/dsss.conf

    r887 r894  
    11[tango/core] 
     2postinstall=install tango/core/Intrinsic.di $INCLUDE_PREFIX/tango/core \ 
     3tango/core/Thread.di $INCLUDE_PREFIX/tango/core 
     4version (GNU) { 
     5    exclude = tango/core/Epoch.d 
     6} 
    27 
    38[tango/io] 
    …… 
    712[tango/math] 
    813version (GNU) { 
    9         # Don't know why this doesn't work 
    10         exclude = tango/math/Bessel.d tango/math/cipher/Crc32.d 
     14    # Don't know why this doesn't work 
     15    exclude = tango/math/Bessel.d tango/math/Special.d tango/math/cipher/Crc32.d 
    1116} 
    1217 
    …… 
    1722exclude = tango/net/ftp/ftp.d tango/net/ftp/telnet.d 
    1823 
     24[tango/stdc] 
     25 
     26[tango/stdc/posix] 
     27version (Posix) { 
     28} else { 
     29    exclude = * 
     30} 
     31 
    1932[tango/store] 
     33version (GNU) { 
     34    # Not sure if this fails to build elsewhere 
     35    exclude += tango/store/all.d tango/store/*Map.d 
     36} 
    2037 
    2138[tango/sys] 
    2239version (linux) { 
    23         exclude = tango/sys/darwin/* tango/sys/windows/* 
    24 } 
    25 version (darwin) { 
    26         exclude = tango/sys/linux/* tango/sys/windows/* 
    27 } 
    28 version (Windows) { 
    29         exclude = tango/sys/linux/* tango/sys/darwin/* 
     40    exclude = tango/sys/darwin/* tango/sys/windows/* 
     41} else version (darwin) { 
     42    exclude = tango/sys/linux/* tango/sys/windows/* 
     43} else version (Windows) { 
     44    exclude = tango/sys/linux/* tango/sys/darwin/* 
    3045} 
    3146 
    3247[tango/text] 
    33 # This seems to have a bunch of double-defines ... 
    34 exclude = tango/text/convert/Format.d 
     48 
     49[tango/text/locale] 
     50# Needs to be separated due to two Format.d's 
     51 

  • trunk/lib/compiler/gdc/lifetime.d

    r863 r894  
    672672    if (newlength) 
    673673    { 
    674         version (D_InlineAsm_X86) 
     674        version (D_InlineAsm_X86_NONFUNCTIONAL) 
    675675        { 
    676676            size_t newsize = void; 

  • trunk/lib/gdc-posix.mak

    r862 r894  
    3636lib : $(ALL_OBJS) 
    3737    make -C compiler/gdc 
    38     $(RM) compiler/gdc/config/*.o 
     38    $(RM) compiler/gdc/config/*.o compiler/gdc/gcc/configunix.o 
    3939    make -C gc/basic -fposix.mak lib DC=$(DC) ADDFLAGS="$(ADDFLAGS)" 
    4040    make -C common -fposix.mak lib DC=$(DC) ADDFLAGS="$(ADDFLAGS)" 

  • trunk/lib/install-gdc.sh

    r878 r894  
    1616Options: 
    1717  --inplace: Don'\''t install anywhere, just keep the installation in-place. 
     18             (Not recommended, doesn'\''t work without -I) 
    1819  --prefix: Install to the specified prefix. 
    1920  --uninstall: Uninstall tango, switch back to standard phobos.' 
    …… 
    3132GPHOBOS_DIR="`dirname $GPHOBOS_DIR`" 
    3233PREFIX="$GPHOBOS_DIR/.." 
     34GDC_VER="`gdc --version | head -n 1 | cut -d ' ' -f 3`" 
    3335 
    3436while [ "$#" != "0" ] 
    …… 
    6769    if [ "$INPLACE" = "0" ] 
    6870    then 
    69         rm -rf $PREFIX/lib/tango $PREFIX/include/d/tango 
     71        rm -rf $PREFIX/lib/tango $PREFIX/include/d/$GDC_VER/object.d 
     72        mv $PREFIX/include/d/$GDC_VER/object.d.phobos $PREFIX/include/d/$GDC_VER/object.d 
    7073    fi 
    7174    mv -f $GPHOBOS_DIR/libgphobos.spec.phobos $GPHOBOS_DIR/libgphobos.spec 
    …… 
    8184 
    8285# Back up the original specfile 
    83 if [ ! -e "$GPHOBOS_DIR/libgphobos.spec.phobos" ] 
     86if [ -e "$GPHOBOS_DIR/libgphobos.spec.phobos" ] 
    8487then 
    85     mv -f $GPHOBOS_DIR/libgphobos.spec $GPHOBOS_DIR/libgphobos.spec.phobos 
    86 else 
    87     rm -f $GPHOBOS_DIR/libgphobos.spec 
     88    die "You must uninstall your old copy of Tango before installing a new one." 4 
    8889fi 
     90mv -f $GPHOBOS_DIR/libgphobos.spec $GPHOBOS_DIR/libgphobos.spec.phobos 
    8991 
    9092# Install ... 
    …… 
    9597    echo 'Copying files...' 
    9698    mkdir -p $PREFIX/lib/tango || die "Failed to create lib/tango (maybe you need root privileges?" 5 
    97     mkdir -p $PREFIX/include/d/tango || die "Failed to create include/d/tango" 6 
     99    mkdir -p $PREFIX/include/d/$GDC_VER || die "Failed to create include/d/$GDC_VER" 6 
    98100    cp -avf libgphobos.a libtango.a $PREFIX/lib/tango || die "Failed to copy libraries" 7 
    99     cp -avf ../tango ../phobos ../object.d $PREFIX/include/d/tango || die "Failed to copy source" 8 
     101    mv $PREFIX/include/d/$GDC_VER/object.d $PREFIX/include/d/$GDC_VER/object.d.phobos || die "Failed to move Phobos' object.d" 8 
     102    cp -avf ../object.d $PREFIX/include/d/$GDC_VER || die "Failed to copy source" 8 
    100103 
    101104    SPECLIBDIR="$PREFIX/lib/tango" 
    102     SPECINCDIR="$PREFIX/include/d/tango" 
     105    SPECINCDIR="$PREFIX/include/d/$GDC_VER" 
    103106else 
    104107    SPECLIBDIR="$PWD" 
    …… 
    110113cat $GPHOBOS_DIR/libgphobos.spec.phobos | 
    111114  grep '^\*lib:' | 
    112   sed 's|:|: %{!nostdinc:-lc| ; s|\%(.*|'$SPECLIBDIR'/libtango.a '$SPECLIBDIR'/libgphobos.a}|g' >> $GPHOBOS_DIR/libgphobos.spec 
     115  sed 's|:|: %{!nostdlib:-lc| ; s|\%(.*|-L'$SPECLIBDIR' '$SPECLIBDIR'/libtango.a '$SPECLIBDIR'/libgphobos.a}|g' >> $GPHOBOS_DIR/libgphobos.spec 
    113116echo ' 
    114117%rename cc1_options orig_options 
Roadmap Timeline Tickets New Ticket Help / Guide About Trac
Login  |  
Trac dsource.org
RSS
Copyright © 2006-2008 Tango. All Rights Reserved. | Page Width: Static or Dynamic