[Lunar-commits] r16642 - lunar/trunk/var/lib/lunar/functions

[Chad Kittel]

Author: v3rt1g0
Date: 2005-09-25 02:29:51 +0000 (Sun, 25 Sep 2005)
New Revision: 16642

Modified:
   lunar/trunk/var/lib/lunar/functions/build.lunar
Log:
This is the commit to go along with my Dev-ML email (subject: Addition to build.lunar
 common functions) sent on 18Sep05.  This adds a default_game_build and 
default_game_config as options to be used in BUILD files.  This commit also fixes a 
few minor typos.

!!!!!!
Please DO NOT use these two functions in any modules that are in the moonbase.  This 
code is being commited here so that devs can easily test the new code.  Once it has 
been tested/approved the change can then be pushed the lunar and both theedge and 
lunar can get a version bump before we can start making use of it, else stuff will 
break for the user.
!!!!!!!


Modified: lunar/trunk/var/lib/lunar/functions/build.lunar
===================================================================
--- lunar/trunk/var/lib/lunar/functions/build.lunar	2005-09-25 02:26:01 UTC (rev 16641)
+++ lunar/trunk/var/lib/lunar/functions/build.lunar	2005-09-25 02:29:51 UTC (rev 16642)
@@ -135,7 +135,7 @@
     cd $SOURCE_DIRECTORY && 
     make clean
     if [ $? -ne 0 ]; then
-      message "${PROBLEM_COLOR}ERROR: ${DEFAULT_COLOR}The source for ${MODULE_COLOR}$MODULE${DEFUALT_COLOR}: could not be made clean for build."
+      message "${PROBLEM_COLOR}ERROR: ${DEFAULT_COLOR}The source for ${MODULE_COLOR}$MODULE${DEFAULT_COLOR}: could not be made clean for build."
       # Thoughts on forcing a new source directory?
       # More of how should we handle this, currently we will bail out
       # A vast majority of the moonbase will fail,  (w/o: make clean)
@@ -165,6 +165,25 @@
 } > $C_FIFO 2>&1
 
 
+default_game_config() {
+  debug_msg "default_game_config ($@)"
+  verbose_msg "running \"default_game_config\""
+  verbose_msg "CFLAGS=\"$CFLAGS\""            &&
+  verbose_msg "OPTS=\"$OPTS\""                &&
+  verbose_msg "./configure --build=$BUILD --prefix=$MODULE_PREFIX --bindir=$MODULE_PREFIX/games --datadir=$MODULE_PREFIX/share/games --sysconfdir=/etc --localstatedir=/var --infodir=$MODULE_PREFIX/share/info --mandir=$MODULE_PREFIX/share/man $OPTS"
+
+  ./configure  --build=$BUILD                       \
+               --prefix=$MODULE_PREFIX              \
+               --bindir=$MODULE_PREFIX/games        \
+               --datadir=$MODULE_PREFIX/share/games \
+               --sysconfdir=/etc                    \
+               --localstatedir=/var                 \
+               --infodir=$MODULE_PREFIX/share/info  \
+               --mandir=$MODULE_PREFIX/share/man    \
+               $OPTS
+} > $C_FIFO 2>&1
+
+
 default_cvs_config() {
   debug_msg "default_cvs_config ($@)"
   verbose_msg "running \"default_cvs_config\""
@@ -190,6 +209,12 @@
   make install
 } > $C_FIFO 2>&1
 
+default_game_build() {
+  debug_msg "default_game_build ($@)"
+  verbose_msg "running \"default_game_build\""
+  default_game_config  &&
+  default_make
+} > $C_FIFO 2>&1
 
 default_build() {
   debug_msg "default_build ($@)"
@@ -293,7 +318,7 @@
   prepare_module_config
   grep -q "^"$MODULE"\$" $TEMP_PREPAREDDEPS 2>/dev/null && return 0
 
-  # add custom passed OPTS before retreiving them
+  # add custom passed OPTS before retrieving them
   if [ -n "$PASS_OPTS" ] ; then
     OPTS="$(get_module_config OPTS) $PASS_OPTS"
     set_module_config OPTS "$OPTS"