Changeset 3468

Timestamp:

04/27/08 13:01:47 (7 months ago)

Author:

larsivi

Message:

Making the install more verbose, also fixed bogus userlib feature.

Files:

• trunk/lib/install-dmd.sh (modified) (6 diffs)

trunk/lib/install-dmd.sh

@@ -57 +57 @@
-BASELIB="libtango-base-dmd.a"
-
-# 0) Parse arguments
-#if [ "$#" = "0" ]
-#then
-#    usage
-#fi
-
-while [ "$#" != "0" ]
-do
@@ -157 +151 @@
-then
-    BASELIB="libphobos.a"
-
+-pv 
-fi
-
@@ -263 +257 @@
-    if [ "$BASELIB" -nt "libtango-user-dmd.a" ]
-    then
- to 
-
+
+to 
-        ./build-tango.sh dmd || die "Failed to build libtango-user-dmd.a, try running 
-        ./build-tango.sh dmd manually." 4
@@ -302 +296 @@
-# Install ...
-echo 'Copying files...'
+echo "Creating directories $INCLPREFIX/$INCL/d, $LIBPREFIX/$LIB and $CONFPREFIX/$CONF
+      if they don't exist."
-mkdir -p $INCLPREFIX/$INCL/d || die "Failed to create $INCL/d (maybe you need root privileges?)" 5
-mkdir -p $LIBPREFIX/$LIB/ || die "Failed to create $LIBPREFIX/$LIB (maybe you need root privileges?)" 5
-mkdir -p $CONFPREFIX/$CONF/ || die "Failed to create $CONFPREFIX/$CONF" 5
-
+echo "Installing $BASELIB to $LIBPREFIX/$LIB"
-cp -pRvf $BASELIB $LIBPREFIX/$LIB/ || die "Failed to copy base library." 7
+echo "Installing object.di to $INCLPREFIX/$INCL/d/"
-cp -pRvf ../object.di $INCLPREFIX/$INCL/d/object.di || die "Failed to copy source." 8
-
-if [ "$USERLIB" = "1" ]
-then
+    echo "Installing libtango-user-dmd.a to $LIBPREFIX/$LIB"
-    cp -pRvf libtango-user-dmd.a $LIBPREFIX/$LIB/ || die "Failed to copy user library." 8
+    cd ..
+    for file in `find tango -name '*.di' -o -name '*.d'`
+    do
+        if [ ! -e `dirname $INCLPREFIX/$INCL/d/$file` ]
+        then
+            mkdir -v `dirname $INCLPREFIX/$INCL/d/$file`
+        fi
+        cp $file -pRvf $INCLPREFIX/$INCL/d/$file
+    done
-fi
-
-if [ ! -e "$CONFPREFIX/$CONF/dmd.conf" ]
-then
+    echo "Could not find dmd.conf in $CONFPREFIX/$CONF, create a new one."
-    create_dmd_conf
-else
@@ -321 +330 @@
-    if [ ! "`grep '\-version=Tango' $CONFPREFIX/$CONF/dmd.conf`" ]
-    then
+        echo 'Backing up dmd.conf to dmd.conf.phobos, creating new dmd.conf'
-        mv $CONFPREFIX/$CONF/dmd.conf $CONFPREFIX/$CONF/dmd.conf.phobos
-        create_dmd_conf
@@ -327 +337 @@
-        if [ "`grep '\-defaultlib=tango\-base\-dmd' $CONFPREFIX/$CONF/dmd.conf`" ]
-        then
+            echo 'Removing and re-creating dmd.conf'
-            rm -rf $CONFPREFIX/$CONF/dmd.conf
-            create_dmd_conf