Changeset: a768a21f2eba for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a768a21f2eba
Modified Files:
MonetDB4/RunMtest.in
MonetDB5/RunMtest.in
bootstrap
clients/RunMtest.in
configure.ag
geom/RunMtest.in
java/RunMtest.in
pathfinder/RunMtest.in
sql/RunMtest.in
template/RunMtest.in
Branch: default
Log Message:
If a .in file is executable, make the file without .in also executable.
This removes the need to chmod +x ${buildbase}/testing/src/Mlog in RunMtest.
diffs (130 lines):
diff -r 9d1696db2095 -r a768a21f2eba MonetDB4/RunMtest.in
--- a/MonetDB4/RunMtest.in Tue Jan 11 02:33:39 2011 +0100
+++ b/MonetDB4/RunMtest.in Tue Jan 11 10:57:50 2011 +0100
@@ -38,8 +38,6 @@
PATH="${binpath}:$PATH"
export PATH
-chmod +x ${buildbase}/testing/src/Mlog
-
PYTHONPATH="${buildbase}/testing/src:${srcdir}/../testing/src:${PYTHONPATH}"
export PYTHONPATH
diff -r 9d1696db2095 -r a768a21f2eba MonetDB5/RunMtest.in
--- a/MonetDB5/RunMtest.in Tue Jan 11 02:33:39 2011 +0100
+++ b/MonetDB5/RunMtest.in Tue Jan 11 10:57:50 2011 +0100
@@ -40,8 +40,6 @@
PATH="${binpath}:$PATH"
export PATH
-chmod +x ${buildbase}/testing/src/Mlog
-
PYTHONPATH="${buildbase}/testing/src:${srcdir}/../testing/src:${PYTHONPATH}"
export PYTHONPATH
diff -r 9d1696db2095 -r a768a21f2eba bootstrap
--- a/bootstrap Tue Jan 11 02:33:39 2011 +0100
+++ b/bootstrap Tue Jan 11 10:57:50 2011 +0100
@@ -4,7 +4,16 @@
export PYTHONPATH
python buildtools/autogen/autogen.py &&
-sed '/^AC_CONFIG_FILES/r acout.in' configure.ag > configure.ac &&
+(
+# replace the line starting with AC_CONFIG_FILES in configure.ag with
+# the command to substitute the configure results into the .in files,
+# making sure executable files remain executable.
+sed -n '/^AC_CONFIG_FILES/s/.*/AC_CONFIG_FILES([/;1,/^AC_CONFIG_FILES/p'
configure.ag
+while read f; do [ -x $f.in ] || echo $f; done < acout.in
+echo '])'
+while read f; do [ -x $f.in ] && echo "AC_CONFIG_FILES([$f], [chmod +x $f])";
done < acout.in
+sed '1,/^AC_CONFIG_FILES/d' configure.ag
+) > configure.ac &&
libtoolize -c -f &&
aclocal -I . -I buildtools/conf &&
autoheader &&
diff -r 9d1696db2095 -r a768a21f2eba clients/RunMtest.in
--- a/clients/RunMtest.in Tue Jan 11 02:33:39 2011 +0100
+++ b/clients/RunMtest.in Tue Jan 11 10:57:50 2011 +0100
@@ -36,8 +36,6 @@
PATH="${builddir}/src/mapiclient:${builddir}/src/python:${buildbase}/testing/src:$PATH"
export PATH
-chmod +x ${buildbase}/testing/src/Mlog
-
PYTHONPATH="${srcdir}/src/python:${buildbase}/testing/src:${srcdir}/../testing/src:${PYTHONPATH}"
export PYTHONPATH
diff -r 9d1696db2095 -r a768a21f2eba configure.ag
--- a/configure.ag Tue Jan 11 02:33:39 2011 +0100
+++ b/configure.ag Tue Jan 11 10:57:50 2011 +0100
@@ -1548,8 +1548,7 @@
dnl bootstrap adds a (long) list of file names inside the
dnl AC_CONFIG_FILES command
-AC_CONFIG_FILES(
-)
+AC_CONFIG_FILES
AC_OUTPUT
echo
diff -r 9d1696db2095 -r a768a21f2eba geom/RunMtest.in
--- a/geom/RunMtest.in Tue Jan 11 02:33:39 2011 +0100
+++ b/geom/RunMtest.in Tue Jan 11 10:57:50 2011 +0100
@@ -80,8 +80,6 @@
PATH="${buildbase}/MonetDB$V/src/tools:${buildbase}/testing/src:$PATH"
export PATH
-chmod +x ${buildbase}/testing/src/Mlog
-
PYTHONPATH="${buildbase}/testing/src:${srcdir}/../testing/src:${PYTHONPATH}"
export PYTHONPATH
diff -r 9d1696db2095 -r a768a21f2eba java/RunMtest.in
--- a/java/RunMtest.in Tue Jan 11 02:33:39 2011 +0100
+++ b/java/RunMtest.in Tue Jan 11 10:57:50 2011 +0100
@@ -28,8 +28,6 @@
PATH="${buildbase}/testing/src:$PATH"
export PATH
-chmod +x ${buildbase}/testing/src/Mlog
-
PYTHONPATH="${buildbase}/testing/src:${srcdir}/../testing/src:${PYTHONPATH}"
export PYTHONPATH
diff -r 9d1696db2095 -r a768a21f2eba pathfinder/RunMtest.in
--- a/pathfinder/RunMtest.in Tue Jan 11 02:33:39 2011 +0100
+++ b/pathfinder/RunMtest.in Tue Jan 11 10:57:50 2011 +0100
@@ -73,8 +73,6 @@
PATH="${binpath}:$PATH"
export PATH
-chmod +x ${buildbase}/testing/src/Mlog
-
PYTHONPATH="${buildbase}/testing/src:${srcdir}/../testing/src:${PYTHONPATH}"
export PYTHONPATH
diff -r 9d1696db2095 -r a768a21f2eba sql/RunMtest.in
--- a/sql/RunMtest.in Tue Jan 11 02:33:39 2011 +0100
+++ b/sql/RunMtest.in Tue Jan 11 10:57:50 2011 +0100
@@ -49,8 +49,6 @@
PATH="${binpath}:$PATH"
export PATH
-chmod +x ${buildbase}/testing/src/Mlog
-
PYTHONPATH="${builddir}/src/backends/python/monet5/.libs:${builddir}/src/backends/python/monet5:${buildbase}/testing/src:${srcdir}/../testing/src:$PYTHONPATH"
export PYTHONPATH
diff -r 9d1696db2095 -r a768a21f2eba template/RunMtest.in
--- a/template/RunMtest.in Tue Jan 11 02:33:39 2011 +0100
+++ b/template/RunMtest.in Tue Jan 11 10:57:50 2011 +0100
@@ -69,8 +69,6 @@
PATH="${buildbase}/MonetDB$V/src/tools:${buildbase}/testing/src:$PATH"
export PATH
-chmod +x ${buildbase}/testing/src/Mlog
-
PYTHONPATH="${buildbase}/testing/src:${srcdir}/../testing/src:${PYTHONPATH}"
export PYTHONPATH
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
