[Lunar-commits] CVS: theedge/var/lib/lunar/functions build.lunar, 1.22, 1.23 main.lunar, 1.19, 1.20

Auke Kok sofar at lunar-linux.org
Thu Nov 25 15:05:56 UTC 2004


Update of /var/cvs/lunar/theedge/var/lib/lunar/functions
In directory espresso.foo-projects.org:/home/sofar/active/theedge/var/lib/lunar/functions

Modified Files:
	build.lunar main.lunar 
Log Message:
Semantical change: prepare_install is now MANDATORY. it is also the step where invoke_installwatch is called. I added a WARNING that checks after BUILD if it was set correctly, and warns if it isn't. In the future this will become an ERROR. 


Index: build.lunar
===================================================================
RCS file: /var/cvs/lunar/theedge/var/lib/lunar/functions/build.lunar,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- build.lunar	12 Oct 2004 15:02:12 -0000	1.22
+++ build.lunar	25 Nov 2004 15:05:53 -0000	1.23
@@ -121,6 +121,8 @@
     lrm  --keepconfig  --nosustain  $MODULE
     true
   fi
+  # turn on tracking now
+  invoke_installwatch
 }
 
 
@@ -249,6 +251,11 @@
 
 default_post_build() {
   debug_msg "default_post_build ($@)"
+
+  if [ -z "$LD_PRELOAD" ]; then
+    message "${PROBLEM_COLOR}WARNING: ${DEFAULT_COLOR}${FILE_COLOR}BUILD${DEFAULT_COLOR}${PROBLEM_COLOR} never calls prepare_install!${DEFAULT_COLOR}"
+  fi
+  
   {
     gather_docs
 

Index: main.lunar
===================================================================
RCS file: /var/cvs/lunar/theedge/var/lib/lunar/functions/main.lunar,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- main.lunar	25 Oct 2004 19:18:03 -0000	1.19
+++ main.lunar	25 Nov 2004 15:05:53 -0000	1.20
@@ -285,10 +285,6 @@
     if ! run_pre_build ; then
       LIN_ERROR="PRE_BUILD"
     else
-
-      # important stuff here!!!
-      invoke_installwatch &&
-      
       if ! run_build ; then
         LIN_ERROR="BUILD"
       else
@@ -298,7 +294,6 @@
       fi
     fi
 
-    devoke_installwatch
     stop_logging
     
     if [ -n "$LIN_ERROR" ] ; then



More information about the Lunar-commits mailing list