Changeset 620

Show
Ignore:
Timestamp:
06/04/07 06:32:13 (1 year ago)
Author:
ChristianK
Message:

dsss-dmd scripts improved

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • branches/dsss-dmd/latest/dsss.conf

    r395 r620  
    22 
    33[+dmd] 
    4 preinstall=x/dsssdmd $PREFIX 
     4# Trickery since version statements require a compiler: 
     5# calls x(.bat) with dsssdmd as first argument on windows and 
     6# calls x/dsssdmd on linux 
     7preinstall=x/dsssdmd dmd.1.014.zip $BIN_PREFIX $INCLUDE_PREFIX $LIB_PREFIX 
    58 
  • branches/dsss-dmd/latest/x.bat

    r241 r620  
    11REM download 
    2 curl http://ftp.digitalmars.com/dmd.zip -o dmd.zip 
     2curl http://ftp.digitalmars.com/%2 -o dmd.zip 
    33curl http://ftp.digitalmars.com/dmc.zip -o dmc.zip 
    44bsdtar -xf dmc.zip 
     
    66 
    77REM Install 
    8 xcopy dm\*.* %2 /y/s/e 
    9 xcopy dmd\*.* %2 /y/s/e 
    10 copy newsc.ini %2\bin\sc.ini /y 
     8mkdir %3 
     9copy dmd\bin\dmd.exe %3 /y 
     10copy dmd\bin\rdmd.exe %3 /y 
     11copy dm\bin\link.exe %3 /y 
    1112 
     13mkdir %4\phobos-dmd 
     14xcopy dmd\src\phobos\*.* %4\phobos-dmd /y/s/e 
     15 
     16mkdir %5 
     17xcopy dmd\lib\*.* %5 /y/s/e 
     18xcopy dm\lib\*.* %5 /y/s/e 
     19 
     20REM Configuration 
     21echo [Version] > %3\sc.ini 
     22echo version=7.51 Build 020 >> %3\sc.ini 
     23echo [Environment] >> %3\sc.ini 
     24echo LIB="%5" >> %3\sc.ini 
     25echo DFLAGS="-I%4" "-I%4\phobos-dmd" >> %3\sc.ini 
     26echo LINKCMD=%3\link.exe >> %3\sc.ini 
     27 
  • branches/dsss-dmd/latest/x/dsssdmd

    r402 r620  
    11#!/bin/bash -x 
     2 
    23# Ensure our uname is right 
    34if [ "`uname`" != "Linux" ] 
     
    910# Sanity 
    1011if [ ! "$BIN_PREFIX" -o \ 
    11      ! "$ETC_PREFIX" -o \ 
    1212     ! "$INCLUDE_PREFIX" -o \ 
    1313     ! "$LIB_PREFIX" ] 
     
    1818 
    1919# download 
    20 curl http://ftp.digitalmars.com/dmd.zip -o dmd.zip || exit 1 
     20curl http://ftp.digitalmars.com/$1 -o dmd.zip || exit 1 
    2121unzip dmd.zip || exit 1 
    2222 
     
    2929cp -fpRL dmd dumpobj obj2asm rdmd $BIN_PREFIX || exit 1 
    3030 
    31 mkdir -p $ETC_PREFIX 
    3231echo '[Environment] 
    33 DFLAGS=-I'$INCLUDE_PREFIX' -L-L'$LIB_PREFIX > $BIN_PREFIX/dmd.conf || eit 1 
     32DFLAGS=-I'$INCLUDE_PREFIX' -I'$INCLUDE_PREFIX'/phobos-dmd -L-L'$LIB_PREFIX > $BIN_PREFIX/dmd.conf || exit 1 
    3433 
    3534cd ../src/phobos || exit 1 
    36 cp -fpRL * $INCLUDE_PREFIX || exit 1 
     35mkdir -p ${INCLUDE_PREFIX}/phobos-dmd 
     36cp -fpRL * ${INCLUDE_PREFIX}/phobos-dmd || exit 1 
    3737 
    3838cd ../../lib || exit 1