Changeset 2230
- Timestamp:
- 05/15/07 19:26:38 (2 years ago)
- Files:
-
- trunk/install/dmd-posix/installer.sh (modified) (2 diffs)
- trunk/install/dmd-posix/mkinstaller.sh (modified) (1 diff)
- trunk/install/dmd-posix/tango-dmd-tool (modified) (3 diffs)
- trunk/lib/install-dmd.sh (modified) (5 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/install/dmd-posix/installer.sh
r2229 r2230 27 27 # This installer works by black magic: The following number must be the exact 28 28 # number of lines in this file+3: 29 LINES=11 229 LINES=113 30 30 31 31 # Install DMD if necessary … … 105 105 106 106 echo 'Done!' 107 echo "Remember to update your PATH as necessary. You installed to the prefix $DMDDIR" 107 108 echo "Run 'tango-dmd-tool --uninstall $DMDDIR' to uninstall Tango" 108 109 trunk/install/dmd-posix/mkinstaller.sh
r2229 r2230 69 69 cp ../install/dmd-posix/tango-dmd-tool bin/tango-dmd-tool || die 1 "Failed to install the uninstaller" 70 70 71 # Clear old i mportfiles72 rm -rf i mport/tango/tango import/tango/std71 # Clear old include/d files 72 rm -rf include/d/tango/tango include/d/tango/std 73 73 74 mkdir -p i mport/tango75 cp -pR ../tango i mport/tango || die 1 "Failed to copy in the tango .d files"76 cp -pR ../std i mport/tango || die 1 "Failed to copy in the std .d files"74 mkdir -p include/d/tango 75 cp -pR ../tango include/d/tango || die 1 "Failed to copy in the tango .d files" 76 cp -pR ../std include/d/tango || die 1 "Failed to copy in the std .d files" 77 77 78 78 mkdir -p lib 79 79 cp ../lib/libtango.a lib || die 1 "Failed to copy in the tango .a file" 80 80 81 find i mport/tango -name .svn | xargs rm -rf82 tar zcf ../tango.tar.gz i mportlib bin || die 1 "Failed to create tango.tar.gz"81 find include/d/tango -name .svn | xargs rm -rf 82 tar zcf ../tango.tar.gz include lib bin || die 1 "Failed to create tango.tar.gz" 83 83 cd .. || exit 1 84 84 rm -rf tmp || exit 1 trunk/install/dmd-posix/tango-dmd-tool
r2221 r2230 38 38 39 39 cd "`dirname $0`" 40 dmd --help >& /dev/null || die "dmd not found on your \$PATH!" 141 40 42 41 # revert to phobos if earlier evidence of existense is found … … 45 44 mv $PREFIX/lib/libphobos.a.phobos $PREFIX/lib/libphobos.a 46 45 fi 47 if [ -e "$PREFIX/i mport/object.d.phobos" ]46 if [ -e "$PREFIX/include/d/object.d.phobos" ] 48 47 then 49 mv $PREFIX/i mport/object.d.phobos $PREFIX/import/object.d48 mv $PREFIX/include/d/object.d.phobos $PREFIX/include/d/object.d 50 49 fi 51 50 if [ -e "$PREFIX/bin/dmd.conf.phobos" ] … … 60 59 fi 61 60 # Since Tango 0.98 62 if [ -e "$PREFIX/i mport/tango/object.di" ]61 if [ -e "$PREFIX/include/d/tango/object.di" ] 63 62 then 64 rm -rf $PREFIX/i mport/tango/tango65 rm -rf $PREFIX/i mport/tango/std66 rm -f $PREFIX/i mport/tango/object.di63 rm -rf $PREFIX/include/d/tango/tango 64 rm -rf $PREFIX/include/d/tango/std 65 rm -f $PREFIX/include/d/tango/object.di 67 66 fi 68 67 if [ -e "$PREFIX/lib/libtango.a" ] trunk/lib/install-dmd.sh
r2228 r2230 70 70 mv $PHOBOS_DIR/libphobos.a.phobos $PHOBOS_DIR/libphobos.a 71 71 fi 72 if [ -e "$PREFIX/i mport/object.d.phobos" ]72 if [ -e "$PREFIX/include/d/object.d.phobos" ] 73 73 then 74 mv $PREFIX/i mport/object.d.phobos $PREFIX/import/object.d74 mv $PREFIX/include/d/object.d.phobos $PREFIX/include/d/object.d 75 75 fi 76 76 if [ -e "$PREFIX/bin/dmd.conf.phobos" ] … … 85 85 fi 86 86 # Since Tango 0.98 87 if [ -e "$PREFIX/i mport/tango/object.di" ]87 if [ -e "$PREFIX/include/d/tango/object.di" ] 88 88 then 89 rm -rf $PREFIX/i mport/tango/tango90 rm -rf $PREFIX/i mport/tango/std91 rm -f $PREFIX/i mport/tango/object.di89 rm -rf $PREFIX/include/d/tango/tango 90 rm -rf $PREFIX/include/d/tango/std 91 rm -f $PREFIX/include/d/tango/object.di 92 92 fi 93 93 if [ -e "$PREFIX/lib/libtango.a" ] … … 113 113 fi 114 114 mv -f $PHOBOS_DIR/libphobos.a $PHOBOS_DIR/libphobos.a.phobos 115 if [ -e "$PREFIX/i mport/object.d" ]115 if [ -e "$PREFIX/include/d/object.d" ] 116 116 then 117 mv -f $PREFIX/i mport/object.d $PREFIX/import/object.d.phobos117 mv -f $PREFIX/include/d/object.d $PREFIX/include/d/object.d.phobos 118 118 fi 119 119 fi … … 122 122 cat > $PREFIX/bin/dmd.conf <<EOF 123 123 [Environment] 124 DFLAGS=-I$PREFIX/i mport/tango -version=Tango -version=Posix -L-L"%@P%/../lib"124 DFLAGS=-I$PREFIX/include/d/tango -version=Tango -version=Posix -L-L"%@P%/../lib" 125 125 EOF 126 126 } … … 128 128 # Install ... 129 129 echo 'Copying files...' 130 mkdir -p $PREFIX/i mport/tango || die "Failed to create import(maybe you need root privileges?)" 5130 mkdir -p $PREFIX/include/d/tango || die "Failed to create include/d (maybe you need root privileges?)" 5 131 131 mkdir -p $PREFIX/lib/ || die "Failed to create $PREFIX/lib (maybe you need root privileges?)" 5 132 132 mkdir -p $PREFIX/bin/ || die "Failed to create $PREFIX/bin" 5 133 133 cp -pRvf libphobos.a $PREFIX/lib/ || die "Failed to copy libraries" 7 134 cp -pRvf ../object.di $PREFIX/i mport/tango/object.di || die "Failed to copy source" 8134 cp -pRvf ../object.di $PREFIX/include/d/tango/object.di || die "Failed to copy source" 8 135 135 if [ ! -e "$PREFIX/bin/dmd.conf" ] 136 136 then
