Changeset 245

Timestamp:

04/25/08 15:02:30 (9 months ago)

Author:

conrad

Message:

swap order of checking for cabal and configure, as some haskell stuff
uses cabal to wrap autoconf

Files:

• home/bin/build (modified) (5 diffs)

home/bin/build

@@ -221 +221 @@
-  if [ -e Kbuild ] ; then
-    build_kernel "Configuring" menuconfig
+  elif [ -e Setup.lhs -o -e Setup.hs ] ; then
+    build_cabal_customize
+    build_try_run "Configuring cabalized Haskell source" \
+      runhaskell $CABAL_SETUP configure --user --prefix=$HOME/usr $CABAL_FLAGS $*
-  elif [ -e configure ] ; then
-    build_configure_customize
-    build_in_builddir  $srcdir/configure $CONFIGURE_FLAGS $*
-  elif [ -e Setup.lhs -o -e Setup.hs ] ; then
-    build_cabal_customize
-    build_try_run "Configuring cabalized Haskell source" \
-      runhaskell $CABAL_SETUP configure --user --prefix=$HOME/usr $CABAL_FLAGS $*
-  fi
-}
@@ -235 +235 @@
-  if [ -e Kbuild ] ; then
-    build_kernel "Building"
+  elif [ -e Setup.lhs -o -e Setup.hs ] ; then
+    build_cabal_customize
+    build_try_run "Building cabalized Haskell source" \
+      runhaskell $CABAL_SETUP build $CABAL_FLAGS $*
-  elif [ -e $builddir/Makefile -o -e $builddir/makefile -o \
-       -e Makefile -o -e makefile ] ; then
-    build_in_builddir $MAKE $*
-
+
+
+
+
+
+
-    build_cabal_customize
-    build_try_run "Building cabalized Haskell source" \
-
-
-
-
-
-
-
+
+
-       -e Makefile -o -e makefile ] ; then
-    build_in_builddir $MAKE check $*
-  elif [ -e Setup.lhs -o -e Setup.hs ] ; then
-    build_cabal_customize
-    build_try_run "Building cabalized Haskell source" \
-      runhaskell $CABAL_SETUP test $CABAL_FLAGS $*
-  fi
-}
@@ -259 +259 @@
-build_install () {
-  builddir=$(build_get_dir)
-
+
+
+
+
+
-       -e Makefile -o -e makefile ] ; then
-    build_in_builddir make install $*
-  elif [ -e Setup.lhs -o -e Setup.hs ] ; then
-    build_cabal_customize
-    build_try_run "Installing cabalized Haskell source" \
-      runhaskell $CABAL_SETUP install --user $CABAL_FLAGS $*
-  fi
-}
@@ -271 +271 @@
-build_uninstall () {
-  builddir=$(build_get_dir)
-
-
-
-
+
-    build_cabal_customize
-    echo "build: ERROR: I don't know how to uninstall cabalized Haskell source :-("
-    #build_try_run "Installing cabalized Haskell source" \
-    #  runhaskell $CABAL_SETUP uninstall --user $CABAL_FLAGS $*
+  elif [ -e $builddir/Makefile -o -e $builddir/makefile -o \
+       -e Makefile -o -e makefile ] ; then
+    build_in_builddir make uninstall $*
-  fi
-}
-
-build_clean () {
-build_intree_only
+$(build_intree_only)
-    build_make clean
+  elif [ -e Setup.lhs -o -e Setup.hs ] ; then
+    build_cabal_customize
+    build_try_run "Cleaning cabalized Haskell source" \
+      runhaskell $CABAL_SETUP clean $CABAL_FLAGS $*
-  else
-    builddir=$(build_get_dir)
@@ -379 +383 @@
-    build_ls $*
-    ;;
-
-
+*
+ $*
-    ;;
-  autogen*|mrproper)