[Lunar-commits] CVS: theedge/var/lib/lunar/functions main.lunar, 1.9, 1.10 modules.lunar, 1.34, 1.35 optimize.lunar, 1.46, 1.47 prune.lunar, 1.8, 1.9

[Auke Kok]

Update of /var/cvs/lunar/theedge/var/lib/lunar/functions
In directory dbguin.lunar-linux.org:/tmp/cvs-serv21743/var/lib/lunar/functions

Modified Files:
	main.lunar modules.lunar optimize.lunar prune.lunar 
Log Message:
Definitive fixes for missing PLATFORM and/or BUILDs in theedge. Closing #392 with this one.


Index: main.lunar
===================================================================
RCS file: /var/cvs/lunar/theedge/var/lib/lunar/functions/main.lunar,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- main.lunar	8 Mar 2004 22:57:03 -0000	1.9
+++ main.lunar	15 Mar 2004 22:54:34 -0000	1.10
@@ -209,6 +209,9 @@
   if ! current_locked && ! solo_locked ; then
     echo $$ > $linING  &&
     start_logging  &&
+    if [ -z "$BUILD" ] ; then
+      optimize
+    fi &&
 
     if ! run_pre_build ; then
       LIN_ERROR="PRE_BUILD"
@@ -216,9 +219,6 @@
 
       # important stuff here!!!
       invoke_installwatch &&
-      if [ -z "$CFLAGS" ] ; then
-        optimize
-      fi  &&
       
       if ! run_build ; then
         LIN_ERROR="BUILD"

Index: modules.lunar
===================================================================
RCS file: /var/cvs/lunar/theedge/var/lib/lunar/functions/modules.lunar,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- modules.lunar	9 Mar 2004 08:56:23 -0000	1.34
+++ modules.lunar	15 Mar 2004 22:54:34 -0000	1.35
@@ -558,7 +558,9 @@
   # gcc 3x please email your findings to
   # maintainer at lunar-linux.org.
 
-  eval $(grep PLATFORM= /etc/lunar/local/optimizations)
+  if [ -z "$PLATFORM" ] ; then
+    eval $(grep PLATFORM= /etc/lunar/local/optimizations)
+  fi
 
   # Usage check_checklist $MODULES
   PLATFORM=${PLATFORM:-x86}

Index: optimize.lunar
===================================================================
RCS file: /var/cvs/lunar/theedge/var/lib/lunar/functions/optimize.lunar,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- optimize.lunar	23 Feb 2004 21:15:53 -0000	1.46
+++ optimize.lunar	15 Mar 2004 22:54:34 -0000	1.47
@@ -892,7 +892,7 @@
   FPM=$RESULT
 
   help ccc_warn_help          &&
-  ccc_warn            &&
+  ccc_warn                    &&
   menu checklist              &&
   CCC_WARN=$RESULT  
 
@@ -924,7 +924,6 @@
 		"Enter the number to set the stack to, leave empty for default."  \
 		0 55 $STACK`
 
-  optimize
 }
 
 

Index: prune.lunar
===================================================================
RCS file: /var/cvs/lunar/theedge/var/lib/lunar/functions/prune.lunar,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- prune.lunar	3 Feb 2004 18:41:48 -0000	1.8
+++ prune.lunar	15 Mar 2004 22:54:34 -0000	1.9
@@ -14,14 +14,15 @@
 # purpose  : prune all old logs, source copy's, install caches
 prune() {
   debug_msg "prune ($@)"
+
+  if [ -z "$BUILD" ] ; then
+    eval $(grep BUILD= /etc/lunar/local/optimizations)
+  fi
   
   TMP_SPOOL_KEEP=$(temp_create "spool-keep")
   TMP_CACHE_KEEP=$(temp_create "cache-keep")
 
   message "${MESSAGE_COLOR}Generating keep lists...${DEFAULT_COLOR}"
-  if [ -z "$BUILD" ] ; then
-    optimize
-  fi
   for MODULE in $(list_moonbase) ; do
     # spool:
     for SOURCE in $(sources $MODULE) ; do