[Lunar-commits] r15070 - in lunar/branches/stable: lib/lsb var/lib/lunar var/lib/lunar/compilers var/lib/lunar/functions var/lib/lunar/plugins

Auke Kok sofar at lunar-linux.org
Thu May 26 11:35:47 UTC 2005


Author: sofar
Date: 2005-05-26 11:35:46 +0000 (Thu, 26 May 2005)
New Revision: 15070

Added:
   lunar/branches/stable/var/lib/lunar/compilers/make
Modified:
   lunar/branches/stable/lib/lsb/init-functions
   lunar/branches/stable/var/lib/lunar/compilers/c++
   lunar/branches/stable/var/lib/lunar/compilers/cc
   lunar/branches/stable/var/lib/lunar/compilers/g++
   lunar/branches/stable/var/lib/lunar/compilers/gcc
   lunar/branches/stable/var/lib/lunar/functions/build.lunar
   lunar/branches/stable/var/lib/lunar/functions/optimize.lunar
   lunar/branches/stable/var/lib/lunar/plugins/postbuild-generic.plugin
   lunar/branches/stable/var/lib/lunar/unset.sh
Log:
backmerge theedge ->lunar including:
-o fix by moe in lsb/init-functions
adding make wrapper
queue run fix (LIN)
wrapper fixes


Modified: lunar/branches/stable/lib/lsb/init-functions
===================================================================
--- lunar/branches/stable/lib/lsb/init-functions	2005-05-26 11:28:25 UTC (rev 15069)
+++ lunar/branches/stable/lib/lsb/init-functions	2005-05-26 11:35:46 UTC (rev 15070)
@@ -178,7 +178,7 @@
 mkpid () {
   if [ ! -e $PIDFILE ] ; then
     echo -n "[PID] "
-    /bin/pgrep -P 1 "^$PROCESS_BASE$" > $PIDFILE && return 0 || return -1
+    /bin/pgrep -o -P 1 "^$PROCESS_BASE$" > $PIDFILE && return 0 || return -1
   else 
     return 
   fi

Modified: lunar/branches/stable/var/lib/lunar/compilers/c++
===================================================================
--- lunar/branches/stable/var/lib/lunar/compilers/c++	2005-05-26 11:28:25 UTC (rev 15069)
+++ lunar/branches/stable/var/lib/lunar/compilers/c++	2005-05-26 11:35:46 UTC (rev 15070)
@@ -3,7 +3,7 @@
 export PATH=${PATH/\/var\/lib\/lunar\/compilers:/}
 
 if [ -n "$LUNAR_DEBUG" ] ; then
-  echo "++ $CXX_EXT g++ $CCOPT \"$@\"" > /dev/stderr
+  echo "++ $CXX_EXT g++ $CCOPT \"$@\"" >&2
 fi
 
 $CXX_EXT g++ $CCOPT "$@"

Modified: lunar/branches/stable/var/lib/lunar/compilers/cc
===================================================================
--- lunar/branches/stable/var/lib/lunar/compilers/cc	2005-05-26 11:28:25 UTC (rev 15069)
+++ lunar/branches/stable/var/lib/lunar/compilers/cc	2005-05-26 11:35:46 UTC (rev 15070)
@@ -3,7 +3,7 @@
 export PATH=${PATH/\/var\/lib\/lunar\/compilers:/}
 
 if [ -n "$LUNAR_DEBUG" ] ; then
-  echo "++ $CC_EXT gcc $COPT \"$@\"" > /dev/stderr
+  echo "++ $CC_EXT gcc $COPT \"$@\"" >&2
 fi
   
 $CC_EXT gcc $COPT "$@"

Modified: lunar/branches/stable/var/lib/lunar/compilers/g++
===================================================================
--- lunar/branches/stable/var/lib/lunar/compilers/g++	2005-05-26 11:28:25 UTC (rev 15069)
+++ lunar/branches/stable/var/lib/lunar/compilers/g++	2005-05-26 11:35:46 UTC (rev 15070)
@@ -3,7 +3,7 @@
 export PATH=${PATH/\/var\/lib\/lunar\/compilers:/}
 
 if [ -n "$LUNAR_DEBUG" ] ; then
-  echo "++ $CXX_EXT g++ $CCOPT \"$@\"" > /dev/stderr
+  echo "++ $CXX_EXT g++ $CCOPT \"$@\"" >&2
 fi
   
 $CXX_EXT g++ $CCOPT "$@"

Modified: lunar/branches/stable/var/lib/lunar/compilers/gcc
===================================================================
--- lunar/branches/stable/var/lib/lunar/compilers/gcc	2005-05-26 11:28:25 UTC (rev 15069)
+++ lunar/branches/stable/var/lib/lunar/compilers/gcc	2005-05-26 11:35:46 UTC (rev 15070)
@@ -3,7 +3,7 @@
 export PATH=${PATH/\/var\/lib\/lunar\/compilers:/}
 
 if [ -n "$LUNAR_DEBUG" ] ; then
-  echo "++ $CC_EXT gcc $COPT \"$@\"" > /dev/stderr
+  echo "++ $CC_EXT gcc $COPT \"$@\"" >&2
 fi
   
 $CC_EXT gcc $COPT "$@"

Added: lunar/branches/stable/var/lib/lunar/compilers/make
===================================================================
--- lunar/branches/stable/var/lib/lunar/compilers/make	2005-05-26 11:28:25 UTC (rev 15069)
+++ lunar/branches/stable/var/lib/lunar/compilers/make	2005-05-26 11:35:46 UTC (rev 15070)
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+export PATH=${PATH/\/var\/lib\/lunar\/compilers:/}
+
+if [ -n "$LUNAR_DEBUG" ] ; then
+  echo "++ $MAKE_EXT make ${MAKES:+-j$MAKES} \"$@\"" >&2
+fi
+
+$MAKE_EXT make ${MAKES:+-j$MAKES} "$@"
+


Property changes on: lunar/branches/stable/var/lib/lunar/compilers/make
___________________________________________________________________
Name: svn:executable
   + *

Modified: lunar/branches/stable/var/lib/lunar/functions/build.lunar
===================================================================
--- lunar/branches/stable/var/lib/lunar/functions/build.lunar	2005-05-26 11:28:25 UTC (rev 15069)
+++ lunar/branches/stable/var/lib/lunar/functions/build.lunar	2005-05-26 11:35:46 UTC (rev 15070)
@@ -185,19 +185,7 @@
 default_make() {
   debug_msg "default_make ($@)"
   verbose_msg "running \"default_make\""
-  # This code is simular to the optimize_make function from optimize.lunar
-  # This is needed because bash does not expand aliases in functions
-  if module_installed openmosix-tools ; then
-    if [[ "$MAKES" > 1 ]] ; then
-      mosrun -h make -j$MAKES
-    else
-      mosrun -h make
-    fi
-  elif [[ $MAKES > 1 ]] ; then
-    make -j$MAKES
-  else
-    make
-  fi                                 &&
+  make                               &&
   prepare_install                    &&
   make install
 } > $C_FIFO 2>&1

Modified: lunar/branches/stable/var/lib/lunar/functions/optimize.lunar
===================================================================
--- lunar/branches/stable/var/lib/lunar/functions/optimize.lunar	2005-05-26 11:28:25 UTC (rev 15069)
+++ lunar/branches/stable/var/lib/lunar/functions/optimize.lunar	2005-05-26 11:35:46 UTC (rev 15070)
@@ -60,14 +60,8 @@
    unset MAKES
   fi
   if module_installed linux-openmosix; then
-    alias make="mosrun -h make"
-    if [[ "$MAKES" > 1 ]] ; then
-      alias make="mosrun -h make -j$MAKES"
-    fi
-  elif [[ $MAKES > 1 ]] ; then
-    alias make="make -j$MAKES"
+    $MAKE_EXT="$MAKE_EXT mosrun -h"
   fi
-  verbose_msg "make=\"$(which make)\", MAKES=\"$MAKES\""
 }
  
 
