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

Changeset 2866

Show
Ignore:
Timestamp:
11/12/07 22:22:30 (10 months ago)
Author:
sean
Message:

The common, aggregate libraries are now all tagged by compiler:

tango-base-dmd.lib
tango-user-dmd.lib
tango-win32-dmd.lib

The component libraries are not tagged in this manner however, so some care may be necessary for a parallel install in this configuration. refs #660

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/install/dmd-posix/bin/dmd.conf

    r2863 r2866  
    22[Environment] 
    33 
    4 DFLAGS=-I%@P%/../import -L-L%@P%/../lib -version=Posix -version=Tango -defaultlib=tango-base-dmd -debuglib=tango-base-dmd -L-ltango-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-dmd 

  • trunk/install/dmd-posix/installer.sh

    r2863 r2866  
    131131    if [ ! "`grep '\-L\-ltango' $DMDDIR/bin/dmd.conf`" ] 
    132132    then 
    133         sed -i.bak -e 's/^DFLAGS=.*$/& -L-ltango-user-tango/' $DMDDIR/bin/dmd.conf 
     133        sed -i.bak -e 's/^DFLAGS=.*$/& -L-ltango-user-dmd/' $DMDDIR/bin/dmd.conf 
    134134    fi 
    135135fi 

  • trunk/install/dmd-posix/mkinstaller.sh

    r2863 r2866  
    4646 
    4747# 2) The rest 
    48 if [ ! -e libtango-user-tango.a ] 
     48if [ ! -e libtango-user-dmd.a ] 
    4949then 
    5050    cd lib || die 1 "Failed to cd to lib" 
    …… 
    6767 
    6868mkdir -p lib 
    69 cp ../lib/libtango-user-tango.a lib || die 1 "Failed to copy in the tango .a file" 
     69cp ../lib/libtango-user-dmd.a lib || die 1 "Failed to copy in the tango .a file" 
    7070 
    7171find include/d -name .svn | xargs rm -rf 

  • trunk/install/dmd-posix/tango-dmd-tool

    r2863 r2866  
    9090fi 
    9191 
    92 if [ -e "$PREFIX/lib/libtango-user-tango.a" ] 
     92if [ -e "$PREFIX/lib/libtango-user-dmd.a" ] 
    9393then 
    94     rm -f $PREFIX/lib/libtango-user-tango.a 
     94    rm -f $PREFIX/lib/libtango-user-dmd.a 
    9595fi 
    9696 

  • trunk/install/windows/build_tango.d

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

  • trunk/install/windows/install_dmd.d

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

  • trunk/lib/build-tango.sh

    r2863 r2866  
    148148elif [ "$1" = "dmd" ] 
    149149then 
    150     build dmd libtango-user-tango.a libtango-base-dmd.a 
     150    build dmd libtango-user-dmd.a libtango-base-dmd.a 
    151151elif [ "$1" = "gdc" ] 
    152152then 

  • trunk/lib/build-win32.bat

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

  • trunk/lib/compiler/dmd/dmain2.d

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

  • trunk/lib/install-dmd.sh

    r2863 r2866  
    119119    fi 
    120120 
    121     if [ -e "$PREFIX/lib/libtango-user-tango.a" ] 
    122     then 
    123         rm -f $PREFIX/lib/libtango-user-tango.a 
     121    if [ -e "$PREFIX/lib/libtango-user-dmd.a" ] 
     122    then 
     123        rm -f $PREFIX/lib/libtango-user-dmd.a 
    124124    fi 
    125125 
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