[mathicgb] 197/393: Outer Makefile now uses only a single download of gtest for all of mathic, memtailor and mathicgb.

[Doug Torrance]

This is an automated email from the git hooks/post-receive script.

dtorrance-guest pushed a commit to branch upstream
in repository mathicgb.

commit 54d30e7fdd947a511115165904a932aee75a954b
Author: Bjarke Hammersholt Roune <bjarkehr.code at gmail.com>
Date:   Thu Mar 21 17:59:48 2013 +0100

    Outer Makefile now uses only a single download of gtest for all of mathic, memtailor and mathicgb.
---
 build/setup/make-Makefile.sh | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/build/setup/make-Makefile.sh b/build/setup/make-Makefile.sh
index de2f2f6..b475471 100755
--- a/build/setup/make-Makefile.sh
+++ b/build/setup/make-Makefile.sh
@@ -175,6 +175,7 @@ function makeTarget {
   echo $'\t'"  export CXXFLAGS=\"$targetCXXFLAGS\"; \\";
   echo $'\t'"  export CPPFLAGS=\"$targetCPPFLAGS\"; \\";
   echo $'\t'"  export LDFLAGS=\"$targetLDFLAGS\"; \\";
+  echo $'\t'"  export GTEST_PATH=\"../..\"; \\";
   echo $'\t'"  ../configure $projectConfigureArgs; \\"
   echo $'\t'"  make $targetMakeArgs install; \\"
   echo $'\t'");"
@@ -184,6 +185,21 @@ function makeTarget {
   fi
 }
 
+function makeGTest {
+  version="1.6.0";
+  zipFile="gtest-$version.zip";
+  url="http://googletest.googlecode.com/files/$zipFile";
+  extractDir="gtest-$version/";
+
+  echo "gtest:";
+  echo $'\t'"rm -rf $zipFile";
+  echo $'\t'"wget $url;";
+  echo $'\t'"unzip $zipFile;";
+  echo $'\t'"rm $zipFile;";
+  echo $'\t'"rm -rf gtest;";
+  echo $'\t'"mv $extractDir/ gtest;";
+}
+
 function makeProject {
   projectIndex="$1";
   name="${projectsName[projectIndex]}";
@@ -191,7 +207,7 @@ function makeProject {
 
   dep="$3";
   echo "all: $name";
-  echo "${name}BasicSetup:"
+  echo "${name}BasicSetup: gtest"
   echo $'\t'"if [ ! -e \"$name/\" ]; then git clone $gitUrl; fi;"
   echo $'\t'"if [ ! -e \"$name/configure\" ]; then (cd $name/; ./autogen.sh;); fi;"
 
@@ -201,7 +217,9 @@ function makeProject {
 }
 
 function makeMakefile {
+  echo "all:";
   makeHelpComment;
+  makeGTest;
 
   # -j8: Causes 8 parallel tasks including within called makefiles. User
   # setting overwrites this if the user has specified -jX on the command line.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/mathicgb.git