summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-05-31 22:59:32 +0300
committerAndrei Karas <akaras@inbox.ru>2016-05-31 22:59:32 +0300
commit7ace68ca489ea19ae5025ad9f56465e3df930490 (patch)
tree3502380e78fed1df39eb13c11f0fe718fe447092
parent3a9727d43325a577a29d13fe259df1de68234e6b (diff)
downloadmv-7ace68ca489ea19ae5025ad9f56465e3df930490.tar.gz
mv-7ace68ca489ea19ae5025ad9f56465e3df930490.tar.bz2
mv-7ace68ca489ea19ae5025ad9f56465e3df930490.tar.xz
mv-7ace68ca489ea19ae5025ad9f56465e3df930490.zip
Change some build script to use separate directory for temp files.
-rw-r--r--.gitignore1
-rwxr-xr-xbuild/bmake8
-rwxr-xr-xbuild/bmakedebug11
-rwxr-xr-xbuild/bmakespeed8
-rwxr-xr-xbuild/bmaketest9
-rwxr-xr-xbuild/mclean1
-rwxr-xr-xbuild/minst2
7 files changed, 25 insertions, 15 deletions
diff --git a/.gitignore b/.gitignore
index 28d353ad0..8b59325b5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -115,6 +115,7 @@ build/makecheck6
build/clmake
build/bmakesnapshot
build/checkplugin.so
+build/tmp
# debian
debian/*
diff --git a/build/bmake b/build/bmake
index 687a4a422..231525118 100755
--- a/build/bmake
+++ b/build/bmake
@@ -1,5 +1,6 @@
#!/bin/bash
+mkdir tmp
cd ..
dir=`pwd`
@@ -17,7 +18,8 @@ export CXXFLAGS="-pedantic -ggdb3 -O3 -pipe -ffast-math \
source ./build/gcc6flags.sh
autoreconf -i
-./configure --prefix=$dir/run \
+cd build/tmp
+../../configure --prefix=$dir/run \
--datadir=$dir/run/share/games \
--bindir=$dir/run/bin \
--mandir=$dir/run/share/man \
@@ -27,7 +29,7 @@ autoreconf -i
--enable-werror
cd po
-make -j8 update-gmo 2>../build/make1.log
+make -j8 update-gmo 2>../../make1.log
cd ..
-make -j8 2>build/make2.log
+make -j8 2>../make2.log
diff --git a/build/bmakedebug b/build/bmakedebug
index c4a2b5e31..c7c28b079 100755
--- a/build/bmakedebug
+++ b/build/bmakedebug
@@ -1,7 +1,8 @@
#!/bin/bash
-cd ..
+mkdir tmp
+cd ..
dir=`pwd`
export CC=gcc
@@ -24,7 +25,9 @@ export CXXFLAGS="-pedantic -ggdb3 -O3 -pipe -ffast-math \
source ./build/gcc6flags.sh
autoreconf -i
-./configure --prefix=$dir/run \
+cd build/tmp
+
+../../configure --prefix=$dir/run \
--datadir=$dir/run/share/games \
--bindir=$dir/run/bin \
--mandir=$dir/run/share/man \
@@ -35,7 +38,7 @@ autoreconf -i
--enable-werror
cd po
-make -j8 update-gmo 2>../build/make1.log
+make -j8 update-gmo 2>../../make1.log
cd ..
-make -j8 2>build/make2.log
+make -j8 2>../make2.log
diff --git a/build/bmakespeed b/build/bmakespeed
index 029a1f481..ad0fec601 100755
--- a/build/bmakespeed
+++ b/build/bmakespeed
@@ -1,5 +1,6 @@
#!/bin/bash
+mkdir tmp
cd ..
dir=`pwd`
@@ -20,13 +21,14 @@ export CXXFLAGS="-pedantic -ggdb3 -O5 -pipe -ffast-math \
source ./build/gcc6flags.sh
autoreconf -i
-./configure --prefix=$dir/run \
+cd build/tmp
+../../configure --prefix=$dir/run \
--datadir=$dir/run/share/games \
--bindir=$dir/run/bin \
--mandir=$dir/run/share/man
cd po
-make -j8 update-gmo 2>../build/make1.log
+make -j8 update-gmo 2>../../make1.log
cd ..
-make -j8 2>build/make2.log
+make -j8 2>../make2.log
diff --git a/build/bmaketest b/build/bmaketest
index 6f8f20fac..bd2b65557 100755
--- a/build/bmaketest
+++ b/build/bmaketest
@@ -1,5 +1,6 @@
#!/bin/bash
+mkdir tmp
cd ..
dir=`pwd`
@@ -17,14 +18,14 @@ export CXXFLAGS="-pedantic -ggdb3 -O3 -pipe -ffast-math \
source ./build/gcc6flags.sh
autoreconf -i
-./configure --prefix=$dir/run \
+cd build/tmp
+../../configure --prefix=$dir/run \
--datadir=$dir/run/share/games \
--bindir=$dir/run/bin \
--mandir=$dir/run/share/man \
--enable-unittests
cd po
-make -j8 update-gmo 2>../build/make1.log
+make -j8 update-gmo 2>../..//make1.log
cd ..
-make -j8 check 2>build/make2.log
-
+make -j8 check 2>../make2.log
diff --git a/build/mclean b/build/mclean
index fa5ff4ed5..332cff043 100755
--- a/build/mclean
+++ b/build/mclean
@@ -1,2 +1,3 @@
+rm -rf tmp
cd ..
make clean
diff --git a/build/minst b/build/minst
index 2b3f847ce..2d809e288 100755
--- a/build/minst
+++ b/build/minst
@@ -1,2 +1,2 @@
-cd ..
+cd tmp
make install