@@ -757,11 +751,13 @@
 
   export CC_EXT
   export CXX_EXT
-  export CFLAGS
+  export MAKE_EXT
   export COPT
   export CCOPT
+  export CFLAGS
   export CXXFLAGS
   export LDFLAGS
+  export MAKES
 
   use_wrappers
   verbose_msg "BUILD=\"$BUILD\""

Modified: lunar/branches/stable/var/lib/lunar/plugins/postbuild-generic.plugin
===================================================================
--- lunar/branches/stable/var/lib/lunar/plugins/postbuild-generic.plugin	2005-05-26 11:28:25 UTC (rev 15069)
+++ lunar/branches/stable/var/lib/lunar/plugins/postbuild-generic.plugin	2005-05-26 11:35:46 UTC (rev 15070)
@@ -46,6 +46,10 @@
         # copy it over to the doc directory creating directories as needed
         verbose_msg "Installing extra documentation to: ${DOC_DIR}/${FILE}"
         install -D -m 644 ${FILE} ${DOC_DIR}/${FILE}
+      elif [ -d ${FILE} ] ; then
+        # copy the directory to the docdir
+	verbose_msg "Installing extra documentation to: ${DOC_DIR}/${FILE}"
+	cp -a ${FILE} ${DOC_DIR}/
       fi
     done
     devoke_installwatch

Modified: lunar/branches/stable/var/lib/lunar/unset.sh
===================================================================
--- lunar/branches/stable/var/lib/lunar/unset.sh	2005-05-26 11:28:25 UTC (rev 15069)
+++ lunar/branches/stable/var/lib/lunar/unset.sh	2005-05-26 11:35:46 UTC (rev 15070)
@@ -44,7 +44,6 @@
 unset KERNEL_URL
 unset LDD_CHECK
 unset LDF
-unset LIN
 unset LINES
 unset LOCAL_CONFIG
 unset LOCAL_EXCLUDED



More information about the Lunar-commits mailing list