Changeset 2823
- Timestamp:
- 11/09/07 06:18:30 (10 months ago)
- Files:
-
- trunk/install/dmd-posix/bin/dmd.conf (modified) (1 diff)
- trunk/install/dmd-posix/installer.sh (modified) (2 diffs)
- trunk/install/dmd-posix/mkinstaller.sh (modified) (3 diffs)
- trunk/install/dmd-posix/tango-dmd-tool (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/install/dmd-posix/bin/dmd.conf
r2465 r2823 2 2 [Environment] 3 3 4 DFLAGS=-I%@P%/../import -L-L%@P%/../lib -version=Posix -version=Tango - L-ltango4 DFLAGS=-I%@P%/../import -L-L%@P%/../lib -version=Posix -version=Tango -defaultlib=dtango-base-dmd -L-ldtango-user-tango trunk/install/dmd-posix/installer.sh
r2460 r2823 123 123 # Just in case it's already installed, uninstall it 124 124 ./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" 126 126 127 127 if [ ! -e "$DMDDIR/bin/dmd.conf" ] … … 131 131 if [ ! "`grep '\-L\-ltango' $DMDDIR/bin/dmd.conf`" ] 132 132 then 133 sed -i.bak -e 's/^DFLAGS=.*$/& -L-l tango/' $DMDDIR/bin/dmd.conf133 sed -i.bak -e 's/^DFLAGS=.*$/& -L-ldtango-user-tango/' $DMDDIR/bin/dmd.conf 134 134 fi 135 135 fi trunk/install/dmd-posix/mkinstaller.sh
r2425 r2823 38 38 cd lib || die 1 "Failed to cd to lib" 39 39 ./build-dmd.sh || die 1 "Failed to build the core" 40 #./install-dmd.sh || die 1 "Failed to install the core"41 40 cd .. || die 1 42 41 fi … … 47 46 48 47 # 2) The rest 49 if [ ! -e lib tango.a ]48 if [ ! -e libdtango-user-tango.a ] 50 49 then 51 50 cd lib || die 1 "Failed to cd to lib" … … 68 67 69 68 mkdir -p lib 70 cp ../lib/lib tango.a lib || die 1 "Failed to copy in the tango .a file"69 cp ../lib/libdtango-user-tango.a lib || die 1 "Failed to copy in the tango .a file" 71 70 72 71 find include/d -name .svn | xargs rm -rf trunk/install/dmd-posix/tango-dmd-tool
r2425 r2823 39 39 cd "`dirname $0`" 40 40 41 # revert to phobos if earlier evidence of existense is found41 # Revert to Phobos if earlier evidence of existense is found 42 42 if [ -e "$PREFIX/lib/libphobos.a.phobos" ] 43 43 then 44 44 mv $PREFIX/lib/libphobos.a.phobos $PREFIX/lib/libphobos.a 45 else 46 if [ -e "$PREFIX/lib/libphobos.a" ] 47 then 48 rm -f $PREFIX/lib/libphobos.a 49 fi 45 50 fi 46 51 if [ -e "$PREFIX/include/d/object.d.phobos" ] … … 50 55 if [ -e "$PREFIX/bin/dmd.conf.phobos" ] 51 56 then 52 mv $PREFIX/bin/dmd.conf $P FEFIX/bin/dmd.conf.tango57 mv $PREFIX/bin/dmd.conf $PREFIX/bin/dmd.conf.tango 53 58 mv $PREFIX/bin/dmd.conf.phobos $PREFIX/bin/dmd.conf 54 59 fi … … 73 78 fi 74 79 80 # Prior to Tango 0.99.3 75 81 if [ -e "$PREFIX/lib/libtango.a" ] 76 82 then 77 83 rm -f $PREFIX/lib/libtango.a 78 84 fi 85 86 # Since Tango 0.99.3 87 if [ -e "$PREFIX/lib/libdtango-base-dmd.a" ] 88 then 89 rm -f $PREFIX/lib/libdtango-base-dmd.a 90 fi 91 92 if [ -e "$PREFIX/lib/libdtango-user-tango.a" ] 93 then 94 rm -f $PREFIX/lib/libdtango-user-tango.a 95 fi 96 79 97 die "Done!" 0 80
