[Lunar-commits] r15901 - in lunar/branches/stable: sbin var/lib/lunar/compilers var/lib/lunar/functions

[Auke Kok]

Author: sofar
Date: 2005-07-27 11:17:51 +0000 (Wed, 27 Jul 2005)
New Revision: 15901

Modified:
   lunar/branches/stable/sbin/lrm
   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/plugins.lunar
Log:
Backmerge: fix wrappers and add the last 2 new plugin hooks.


Modified: lunar/branches/stable/sbin/lrm
===================================================================
--- lunar/branches/stable/sbin/lrm	2005-07-27 11:04:06 UTC (rev 15900)
+++ lunar/branches/stable/sbin/lrm	2005-07-27 11:17:51 UTC (rev 15901)
@@ -145,6 +145,7 @@
 
   # time-out 1: PRE_REMOVE
   if [ "$UPGRADE" != "on" ]; then
+    plugin_call BUILD_PRE_REMOVE $MODULE
     run_module_file $MODULE PRE_REMOVE
   fi
 
@@ -183,6 +184,7 @@
 
   # time-out 2: POST_REMOVE
   if [ "$UPGRADE" != "on" ] ; then
+    plugin_call BUILD_POST_REMOVE $MODULE
     run_module_file $MODULE POST_REMOVE
   fi
   if [ "$KEEPCONFIG" == "on" -o "$UPGRADE" == "on" ] ; then

Modified: lunar/branches/stable/var/lib/lunar/compilers/c++
===================================================================
--- lunar/branches/stable/var/lib/lunar/compilers/c++	2005-07-27 11:04:06 UTC (rev 15900)
+++ lunar/branches/stable/var/lib/lunar/compilers/c++	2005-07-27 11:17:51 UTC (rev 15901)
@@ -1,10 +1,8 @@
 #!/bin/bash
 
-export PATH=${PATH/\/var\/lib\/lunar\/compilers:/}
-
 if [ -n "$LUNAR_DEBUG" ] ; then
   echo "++ $CXX_EXT g++ $CCOPT \"$@\"" >&2
 fi
 
-$CXX_EXT g++ $CCOPT "$@"
+$CXX_EXT /usr/bin/g++ $CCOPT "$@"
 

Modified: lunar/branches/stable/var/lib/lunar/compilers/cc
===================================================================
--- lunar/branches/stable/var/lib/lunar/compilers/cc	2005-07-27 11:04:06 UTC (rev 15900)
+++ lunar/branches/stable/var/lib/lunar/compilers/cc	2005-07-27 11:17:51 UTC (rev 15901)
@@ -1,10 +1,8 @@
 #!/bin/bash
 
-export PATH=${PATH/\/var\/lib\/lunar\/compilers:/}
-
 if [ -n "$LUNAR_DEBUG" ] ; then
   echo "++ $CC_EXT gcc $COPT \"$@\"" >&2
 fi
   
-$CC_EXT gcc $COPT "$@"
+$CC_EXT /usr/bin/gcc $COPT "$@"
 

Modified: lunar/branches/stable/var/lib/lunar/compilers/g++
===================================================================
--- lunar/branches/stable/var/lib/lunar/compilers/g++	2005-07-27 11:04:06 UTC (rev 15900)
+++ lunar/branches/stable/var/lib/lunar/compilers/g++	2005-07-27 11:17:51 UTC (rev 15901)
@@ -1,10 +1,8 @@
 #!/bin/bash
 
-export PATH=${PATH/\/var\/lib\/lunar\/compilers:/}
-
 if [ -n "$LUNAR_DEBUG" ] ; then
   echo "++ $CXX_EXT g++ $CCOPT \"$@\"" >&2
 fi
   
-$CXX_EXT g++ $CCOPT "$@"
+$CXX_EXT /usr/bin/g++ $CCOPT "$@"
 

Modified: lunar/branches/stable/var/lib/lunar/compilers/gcc
===================================================================
--- lunar/branches/stable/var/lib/lunar/compilers/gcc	2005-07-27 11:04:06 UTC (rev 15900)
+++ lunar/branches/stable/var/lib/lunar/compilers/gcc	2005-07-27 11:17:51 UTC (rev 15901)
@@ -1,10 +1,8 @@
 #!/bin/bash
 
-export PATH=${PATH/\/var\/lib\/lunar\/compilers:/}
-
 if [ -n "$LUNAR_DEBUG" ] ; then
   echo "++ $CC_EXT gcc $COPT \"$@\"" >&2
 fi
   
-$CC_EXT gcc $COPT "$@"
+$CC_EXT /usr/bin/gcc $COPT "$@"
 

Modified: lunar/branches/stable/var/lib/lunar/functions/plugins.lunar
===================================================================
--- lunar/branches/stable/var/lib/lunar/functions/plugins.lunar	2005-07-27 11:04:06 UTC (rev 15900)
+++ lunar/branches/stable/var/lib/lunar/functions/plugins.lunar	2005-07-27 11:17:51 UTC (rev 15901)
@@ -35,6 +35,8 @@
 	# 10 - BUILD_INSTALL             ,,     ,,     ,,    INSTALL
 	# 11 - BUILD_POST_BUILD          ,,     ,,     ,,    POST_BUILD
 	# 12 - BUILD_POST_INSTALL        ,,     ,,     ,,    POST_INSTALL
+	# 13 - BUILD_PRE_REMOVE          ,,     ,,     ,,    PRE_REMOVE
+	# 14 - BUILD_POST_REMOVE         ,,     ,,     ,,    POST_REMOVE
 	LUNAR_PLUGINS=(${LUNAR_PLUGINS[@]} "$1:$2")
 	((LUNAR_PLUGIN_COUNT++))
 	debug_msg "Registered plugin #$LUNAR_PLUGIN_COUNT, $1 -> $2()"