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

Changeset 2854

Show
Ignore:
Timestamp:
11/11/07 10:29:46 (1 year ago)
Author:
keinfarbton
Message:

Exp D2.0: merged from trunk -r2809:2853

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/experimental/D2.0/example/dsss.conf

    r2835 r2854  
    2424[networking/sockethello.d] 
    2525[networking/socketserver.d] 
    26 [networking/vfs.d] 
    2726[system/argparser.d] 
    2827[system/localtime.d] 

  • branches/experimental/D2.0/example/linux.mak

    r2535 r2854  
    5454    networking/sockethello  \ 
    5555    networking/socketserver \ 
    56     networking/vfs      \ 
    5756    system/argparser    \ 
    5857    system/localtime    \ 

  • branches/experimental/D2.0/install/dmd-posix/bin/dmd.conf

    r2465 r2854  
    22[Environment] 
    33 
    4 DFLAGS=-I%@P%/../import -L-L%@P%/../lib -version=Posix -version=Tango -L-ltango 
     4DFLAGS=-I%@P%/../import -L-L%@P%/../lib -version=Posix -version=Tango -defaultlib=dtango-base-dmd -debuglib=dtango-base-dmd -L-ldtango-user-tango 

  • branches/experimental/D2.0/install/dmd-posix/installer.sh

    r2460 r2854  
    123123# Just in case it's already installed, uninstall it 
    124124./install-dmd.sh --uninstall > /dev/null 2> /dev/null 
    125 ./install-dmd.sh --prefix $DMDDIR > /dev/null 2> /dev/null || die 1 "Failed to install Tango core" 
     125./install-dmd.sh --prefix $DMDDIR --verify > /dev/null 2> /dev/null || die 1 "Failed to install Tango core" 
    126126 
    127127if [ ! -e "$DMDDIR/bin/dmd.conf" ] 
    …… 
    131131    if [ ! "`grep '\-L\-ltango' $DMDDIR/bin/dmd.conf`" ] 
    132132    then 
    133         sed -i.bak -e 's/^DFLAGS=.*$/& -L-ltango/' $DMDDIR/bin/dmd.conf 
     133        sed -i.bak -e 's/^DFLAGS=.*$/& -L-ldtango-user-tango/' $DMDDIR/bin/dmd.conf 
    134134    fi 
    135135fi 

  • branches/experimental/D2.0/install/dmd-posix/mkinstaller.sh

    r2425 r2854  
    3838    cd lib || die 1 "Failed to cd to lib" 
    3939    ./build-dmd.sh || die 1 "Failed to build the core" 
    40     #./install-dmd.sh || die 1 "Failed to install the core" 
    4140    cd .. || die 1 
    4241fi 
    …… 
    4746 
    4847# 2) The rest 
    49 if [ ! -e libtango.a ] 
     48if [ ! -e libdtango-user-tango.a ] 
    5049then 
    5150    cd lib || die 1 "Failed to cd to lib" 
    …… 
    6867 
    6968mkdir -p lib 
    70 cp ../lib/libtango.a lib || die 1 "Failed to copy in the tango .a file" 
     69cp ../lib/libdtango-user-tango.a lib || die 1 "Failed to copy in the tango .a file" 
    7170 
    7271find include/d -name .svn | xargs rm -rf 

  • branches/experimental/D2.0/install/dmd-posix/tango-dmd-tool

    r2425 r2854  
    3939cd "`dirname $0`" 
    4040 
    41 # revert to phobos if earlier evidence of existense is found 
     41# Revert to Phobos if earlier evidence of existense is found 
    4242if [ -e "$PREFIX/lib/libphobos.a.phobos" ] 
    4343then 
    4444    mv     $PREFIX/lib/libphobos.a.phobos $PREFIX/lib/libphobos.a 
     45else 
     46    if [ -e "$PREFIX/lib/libphobos.a" ] 
     47    then 
     48        rm -f $PREFIX/lib/libphobos.a 
     49    fi 
    4550fi 
    4651if [ -e "$PREFIX/include/d/object.d.phobos" ] 
    …… 
    5055if [ -e "$PREFIX/bin/dmd.conf.phobos" ] 
    5156then 
    52     mv   $PREFIX/bin/dmd.conf $PFEFIX/bin/dmd.conf.tango 
     57    mv   $PREFIX/bin/dmd.conf $PREFIX/bin/dmd.conf.tango 
    5358    mv   $PREFIX/bin/dmd.conf.phobos $PREFIX/bin/dmd.conf 
    5459fi 
    …… 
    7378fi 
    7479 
     80# Prior to Tango 0.99.3 
    7581if [ -e "$PREFIX/lib/libtango.a" ] 
    7682then 
    7783    rm -f $PREFIX/lib/libtango.a 
    7884fi 
     85 
     86# Since Tango 0.99.3 
     87if [ -e "$PREFIX/lib/libdtango-base-dmd.a" ] 
     88then 
     89    rm -f $PREFIX/lib/libdtango-base-dmd.a 
     90fi 
     91 
     92if [ -e "$PREFIX/lib/libdtango-user-tango.a" ] 
     93then 
     94    rm -f $PREFIX/lib/libdtango-user-tango.a 
     95fi 
     96 
    7997die "Done!" 0 
    80  

  • branches/experimental/D2.0/install/windows/build_tango.d

    r2607 r2854  
    1919        path = args[1] ~ "\\tango"; 
    2020 
    21     outf.write ("-c -n -p256\ntango.lib\n"); 
     21    outf.write ("-c -n -p256\ndtango-user-tango.lib\n"); 
    2222    foreach(file; scan( path, ".d" ).files ) 
    2323    { 

  • branches/experimental/D2.0/install/windows/install_dmd.d

    r2465 r2854  
    5252    if( uninst ) 
    5353    { 
    54         restoreFile( libPath.file( "phobos.lib" ) ); 
    5554        restoreFile( binPath.file( "sc.ini" ) ); 
    56         removeFile( libPath.file( "tango.lib" ) ); 
    57         removeFile( libPath.file( "usergdi32.lib" ) ); 
     55        removeFile( libPath.file( "dtango-user-tango.lib" ) ); 
     56        removeFile( libPath.file( "dtango-arch-win32.lib" ) ); 
     57        removeFile( libPath.file( "dtango-base-dmd.lib" ) ); 
    5858 
    5959        removeFile( impPath.file( "object.di" ) ); 
    …… 
    7070        copyFile( impPath.file( "object.di" ), "..\\" ); 
    7171 
    72         if( !prefix ) 
    73             backupFile( libPath.file( "phobos.lib" ) ); 
    74         scope(failure) 
    75         { 
    76             if( !prefix ) 
    77                 restoreFile( libPath.file( "phobos.lib" ) ); 
    78         } 
    79         copyFile( libPath.file( "phobos.lib" ), ".\\" ); 
    80         copyFile( libPath.file( "tango.lib" ), ".\\" ); 
    81         copyFile( libPath.file( "usergdi32.lib" ), ".\\" ); 
     72        copyFile( libPath.file( "dtango-user-tango.lib" ), ".\\" ); 
     73        copyFile( libPath.file( "dtango-arch-win32.lib" ), ".\\" ); 
     74        copyFile( libPath.file( "dtango-base-dmd.lib" ), ".\\" ); 
    8275 
    8376        backupFile( binPath.file( "sc.ini" ) ); 
    …… 
    222215           "[Environment]\n" 
    223216           "LIB=\"" ~ libPath ~ "\"\n" 
    224            "DFLAGS=\"-I" ~ impPath ~ "\" -version=Tango -L+tango.lib\n" 
     217           "DFLAGS=\"-I" ~ impPath ~ "\" -version=Tango -defaultlib=dtango-base-dmd.lib -L+dtango-user-tango.lib\n" 
    225218           "LINKCMD=%@P%\\..\\..\\dm\\bin\\link.exe\n"; 
    226219} 

  • branches/experimental/D2.0/lib/build-gdc-mac.sh

    r2242 r2854  
    11#!/bin/sh 
    22 
     3FAILED=0 
    34# Written by Anders F. Björklund 
    45cd "`dirname \"$0\"`" 
    …… 
    3839for lib in $LIBS; do test -r $lib && rm $lib; done 
    3940 
    40 ./build-gdc-x.sh powerpc-apple-darwin8 
    41 for lib in $LIBS; do mv $lib $lib.ppc; done 
     41if [ "`./build-gdc-x.sh powerpc-apple-darwin8 1>&2`" = "0" ] 
     42then 
     43    for lib in $LIBS; do mv $lib $lib.ppc; done 
     44else 
     45    FAILED=1 
     46fi 
    4247 
    43 ./build-gdc-x.sh i686-apple-darwin8 
    44 for lib in $LIBS; do mv $lib $lib.i386; done 
     48if [ "$FAILED" = "0" ] 
     49then 
     50    if [ "`./build-gdc-x.sh i686-apple-darwin8 1>&2`" = "0" ] 
     51    then 
     52        for lib in $LIBS; do mv $lib $lib.i386; done 
     53    else 
     54        FAILED=1 
     55    fi 
     56fi 
    4557 
    46 for lib in $LIBS; do \ 
    47 lipo -create -output $lib $lib.ppc $lib.i386; done 
    48  
     58if [ "$FAILED" = "1" ] 
     59then 
     60    echo 'Failed to build universal binaries. Trying GDC.' 
     61    ./build-gdc.sh 
     62else 
     63    for lib in $LIBS; do \ 
     64    lipo -create -output $lib $lib.ppc $lib.i386; done 
     65fi 

  • branches/experimental/D2.0/lib/build-gdc-x.sh

    r2465 r2854  
    11#!/bin/bash 
     2 
     3die() { 
     4    echo "$1" 
     5    exit $2 
     6} 
     7 
    28cd "`dirname $0`" 
    39 
    …… 
    1420    CONFIGURE_FLAGS="--enable-phobos-config-dir=$2" 
    1521fi 
     22 
     23$HOST-gdc --help >& /dev/null || die "$HOST-gdc not found on your \$PATH!" 1 
     24 
    1625HOST_ARCH="`echo $HOST | sed 's/-.*//'`" 
    1726ADD_CFLAGS= 

  • branches/experimental/D2.0/lib/build-tango.sh

    r2810 r2854  
    2424 
    2525  The script must be called from within lib/ and the resulting 
    26   binaries will be found there. The build requires that libphobos.a/ 
     26  binaries will be found there. The build requires that libdtango-base-dmd.a/ 
    2727  libgphobos.a already was built.' 
    2828    exit 0 
    …… 
    151151elif [ "$1" = "dmd" ] 
    152152then 
    153     build dmd libtango.a 
     153    build dmd libdtango-user-tango.a libdtango-base-dmd.a 
    154154elif [ "$1" = "gdc" ] 
    155155then 

  • branches/experimental/D2.0/lib/common/tango/posix.mak

    r2693 r2854  
    1010#   make clean 
    1111#       Delete unneeded files created by build process 
     12 
     13LIB_TARGET=libdtango-cc-tango.a 
     14LIB_MASK=libdtango-cc-tango*.a 
    1215 
    1316CP=cp -f 
    …… 
    99102###################################################### 
    100103 
    101 tango.lib : libtango.a 
     104tango.lib : $(LIB_TARGET) 
    102105 
    103 libtango.a : $(ALL_OBJS) 
     106$(LIB_TARGET) : $(ALL_OBJS) 
    104107    $(RM) $@ 
    105108    $(LC) $@ $(ALL_OBJS) 
    …… 
    121124    $(RM) $(ALL_OBJS) 
    122125    $(RM) $(ALL_DOCS) 
    123     find . -name "libtango*.a" | xargs $(RM) 
     126    find . -name "$(LIB_MASK)" | xargs $(RM) 
    124127 
    125128install : 
    …… 
    129132    find . -name "*.html" -exec cp -f {} $(DOC_DEST)/{} \; 
    130133    $(MD) $(LIB_DEST) 
    131     find . -name "libtango*.a" -exec cp -f {} $(LIB_DEST)/{} \; 
     134    find . -name "$(LIB_MASK)" -exec cp -f {} $(LIB_DEST)/{} \; 

  • branches/experimental/D2.0/lib/common/tango/win32.mak

    r2693 r2854  
    1010#   make clean 
    1111#       Delete unneeded files created by build process 
     12 
     13LIB_TARGET=dtango-cc-tango.lib 
     14LIB_MASK=dtango-cc-tango*.lib 
    1215 
    1316CP=xcopy /y 
    …… 
    9194###################################################### 
    9295 
    93 tango.lib : $(ALL_OBJS) 
     96tango.lib : $(LIB_TARGET) 
     97 
     98$(LIB_TARGET) : $(ALL_OBJS) 
    9499    $(RM) $@ 
    95100    $(LC) -c -n $@ $(ALL_OBJS) 
    …… 
    111116    $(RM) $(ALL_OBJS) 
    112117    $(RM) $(ALL_DOCS) 
    113     $(RM) tango*.lib 
     118    $(RM) $(LIB_MASK) 
    114119 
    115120install : 
    …… 
    119124    $(CP) /s *.html $(DOC_DEST)\. 
    120125    $(MD) $(LIB_DEST) 
    121     $(CP) tango*.lib $(LIB_DEST)\. 
     126    $(CP) $(LIB_MASK) $(LIB_DEST)\. 

  • branches/experimental/D2.0/lib/compiler/dmd/dmain2.d

    r2771 r2854  
    2525    extern (Windows) export int WideCharToMultiByte(uint, uint, wchar_t*, int, char*, int, char*, int); 
    2626    pragma(lib, "shell32.lib");   // needed for CommandLineToArgvW 
    27     pragma(lib, "usergdi32.lib"); // links Tango's Win32 library to reduce EXE size 
     27    pragma(lib, "dtango-arch-win32.lib"); // links Tango's Win32 library to reduce EXE size 
    2828} 
    2929 

  • branches/experimental/D2.0/lib/compiler/dmd/posix.mak

    r2465 r2854  
    1010#   make clean 
    1111#       Delete unneeded files created by build process 
     12 
     13LIB_TARGET=libdtango-rt-dmd.a 
     14LIB_MASK=libdtango-rt-dmd*.a 
    1215 
    1316CP=cp -f 
    …… 
    148151###################################################### 
    149152 
    150 dmd.lib : libdmd.a 
     153dmd.lib : $(LIB_TARGET) 
    151154 
    152 libdmd.a : $(ALL_OBJS) 
     155$(LIB_TARGET) : $(ALL_OBJS) 
    153156    $(RM) $@ 
    154157    $(LC) $@ $(ALL_OBJS) 
    …… 
    163166    $(RM) $(ALL_OBJS) 
    164167    $(RM) $(ALL_DOCS) 
    165     $(RM) libdmd*.a 
     168    $(RM) $(LIB_MASK) 
    166169 
    167170install : 
    168171    $(MD) $(LIB_DEST) 
    169     $(CP) libdmd*.a $(LIB_DEST)/. 
     172    $(CP) $(LIB_MASK) $(LIB_DEST)/. 

  • branches/experimental/D2.0/lib/compiler/dmd/win32.mak

    r1968 r2854  
    1010#   make clean 
    1111#       Delete unneeded files created by build process 
     12 
     13LIB_TARGET=dtango-rt-dmd.lib 
     14LIB_MASK=dtango-rt-dmd*.lib 
    1215 
    1316CP=xcopy /y 
    …… 
    138141###################################################### 
    139142 
    140 dmd.lib : $(ALL_OBJS) 
     143dmd.lib : $(LIB_TARGET) 
     144 
     145$(LIB_TARGET) : $(ALL_OBJS) 
    141146    $(RM) $@ 
    142147    $(LC) -c -n $@ $(ALL_OBJS) minit.obj 
    …… 
    151156    $(RM) $(ALL_OBJS) 
    152157    $(RM) $(ALL_DOCS) 
    153     $(RM) dmd*.lib 
     158    $(RM) $(LIB_MASK) 
    154159 
    155160install : 
    156161    $(MD) $(LIB_DEST) 
    157     $(CP) dmd*.lib $(LIB_DEST)\. 
     162    $(CP) $(LIB_MASK) $(LIB_DEST)\. 

  • branches/experimental/D2.0/lib/dmd-posix.mak

    r2695 r2854  
    1 # Makefile to build D runtime library libphobos.a for Linux 
     1# Makefile to build D runtime library libdtango-base-dmd.a for Linux 
    22# Designed to work with GNU make 
    33# Targets: 
    …… 
    55#       Same as make all 
    66#   make lib 
    7 #       Build libphobos.a 
     7#       Build libdtango-base-dmd.a 
    88#   make doc 
    99#       Generate documentation 
    1010#   make clean 
    1111#       Delete unneeded files created by build process 
     12 
     13LIB_TARGET=libdtango-base-dmd.a 
     14LIB_MASK=libdtango-base-dmd*.a 
     15 
     16DIR_CC=./common/tango 
     17DIR_RT=./compiler/dmd 
     18DIR_GC=./gc/basic 
    1219 
    1320CP=cp -f 
    …… 
    3643 
    3744lib : $(ALL_OBJS) 
    38     make -C compiler/dmd -fposix.mak lib 
    39     make -C gc/basic -fposix.mak lib DC=$(DC) ADD_DFLAGS="$(ADD_DFLAGS)" ADD_CFLAGS="$(ADD_CFLAGS)" 
    40     make -C common/tango -fposix.mak lib DC=$(DC) ADD_DFLAGS="$(ADD_DFLAGS)" ADD_CFLAGS="$(ADD_CFLAGS)" 
     45    make -C $(DIR_CC) -fposix.mak lib DC=$(DC) ADD_DFLAGS="$(ADD_DFLAGS)" ADD_CFLAGS="$(ADD_CFLAGS)" 
     46    make -C $(DIR_RT) -fposix.mak lib 
     47    make -C $(DIR_GC) -fposix.mak lib DC=$(DC) ADD_DFLAGS="$(ADD_DFLAGS)" ADD_CFLAGS="$(ADD_CFLAGS)" 
    4148    find . -name "libphobos*.a" | xargs $(RM) 
    42     $(LC) libphobos2.a `find ./compiler/dmd -name "*.o" | xargs echo` 
    43     $(LC) libphobos2.a `find ./gc/basic -name "*.o" | xargs echo` 
    44     $(LC) libphobos2.a `find ./common/tango -name "*.o" | xargs echo` 
     49    $(LC) $(LIB_TARGET) `find $(DIR_CC) -name "*.o" | xargs echo` 
     50    $(LC) $(LIB_TARGET) `find $(DIR_RT) -name "*.o" | xargs echo` 
     51    $(LC) $(LIB_TARGET) `find $(DIR_GC) -name "*.o" | xargs echo` 
    4552 
    4653doc : $(ALL_DOCS) 
    47     make -C compiler/dmd -fposix.mak doc 
    48     make -C gc/basic -fposix.mak doc 
    49     make -C common/tango -fposix.mak doc 
     54    make -C $(DIR_CC) -fposix.mak doc 
     55    make -C $(DIR_RT) -fposix.mak doc 
     56    make -C $(DIR_GC) -fposix.mak doc 
    5057 
    5158###################################################### 
    …… 
    5562    $(RM) $(ALL_OBJS) 
    5663    $(RM) $(ALL_DOCS) 
    57     make -C compiler/dmd -fposix.mak clean 
    58     make -C gc/basic -fposix.mak clean 
    59     make -C common/tango -fposix.mak clean 
    60 #   $(RM) libphobos*.a 
     64    make -C $(DIR_CC) -fposix.mak clean 
     65    make -C $(DIR_RT) -fposix.mak clean 
     66    make -C $(DIR_GC) -fposix.mak clean 
     67#   $(RM) $(LIB_MASK) 
    6168 
    6269install : 
    63     make -C compiler/dmd -fposix.mak install 
    64     make -C gc/basic -fposix.mak install 
    65     make -C common/tango -fposix.mak install 
    66 #   $(CP) libphobos*.a $(LIB_DEST)/. 
     70    make -C $(DIR_CC) -fposix.mak install 
     71    make -C $(DIR_RT) -fposix.mak install 
     72    make -C $(DIR_GC) -fposix.mak install 
     73#   $(CP) $(LIB_MASK) $(LIB_DEST)/. 

  • branches/experimental/D2.0/lib/dmd-win32.mak

    r1922 r2854  
    1 # Makefile to build D runtime library phobos.lib for Win32 
     1# Makefile to build D runtime library dtango-base-dmd.lib for Win32 
    22# Designed to work with DigitalMars make 
    33# Targets: 
    …… 
    55#       Same as make all 
    66#   make lib 
    7 #       Build phobos.lib 
     7#       Build dtango-base-dmd.lib 
    88#   make doc 
    99#       Generate documentation 
    1010#   make clean 
    1111#       Delete unneeded files created by build process 
     12 
     13LIB_TARGET=dtango-base-dmd.lib 
     14LIB_MASK=dtango-base-dmd*.lib 
     15 
     16DIR_CC=common\tango 
     17DIR_RT=compiler\dmd 
     18DIR_GC=gc\basic 
     19 
     20LIB_CC=$(DIR_CC)\dtango-cc-tango.lib 
     21LIB_RT=$(DIR_RT)\dtango-rt-dmd.lib 
     22LIB_GC=$(DIR_GC)\dtango-gc-basic.lib 
    1223 
    1324CP=xcopy /y 
    …… 
    3647 
    3748lib : $(ALL_OBJS) 
    38     cd compiler\dmd 
     49    cd $(DIR_CC) 
     50    make -fwin32.mak lib DC=$(DC) ADD_DFLAGS="$(ADD_DFLAGS)" ADD_CFLAGS="$(ADD_CFLAGS)" 
     51    cd ..\.. 
     52    cd $(DIR_RT) 
    3953    make -fwin32.mak lib 
    4054    cd ..\.. 
    41     cd gc\basic 
    42     make -fwin32.mak lib DC=$(DC) ADD_DFLAGS="$(ADD_DFLAGS)" ADD_CFLAGS="$(ADD_CFLAGS)" 
    43     cd ..\.. 
    44     cd common\tango 
     55    cd $(DIR_GC) 
    4556    make -fwin32.mak lib DC=$(DC) ADD_DFLAGS="$(ADD_DFLAGS)" ADD_CFLAGS="$(ADD_CFLAGS)" 
    4657    cd ..\.. 
    4758    $(RM) phobos*.lib 
    48     $(LC) -c -n phobos.lib common\tango\tango.lib compiler\dmd\dmd.lib gc\basic\basic.lib 
     59    $(LC) -c -n $(LIB_TARGET) $(LIB_CC) $(LIB_RT) $(LIB_GC) 
    4960 
    5061doc : $(ALL_DOCS) 
    51     cd compiler\dmd 
     62    cd $(DIR_CC) 
    5263    make -fwin32.mak doc 
    5364    cd ..\.. 
    54     cd gc\basic 
     65    cd $(DIR_RT) 
    5566    make -fwin32.mak doc 
    5667    cd ..\.. 
    57     cd common\tango 
     68    cd $(DIR_GC) 
    5869    make -fwin32.mak doc 
    5970    cd ..\.. 
    …… 
    6576    $(RM) $(ALL_OBJS) 
    6677    $(RM) $(ALL_DOCS) 
    67     cd compiler\dmd 
     78    cd $(DIR_CC) 
    6879    make -fwin32.mak clean 
    6980    cd ..\.. 
    70     cd gc\basic 
     81    cd $(DIR_RT) 
    7182    make -fwin32.mak clean 
    7283    cd ..\.. 
    73     cd common\tango 
     84    cd $(DIR_GC) 
    7485    make -fwin32.mak clean 
    7586    cd ..\.. 
    76 #   $(RM) phobos*.lib 
     87#   $(RM) $(LIB_MASK) 
    7788 
    7889install : 
    79     cd compiler\dmd 
     90    cd $(DIR_CC) 
    8091    make -fwin32.mak install 
    8192    cd ..\.. 
    82     cd gc\basic 
     93    cd $(DIR_RT) 
    8394    make -fwin32.mak install 
    8495    cd ..\.. 
    85     cd common\tango 
     96    cd $(DIR_GC) 
    8697    make -fwin32.mak install 
    8798    cd ..\.. 
    88 #   $(CP) phobos*.lib $(LIB_DEST)\. 
     99#   $(CP) $(LIB_MASK) $(LIB_DEST)\. 

  • branches/experimental/D2.0/lib/gc/basic/posix.mak

    r2465 r2854  
    1010#   make clean 
    1111#       Delete unneeded files created by build process 
     12 
     13LIB_TARGET=libdtango-gc-basic.a 
     14LIB_MASK=libdtango-gc-basic*.a 
    1215 
    1316CP=cp -f 
    …… 
    7881###################################################### 
    7982 
    80 basic.lib : libbasic.a 
     83basic.lib : $(LIB_TARGET) 
    8184 
    82 libbasic.a : $(ALL_OBJS) 
     85$(LIB_TARGET) : $(ALL_OBJS) 
    8386    $(RM) $@ 
    8487    $(LC) $@ $(ALL_OBJS) 
    …… 
    9396    $(RM) $(ALL_OBJS) 
    9497    $(RM) $(ALL_DOCS) 
    95     $(RM) libbasic*.a 
     98    $(RM) $(LIB_MASK) 
    9699 
    97100install : 
    98101    $(MD) $(LIB_DEST) 
    99     $(CP) libbasic*.a $(LIB_DEST)/. 
     102    $(CP) $(LIB_MASK) $(LIB_DEST)/. 

  • branches/experimental/D2.0/lib/gc/basic/win32.mak

    r2465 r2854  
    1010#   make clean 
    1111#       Delete unneeded files created by build process 
     12 
     13LIB_TARGET=dtango-gc-basic.lib 
     14LIB_MASK=dtango-gc-basic*.lib 
    1215 
    1316CP=xcopy /y 
    …… 
    7578###################################################### 
    7679 
    77 basic.lib : $(ALL_OBJS) 
     80basic.lib : $(LIB_TARGET) 
     81 
     82$(LIB_TARGET) : $(ALL_OBJS) 
    7883    $(RM) $@ 
    7984    $(LC) -c -n $@ $(ALL_OBJS) 
    …… 
    8893    $(RM) $(ALL_OBJS) 
    8994    $(RM) $(ALL_DOCS) 
    90     $(RM) basic*.lib 
     95    $(RM) $(LIB_MASK) 
    9196 
    9297install : 
    9398    $(MD) $(LIB_DEST) 
    94     $(CP) basic*.lib $(LIB_DEST)\. 
     99    $(CP) $(LIB_MASK) $(LIB_DEST)\. 

  • branches/experimental/D2.0/lib/gc/stub/posix.mak

    r2465 r2854  
    1010#   make clean 
    1111#       Delete unneeded files created by build process 
     12 
     13LIB_TARGET=libdtango-gc-stub.a 
     14LIB_MASK=libdtango-gc-stub*.a 
    1215 
    1316CP=cp -f 
    …… 
    7477###################################################### 
    7578 
    76 stub.lib : libstub.a 
     79stub.lib : $(LIB_TARGET) 
    7780 
    78 libstub.a : $(ALL_OBJS) 
     81$(LIB_TARGET) : $(ALL_OBJS) 
    7982    $(RM) $@ 
    8083    $(LC) $@ $(ALL_OBJS) 
    …… 
    8992    $(RM) $(ALL_OBJS) 
    9093    $(RM) $(ALL_DOCS) 
    91     $(RM) libstub*.a 
     94    $(RM) $(LIB_MASK) 
    9295 
    9396install : 
    9497    $(MD) $(LIB_DEST) 
    95     $(CP) libstub*.a $(LIB_DEST)/. 
     98    $(CP) $(LIB_MASK) $(LIB_DEST)/. 

  • branches/experimental/D2.0/lib/gc/stub/win32.mak

    r2465 r2854  
    1010#   make clean 
    1111#       Delete unneeded files created by build process 
     12 
     13LIB_TARGET=dtango-gc-stub.lib 
     14LIB_MASK=dtango-gc-stub*.lib 
    1215 
    1316CP=xcopy /y 
    …… 
    7174###################################################### 
    7275 
    73 stub.lib : $(ALL_OBJS) 
     76stub.lib : $(LIB_TARGET) 
     77 
     78$(LIB_TARGET) : $(ALL_OBJS) 
    7479    $(RM) $@ 
    7580    $(LC) -c -n $@ $(ALL_OBJS) 
    …… 
    8489    $(RM) $(ALL_OBJS) 
    8590    $(RM) $(ALL_DOCS) 
    86     $(RM) stub*.lib 
     91    $(RM) $(LIB_MASK) 
    8792 
    8893install : 
    8994    $(MD) $(LIB_DEST) 
    90     $(CP) stub*.lib $(LIB_DEST)\. 
     95    $(CP) $(LIB_MASK) $(LIB_DEST)\. 

  • branches/experimental/D2.0/lib/install-dmd.sh

    r2810 r2854  
    1818Options: 
    1919  --prefix: Install to the specified prefix (absolute path). 
    20   --uninstall: Uninstall tango, switch back to standard phobos.' 
     20  --uninstall: Uninstall Tango, switch back to standard Phobos. 
     21  --verify: Will verify installation.' 
    2122    exit 0 
    2223} 
    …… 
    2930# 0) Parse arguments 
    3031UNINSTALL=0 
    31 REPLACE_PHOBOS=0 
     32VERIFY=0 
    3233 
    3334while [ "$#" != "0" ] 
    …… 
    4142    then 
    4243        UNINSTALL=1 
    43     else 
     44    elif [ "$1" = "--verify" ] 
     45    then 
     46        VERIFY=1 
     47     else 
    4448        usage 
    4549    fi 
    …… 
    5458echo "$PREFIX" 
    5559 
     60# Verify that PREFIX is absolute 
    5661if [ "${PREFIX:0:1}" != "/" ] 
    5762then 
    …… 
    5964fi 
    6065 
     66# Verify presence of DMD 
    6167dmd --help >& /dev/null || die "dmd not found on your \$PATH!" 1 
    62  
    63 if [ -e "$PREFIX/lib/$PHOBOSLIB" ] 
    64 then 
    65     REPLACE_PHOBOS=1 
    66 fi 
    6768 
    6869# If uninstalling, do that now 
    6970if [ "$UNINSTALL" = "1" ] 
    7071then 
    71     # revert to phobos if earlier evidence of existense is found 
     72    # Revert to Phobos if earlier evidence of existense is found 
     73    # Only relevant for pre 0.99.3 installations 
    7274    if [ -e "$PREFIX/lib/$PHOBOSLIB.phobos" ] 
    7375    then 
    7476        mv     $PREFIX/lib/$PHOBOSLIB.phobos $PREFIX/lib/$PHOBOSLIB 
     77    else 
     78        if [ -e "$PREFIX/lib/libphobos.a" ] 
     79        then 
     80            rm -f $PREFIX/lib/libphobos.a 
     81        fi 
    7582    fi 
    7683    if [ -e "$PREFIX/include/d/object.d.phobos" ] 
    …… 
    95102        rm -f  $PREFIX/include/d/tango/object.di 
    96103    fi 
    97     # Since tango 0.99 
     104    # Since Tango 0.99 
    98105    if [ -e "$PREFIX/include/d/object.di" ] 
    99106    then 
    …… 
    103110    fi 
    104111 
     112    # Prior to Tango 0.99.3 
    105113    if [ -e "$PREFIX/lib/libtango.a" ] 
    106114    then 
    107115        rm -f $PREFIX/lib/libtango.a 
    108116    fi 
     117 
     118    # Since Tango 0.99.3 
     119    if [ -e "$PREFIX/lib/libdtango-base-dmd.a" ] 
     120    then 
     121        rm -f $PREFIX/lib/libdtango-base-dmd.a 
     122    fi 
     123 
     124    if [ -e "$PREFIX/lib/libdtango-user-tango.a" ] 
     125    then 
     126        rm -f $PREFIX/lib/libdtango-user-tango.a 
     127    fi 
     128 
    109129    die "Done!" 0 
    110130fi 
    111131 
    112132 
    113 # Sanity check 
    114 if [ ! -e $PHOBOSLIB ] 
     133# Verify that runtime was built 
     134if [ ! -e libdtango-base-dmd.a ] 
    115135then 
    116136    die "You must run build-dmd.sh before running install-dmd.sh" 4 
    …… 
    118138 
    119139# Back up the original files 
    120 if [ "$REPLACE_PHOBOS" = "1" ] 
    121 then 
    122     if [ -e "$PREFIX/lib/$PHOBOSLIB.phobos" ] 
    123     then 
    124         die "You must uninstall your old copy of Tango before installing a new one." 4 
    125     fi 
    126     mv -f $PREFIX/lib/$PHOBOSLIB $PREFIX/lib/$PHOBOSLIB.phobos 
    127     if [ -e "$PREFIX/include/d/object.d" ] 
    128     then 
    129         mv -f $PREFIX/include/d/object.d $PREFIX/include/d/object.d.phobos 
    130     fi 
    131 fi 
    132  
     140if [ -e "$PREFIX/include/d/object.d" ] 
     141then 
     142    mv -f $PREFIX/include/d/object.d $PREFIX/include/d/object.d.phobos 
     143fi 
     144 
     145# Create dmd.conf 
    133146create_dmd_conf() { 
    134147    cat > $PREFIX/bin/dmd.conf <<EOF 
    135148[Environment] 
    136 DFLAGS=-I$PREFIX/include/d -version=Tango -version=Posix -L-L"%@P%/../lib" 
     149DFLAGS=-I$PREFIX/include/d -defaultlib=dtango-base-dmd -debuglib=dtango-base-dmd -version=Tango -version=Posix -L-L"%@P%/../lib" 
    137150EOF 
    138151} 
    …… 
    143156mkdir -p $PREFIX/lib/ || die "Failed to create $PREFIX/lib (maybe you need root privileges?)" 5 
    144157mkdir -p $PREFIX/bin/ || die "Failed to create $PREFIX/bin" 5 
    145 cp -pRvf $PHOBOSLIB $PREFIX/lib/ || die "Failed to copy libraries" 7 
     158cp -pRvf libdtango-base-dmd.a $PREFIX/lib/ || die "Failed to copy libraries" 7 
    146159cp -pRvf ../object.di $PREFIX/include/d/object.di || die "Failed to copy source" 8 
    147160if [ ! -e "$PREFIX/bin/dmd.conf" ] 
    …… 
    152165    if [ ! "`grep '\-version=Tango' $PREFIX/bin/dmd.conf`" ] 
    153166    then 
    154         mv $PREFIX/bin/dmd.conf $PREFIX/bin/dmd.conf.phobos  
     167        mv $PREFIX/bin/dmd.conf $PREFIX/bin/dmd.conf.phobos 
    155168        create_dmd_conf 
    156169    else 
    157         echo 'Found Tango enabled dmd.conf, assume it is working and leave it as is' 
    158     fi 
     170        if [ ! "`grep '\-defaultlib=dtango\-base\-dmd' $PREFIX/bin/dmd.conf`" ] 
     171        then 
     172            echo 'Appending -defaultlib switch to DFLAGS' 
     173            sed -i.bak -e 's/^DFLAGS=.*$/& -defaultlib=dtango-base-dmd -debuglib=dtango-base-dmd/' $PREFIX/bin/dmd.conf 
     174        else 
     175            echo 'Found Tango enabled dmd.conf, assume it is working and leave it as is' 
     176        fi 
     177    fi 
     178fi 
     179 
     180# Verify installation 
     181if [ "$VERIFY" = "1" ] 
     182then 
     183    echo 'Verifying installation.' 
     184    if [ ! -e "$PREFIX/include/d/object.di" ] 
     185    then 
     186        die "object.di not properly installed to $PREFIX/include/d" 9 
     187    fi 
     188    if [ ! -e "$PREFIX/lib/libdtango-base-dmd.a" ] 
     189    then 
     190        die "libdtango-base-dmd.a not properly installed to $PREFIX/lib" 10 
     191    fi 
     192    if [ ! -e "$PREFIX/bin/dmd.conf" ] 
     193    then 
     194        die "dmd.conf not present in $PREFIX/bin" 11 
     195    elif [ ! "`grep '\-version=Tango' $PREFIX/bin/dmd.conf`" ] 
     196    then 
     197        die "dmd.conf not Tango enabled" 12 
     198    elif [ ! "`grep '\-defaultlib=dtango\-base\-dmd' $PREFIX/bin/dmd.conf`" ] 
     199    then 
     200        die "dmd.conf don't have -defaultlib switch" 13 
     201    fi 
     202    echo 'Installation OK.' 
    159203fi 
    160204 

  • branches/experimental/D2.0/lib/unittest.sh

    r2550 r2854  
    3535EOF 
    3636 
    37         rebuild -debug=UnitTest -debug -full -clean -unittest -version=UnitTest $EXE.d tango/core/*.d tango/io/digest/*.d tango/io/model/*.d tango/io/protocol/*.d tango/io/selector/*.d tango/io/*.d tango/io/vfs/* tango/math/*.d tango/net/ftp/*.d tango/net/http/*.d tango/net/model/*.d tango/stdc/stringz.d tango/sys/*.d tango/text/convert/*.d tango/text/locale/Collation.d tango/text/locale/Convert.d tango/text/locale/Core.d tango/text/locale/Data.d tango/text/locale/Locale.d tango/text/locale/Parse.d tango/text/locale/Posix.d tango/text/stream/*.d tango/text/*.d tango/util/*.d tango/util/collection/model/*.d tango/util/collection/*.d tango/util/collection/iterator/*.d tango/util/collection/impl/*.d tango/util/log/model/*.d tango/util/log/*.d tango/util/time/chrono/*.d tango/util/time/*.d -dc=$DC-posix-tango 
     37        rebuild -L-ldl -debug=UnitTest -debug -full -clean -unittest -version=UnitTest $EXE.d tango/core/*.d tango/io/digest/*.d tango/io/model/*.d tango/io/protocol/*.d tango/io/selector/*.d tango/io/*.d tango/io/vfs/*.d tango/io/vfs/model/* tango/math/*.d tango/net/ftp/*.d tango/net/http/*.d tango/net/model/*.d tango/stdc/stringz.d tango/sys/*.d tango/text/convert/*.d tango/text/locale/Collation.d tango/text/locale/Convert.d tango/text/locale/Core.d tango/text/locale/Data.d tango/text/locale/Locale.d tango/text/locale/Parse.d tango/text/locale/Posix.d tango/text/stream/*.d tango/text/*.d tango/util/*.d tango/util/collection/model/*.d tango/util/collection/*.d tango/util/collection/iterator/*.d tango/util/collection/impl/*.d tango/util/log/model/*.d tango/util/log/*.d tango/util/time/chrono/*.d tango/util/time/*.d -dc=$DC-posix-tango 
    3838 
    3939        mv $EXE lib/$EXE 

  • branches/experimental/D2.0/tango/io/FilePath.d