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

Changeset 2941

Show
Ignore:
Timestamp:
11/27/07 14:05:58 (1 year ago)
Author:
keinfarbton
Message:

Exp D2: merge -r2655:2863, libs are no more called dtango

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

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

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

    r2854 r2941  
    1 #!/bin/bash  
     1#!/bin/bash 
    22# Copyright (C) 2007  Gregor Richards 
    33# Permission is granted to do anything you please with this software. 
    …… 
    131131    if [ ! "`grep '\-L\-ltango' $DMDDIR/bin/dmd.conf`" ] 
    132132    then 
    133         sed -i.bak -e 's/^DFLAGS=.*$/& -L-ldtango-user-tango/' $DMDDIR/bin/dmd.conf 
     133        sed -i.bak -e 's/^DFLAGS=.*$/& -L-ltango-user-tango/' $DMDDIR/bin/dmd.conf 
    134134    fi 
    135135fi 

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

    r2854 r2941  
    1 #!/bin/bash  
     1#!/bin/bash 
    22# Copyright (C) 2007  Gregor Richards 
    33# Permission is granted to do anything you please with this software. 
    …… 
    4646 
    4747# 2) The rest 
    48 if [ ! -e libdtango-user-tango.a ] 
     48if [ ! -e libtango-user-tango.a ] 
    4949then 
    5050    cd lib || die 1 "Failed to cd to lib" 
    …… 
    6767 
    6868mkdir -p lib 
    69 cp ../lib/libdtango-user-tango.a lib || die 1 "Failed to copy in the tango .a file" 
     69cp ../lib/libtango-user-tango.a lib || die 1 "Failed to copy in the tango .a file" 
    7070 
    7171find include/d -name .svn | xargs rm -rf 
    …… 
    8282chmod 0755 tango-$TANGO_VERSION-dmd.$DMD_VERSION-posix.sh 
    8383 
    84 # 4) DMD  
     84# 4) DMD 
    8585if [ -e dmd ] 
    8686then 

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

    r2854 r2941  
    8585 
    8686# Since Tango 0.99.3 
    87 if [ -e "$PREFIX/lib/libdtango-base-dmd.a" ] 
     87if [ -e "$PREFIX/lib/libtango-base-dmd.a" ] 
    8888then 
    89     rm -f $PREFIX/lib/libdtango-base-dmd.a 
     89    rm -f $PREFIX/lib/libtango-base-dmd.a 
    9090fi 
    9191 
    92 if [ -e "$PREFIX/lib/libdtango-user-tango.a" ] 
     92if [ -e "$PREFIX/lib/libtango-user-tango.a" ] 
    9393then 
    94     rm -f $PREFIX/lib/libdtango-user-tango.a 
     94    rm -f $PREFIX/lib/libtango-user-tango.a 
    9595fi 
    9696 

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

    r2854 r2941  
    1919        path = args[1] ~ "\\tango"; 
    2020 
    21     outf.write ("-c -n -p256\ndtango-user-tango.lib\n"); 
     21    outf.write ("-c -n -p256\ntango-user-tango.lib\n"); 
    2222    foreach(file; scan( path, ".d" ).files ) 
    2323    { 
    …… 
    3434    outf.close; 
    3535    exec( "lib @tango.lsp" ); 
    36     exec( "cmd /q /c del tango.lsp" ~ list ); 
     36    //exec( "cmd /q /c del tango.lsp" ~ list ); 
     37    exec( "cmd /q /c del tango.lsp *.obj" ); 
    3738} 
    3839 

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

    r2854 r2941  
    5353    { 
    5454        restoreFile( binPath.file( "sc.ini" ) ); 
    55         removeFile( libPath.file( "dtango-user-tango.lib" ) ); 
    56         removeFile( libPath.file( "dtango-arch-win32.lib" ) ); 
    57         removeFile( libPath.file( "dtango-base-dmd.lib" ) ); 
     55        removeFile( libPath.file( "tango-user-tango.lib" ) ); 
     56        removeFile( libPath.file( "tango-arch-win32.lib" ) ); 
     57        removeFile( libPath.file( "tango-base-dmd.lib" ) ); 
    5858 
    5959        removeFile( impPath.file( "object.di" ) ); 
    …… 
    7070        copyFile( impPath.file( "object.di" ), "..\\" ); 
    7171 
    72         copyFile( libPath.file( "dtango-user-tango.lib" ), ".\\" ); 
    73         copyFile( libPath.file( "dtango-arch-win32.lib" ), ".\\" ); 
    74         copyFile( libPath.file( "dtango-base-dmd.lib" ), ".\\" ); 
     72        copyFile( libPath.file( "tango-user-tango.lib" ), ".\\" ); 
     73        copyFile( libPath.file( "tango-arch-win32.lib" ), ".\\" ); 
     74        copyFile( libPath.file( "tango-base-dmd.lib" ), ".\\" ); 
    7575 
    7676        backupFile( binPath.file( "sc.ini" ) ); 
    …… 
    215215           "[Environment]\n" 
    216216           "LIB=\"" ~ libPath ~ "\"\n" 
    217            "DFLAGS=\"-I" ~ impPath ~ "\" -version=Tango -defaultlib=dtango-base-dmd.lib -L+dtango-user-tango.lib\n" 
     217           "DFLAGS=\"-I" ~ impPath ~ "\" -version=Tango -defaultlib=tango-base-dmd.lib -debuglib=tango-base-dmd.lib -L+tango-user-tango.lib\n" 
    218218           "LINKCMD=%@P%\\..\\..\\dm\\bin\\link.exe\n"; 
    219219} 

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

    r2860 r2941  
    2323                 
    2424  The script must be called from within lib/ and the resulting 
    25   binaries will be found there. The build requires that libdtango-base-dmd.a/ 
     25  binaries will be found there. The build requires that libtango-base-dmd.a/ 
    2626  libgphobos.a already was built.' 
    2727    exit 0 
    …… 
    148148elif [ "$1" = "dmd" ] 
    149149then 
    150     build dmd libdtango-user-tango.a libdtango-base-dmd.a 
     150    build dmd libtango-user-tango.a libtango-base-dmd.a 
    151151elif [ "$1" = "gdc" ] 
    152152then 

  • branches/experimental/D2.0/lib/build-win32.bat

    r2856 r2941  
    66 
    77dmd -I..\..\.. -c -inline -release -O Macros.d Process.d Types.d UserGdi.d 
    8 lib -c -n dtango-arch-win32.lib Macros.obj Process.obj Types.obj UserGdi.obj 
     8lib -c -n tango-arch-win32.lib Macros.obj Process.obj Types.obj UserGdi.obj 
    99 
    10 move /y dtango-arch-win32.lib ..\..\..\lib\. 
     10move /y tango-arch-win32.lib ..\..\..\lib\. 
    1111 
    1212del Macros.d    Macros.obj 

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

    r2854 r2941  
    1 # Makefile to build D common runtime library for Linux 
     1# Makefile to build the common D runtime library for Linux 
    22# Designed to work with GNU make 
    33# Targets: 
    …… 
    55#       Same as make all 
    66#   make lib 
    7 #       Build library 
     7#       Build the common library 
    88#   make doc 
    99#       Generate documentation 
    …… 
    1111#       Delete unneeded files created by build process 
    1212 
    13 LIB_TARGET=libdtango-cc-tango.a 
    14 LIB_MASK=libdtango-cc-tango*.a 
     13LIB_TARGET=libtango-cc-tango.a 
     14LIB_MASK=libtango-cc-tango*.a 
    1515 
    1616CP=cp -f 

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

    r2854 r2941  
    1 # Makefile to build D common runtime library for Win32 
     1# Makefile to build the common D runtime library for Win32 
    22# Designed to work with DigitalMars make 
    33# Targets: 
    …… 
    55#       Same as make all 
    66#   make lib 
    7 #       Build library 
     7#       Build the common library 
    88#   make doc 
    99#       Generate documentation 
    …… 
    1111#       Delete unneeded files created by build process 
    1212 
    13 LIB_TARGET=dtango-cc-tango.lib 
    14 LIB_MASK=dtango-cc-tango*.lib 
     13LIB_TARGET=tango-cc-tango.lib 
     14LIB_MASK=tango-cc-tango*.lib 
    1515 
    1616CP=xcopy /y 

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

    r2854 r2941  
    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, "dtango-arch-win32.lib"); // links Tango's Win32 library to reduce EXE size 
     27    pragma(lib, "tango-arch-win32.lib"); // links Tango's Win32 library to reduce EXE size 
    2828} 
    2929 

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

    r2854 r2941  
    1 # Makefile to build D compiler runtime library for Linux 
     1# Makefile to build the compiler runtime D library for Linux 
    22# Designed to work with GNU make 
    33# Targets: 
    …… 
    55#       Same as make all 
    66#   make lib 
    7 #       Build library 
     7#       Build the compiler runtime library 
    88#   make doc 
    99#       Generate documentation 
    …… 
    1111#       Delete unneeded files created by build process 
    1212 
    13 LIB_TARGET=libdtango-rt-dmd.a 
    14 LIB_MASK=libdtango-rt-dmd*.a 
     13LIB_TARGET=libtango-rt-dmd.a 
     14LIB_MASK=libtango-rt-dmd*.a 
    1515 
    1616CP=cp -f 

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

    r2854 r2941  
    1 # Makefile to build D compiler runtime library for Win32 
     1# Makefile to build the compiler runtime D library for Win32 
    22# Designed to work with DigitalMars make 
    33# Targets: 
    …… 
    55#       Same as make all 
    66#   make lib 
    7 #       Build library 
     7#       Build the compiler runtime library 
    88#   make doc 
    99#       Generate documentation 
    …… 
    1111#       Delete unneeded files created by build process 
    1212 
    13 LIB_TARGET=dtango-rt-dmd.lib 
    14 LIB_MASK=dtango-rt-dmd*.lib 
     13LIB_TARGET=tango-rt-dmd.lib 
     14LIB_MASK=tango-rt-dmd*.lib 
    1515 
    1616CP=xcopy /y 

  • branches/experimental/D2.0/lib/compiler/gdc/Makefile.am

    r2502 r2941  
    220220    rm -f gen_config1$(EXEEXT) gen_unix$(EXEEXT) gen_math$(EXEEXT) 
    221221    rm -f frag-gen frag-math frag-unix 
    222     rm -f $(config_d_src) $(configunix_d_src) 
     222    rm -f $(config_d_src) 
    223223    rm -f libgphobos.a 
    224224    rm -f libgphobos_t.a 

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

    r2854 r2941  
    1 # Makefile to build D runtime library libdtango-base-dmd.a for Linux 
     1# Makefile to build the composite D runtime library for Linux 
    22# Designed to work with GNU make 
    33# Targets: 
    …… 
    55#       Same as make all 
    66#   make lib 
    7 #       Build libdtango-base-dmd.a 
     7#       Build the runtime library 
    88#   make doc 
    99#       Generate documentation 
    …… 
    1111#       Delete unneeded files created by build process 
    1212 
    13 LIB_TARGET=libdtango-base-dmd.a 
    14 LIB_MASK=libdtango-base-dmd*.a 
     13LIB_TARGET=libtango-base-dmd.a 
     14LIB_MASK=libtango-base-dmd*.a 
    1515 
    1616DIR_CC=./common/tango 

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

    r2854 r2941  
    1 # Makefile to build D runtime library dtango-base-dmd.lib for Win32 
     1# Makefile to build the composite D runtime library for Win32 
    22# Designed to work with DigitalMars make 
    33# Targets: 
    …… 
    55#       Same as make all 
    66#   make lib 
    7 #       Build dtango-base-dmd.lib 
     7#       Build the runtime library 
    88#   make doc 
    99#       Generate documentation 
    …… 
    1111#       Delete unneeded files created by build process 
    1212 
    13 LIB_TARGET=dtango-base-dmd.lib 
    14 LIB_MASK=dtango-base-dmd*.lib 
     13LIB_TARGET=tango-base-dmd.lib 
     14LIB_MASK=tango-base-dmd*.lib 
    1515 
    1616DIR_CC=common\tango 
    …… 
    1818DIR_GC=gc\basic 
    1919 
    20 LIB_CC=$(DIR_CC)\dtango-cc-tango.lib 
    21 LIB_RT=$(DIR_RT)\dtango-rt-dmd.lib 
    22 LIB_GC=$(DIR_GC)\dtango-gc-basic.lib 
     20LIB_CC=$(DIR_CC)\tango-cc-tango.lib 
     21LIB_RT=$(DIR_RT)\tango-rt-dmd.lib 
     22LIB_GC=$(DIR_GC)\tango-gc-basic.lib 
    2323 
    2424CP=xcopy /y 

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

    r2854 r2941  
    1 # Makefile to build D garbage collector library for Posix 
     1# Makefile to build the garbage collector D library for Posix 
    22# Designed to work with GNU make 
    33# Targets: 
    …… 
    55#       Same as make all 
    66#   make lib 
    7 #       Build library 
     7#       Build the garbage collector library 
    88#   make doc 
    99#       Generate documentation 
    …… 
    1111#       Delete unneeded files created by build process 
    1212 
    13 LIB_TARGET=libdtango-gc-basic.a 
    14 LIB_MASK=libdtango-gc-basic*.a 
     13LIB_TARGET=libtango-gc-basic.a 
     14LIB_MASK=libtango-gc-basic*.a 
    1515 
    1616CP=cp -f 

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

    r2854 r2941  
    1 # Makefile to build D garbage collector library for Win32 
     1# Makefile to build the garbage collector D library for Win32 
    22# Designed to work with DigitalMars make 
    33# Targets: 
    …… 
    55#       Same as make all 
    66#   make lib 
    7 #       Build library 
     7#       Build the garbage collector library 
    88#   make doc 
    99#       Generate documentation 
    …… 
    1111#       Delete unneeded files created by build process 
    1212 
    13 LIB_TARGET=dtango-gc-basic.lib 
    14 LIB_MASK=dtango-gc-basic*.lib 
     13LIB_TARGET=tango-gc-basic.lib 
     14LIB_MASK=tango-gc-basic*.lib 
    1515 
    1616CP=xcopy /y 

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

    r2854 r2941  
    1 # Makefile to build D garbage collector library for Posix 
     1# Makefile to build the garbage collector D library for Posix 
    22# Designed to work with GNU make 
    33# Targets: 
    …… 
    55#       Same as make all 
    66#   make lib 
    7 #       Build library 
     7#       Build the garbage collector library 
    88#   make doc 
    99#       Generate documentation 
    …… 
    1111#       Delete unneeded files created by build process 
    1212 
    13 LIB_TARGET=libdtango-gc-stub.a 
    14 LIB_MASK=libdtango-gc-stub*.a 
     13LIB_TARGET=libtango-gc-stub.a 
     14LIB_MASK=libtango-gc-stub*.a 
    1515 
    1616CP=cp -f 

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

    r2854 r2941  
    1 # Makefile to build D garbage collector library for Win32 
     1# Makefile to build the garbage collector D library for Win32 
    22# Designed to work with DigitalMars make 
    33# Targets: 
    …… 
    55#       Same as make all 
    66#   make lib 
    7 #       Build library 
     7#       Build the garbage collector library 
    88#   make doc 
    99#       Generate documentation 
    …… 
    1111#       Delete unneeded files created by build process 
    1212 
    13 LIB_TARGET=dtango-gc-stub.lib 
    14 LIB_MASK=dtango-gc-stub*.lib 
     13LIB_TARGET=tango-gc-stub.lib 
     14LIB_MASK=tango-gc-stub*.lib 
    1515 
    1616CP=xcopy /y 

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

    r2860 r2941  
    114114 
    115115    # Since Tango 0.99.3 
    116     if [ -e "$PREFIX/lib/libdtango-base-dmd.a" ] 
    117     then 
    118         rm -f $PREFIX/lib/libdtango-base-dmd.a 
    119     fi 
    120  
    121     if [ -e "$PREFIX/lib/libdtango-user-tango.a" ] 
    122     then 
    123         rm -f $PREFIX/lib/libdtango-user-tango.a 
     116    if [ -e "$PREFIX/lib/libtango-base-dmd.a" ] 
     117    then 
     118        rm -f $PREFIX/lib/libtango-base-dmd.a 
     119    fi 
     120 
     121    if [ -e "$PREFIX/lib/libtango-user-tango.a" ] 
     122    then 
     123        rm -f $PREFIX/lib/libtango-user-tango.a 
    124124    fi 
    125125 
    …… 
    129129 
    130130# Verify that runtime was built 
    131 if [ ! -e libdtango-base-dmd.a ] 
     131if [ ! -e libtango-base-dmd.a ] 
    132132then 
    133133    die "You must run build-dmd.sh before running install-dmd.sh" 4 
    …… 
    144144    cat > $PREFIX/bin/dmd.conf <<EOF 
    145145[Environment] 
    146 DFLAGS=-I$PREFIX/include/d -defaultlib=dtango-base-dmd -debuglib=dtango-base-dmd -version=Tango -version=Posix -L-L"%@P%/../lib" 
     146DFLAGS=-I$PREFIX/include/d -defaultlib=tango-base-dmd -debuglib=tango-base-dmd -version=Tango -version=Posix -L-L"%@P%/../lib" 
    147147EOF 
    148148} 
    …… 
    153153mkdir -p $PREFIX/lib/ || die "Failed to create $PREFIX/lib (maybe you need root privileges?)" 5 
    154154mkdir -p $PREFIX/bin/ || die "Failed to create $PREFIX/bin" 5 
    155 cp -pRvf libdtango-base-dmd.a $PREFIX/lib/ || die "Failed to copy libraries" 7 
     155cp -pRvf libtango-base-dmd.a $PREFIX/lib/ || die "Failed to copy libraries" 7 
    156156cp -pRvf ../object.di $PREFIX/include/d/object.di || die "Failed to copy source" 8 
    157157if [ ! -e "$PREFIX/bin/dmd.conf" ] 
    …… 
    168168        then 
    169169            echo 'Appending -defaultlib switch to DFLAGS' 
    170             sed -i.bak -e 's/^DFLAGS=.*$/& -defaultlib=dtango-base-dmd -debuglib=dtango-base-dmd/' $PREFIX/bin/dmd.conf 
     170            sed -i.bak -e 's/^DFLAGS=.*$/& -defaultlib=tango-base-dmd -debuglib=tango-base-dmd/' $PREFIX/bin/dmd.conf 
    171171        else 
    172172            echo 'Found Tango enabled dmd.conf, assume it is working and leave it as is' 
    …… 
    183183        die "object.di not properly installed to $PREFIX/include/d" 9 
    184184    fi 
    185     if [ ! -e "$PREFIX/lib/libdtango-base-dmd.a" ] 
    186     then 
    187         die "libdtango-base-dmd.a not properly installed to $PREFIX/lib" 10  
     185    if [ ! -e "$PREFIX/lib/libtango-base-dmd.a" ] 
     186    then 
     187        die "libtango-base-dmd.a not properly installed to $PREFIX/lib" 10 
    188188    fi 
    189189    if [ ! -e "$PREFIX/bin/dmd.conf" ] 

  • branches/experimental/D2.0/tango/core/Signal.d

    r2810 r2941  
    5555    alias void function(Args) SlotFn; /// 
    5656 
     57    alias opCall call; /// Alias to simplify chained calling. 
     58 
    5759 
    5860    /** 
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