SF.net SVN: bzflag:[21771] branches/experimental/v2_99continuing/bzflag

[<tr...@us...>]

Revision: 21771
          http://bzflag.svn.sourceforge.net/bzflag/?rev=21771&view=rev
Author:   trepan
Date:     2011-06-01 13:53:27 +0000 (Wed, 01 Jun 2011)

Log Message:
-----------
* build.sh just calls config.sh, and appends a "$MAKE" command
* config.sh compiles premake using the build/gmake.unix file,
  then uses the new premake exec to embed the lua scripts and
  to generate a Makefile. then make is called again to rebuild
  the exec.

Modified Paths:
--------------
    branches/experimental/v2_99continuing/bzflag/build.sh
    branches/experimental/v2_99continuing/bzflag/config.sh

Modified: branches/experimental/v2_99continuing/bzflag/build.sh
===================================================================
--- branches/experimental/v2_99continuing/bzflag/build.sh	2011-06-01 06:56:39 UTC (rev 21770)
+++ branches/experimental/v2_99continuing/bzflag/build.sh	2011-06-01 13:53:27 UTC (rev 21771)
@@ -2,38 +2,6 @@
 
 cd `dirname "$0"`
 
-################################################################################
+. ./config.sh  # config.sh defines $MAKE
 
-set -e  # Exit immediately if a command exits with a non-zero status.
-
-################################################################################
-
-PREMAKE_DIR="other_src/premake"
-
-PREMAKE_EXEC="$PREMAKE_DIR/bin/release/premake4"
-
-################################################################################
-
-MAKE=gmake
-
-if ! which $MAKE; then
-  MAKE=make;
-fi
-
-if ! which $MAKE; then
-  echo "Neither 'gmake' nor 'make' are available, bailing out."
-  exit 1
-  MAKE=make;
-fi
-
-################################################################################
-
-(cd "$PREMAKE_DIR/build/gmake.unix/" && $MAKE)
-
-################################################################################
-
-$PREMAKE_EXEC "$@"
-
-$MAKE
-
-################################################################################
+"$MAKE"

Modified: branches/experimental/v2_99continuing/bzflag/config.sh
===================================================================
--- branches/experimental/v2_99continuing/bzflag/config.sh	2011-06-01 06:56:39 UTC (rev 21770)
+++ branches/experimental/v2_99continuing/bzflag/config.sh	2011-06-01 13:53:27 UTC (rev 21771)
@@ -10,17 +10,19 @@
 
 PREMAKE_DIR="other_src/premake"
 
-PREMAKE_EXEC="$PREMAKE_DIR/bin/release/premake4"
+PREMAKE_EXEC="bin/release/premake4"
 
+PREMAKE_FULLEXEC="$PREMAKE_DIR/$PREMAKE_EXEC"
+
 ################################################################################
 
 MAKE=gmake
 
-if ! which $MAKE; then
+if ! which "$MAKE"; then
   MAKE=make;
 fi
 
-if ! which $MAKE; then
+if ! which "$MAKE"; then
   echo "Neither 'gmake' nor 'make' are available, bailing out."
   exit 1
   MAKE=make;
@@ -28,10 +30,17 @@
 
 ################################################################################
 
-(cd "$PREMAKE_DIR/build/gmake.unix/" && $MAKE)
+(cd "$PREMAKE_DIR/build/gmake.unix/" && "$MAKE")
 
+(cd "$PREMAKE_DIR"                      && \
+  "$PREMAKE_EXEC" embed | grep ^Running && \
+  "$PREMAKE_EXEC" gmake | grep ^Running && \
+  "$MAKE")
+
+#  "$PREMAKE_EXEC" embed > /dev/null && \
+
 ################################################################################
 
-$PREMAKE_EXEC "$@"
+"$PREMAKE_FULLEXEC" "$@"
 
 ################################################################################


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.