Changeset: 6338f50fd06a for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6338f50fd06a
Modified Files:
NT/winconfig.py
configure.ag
testing/Mtest.py.in
tools/merovingian/daemon/config/.merovingian_properties.in
tools/merovingian/daemon/config/monetdbd.in
Branch: Nov2019
Log Message:
Get rid of DIRSEP and PATHSEP configure variables.
diffs (91 lines):
diff --git a/NT/winconfig.py b/NT/winconfig.py
--- a/NT/winconfig.py
+++ b/NT/winconfig.py
@@ -28,8 +28,7 @@ subs = [("@exec_prefix@", r'%prefix%'),
("@pkgdatadir@", r'%prefix%\share\@PACKAGE@'),
("@pkglibdir@", r'%exec_prefix%\lib\@PACKAGE@'),
("@pkgincludedir@", r'%prefix%\include\@PACKAGE@'),
- ("@DIRSEP@", '\\'),
- ("@PATHSEP@", ';')]
+]
if len(sys.argv) > 1 and sys.argv[1].endswith(r'\winconfig_conds.py'):
conds = {}
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -1134,33 +1134,19 @@ SOPREF=lib
AS_CASE([$host_os],
[mac*], [
# Mac OS 9 stuff
- DIRSEP=':'
- QDIRSEP=':'
AC_MSG_ERROR([mac not supported])],
[*cygwin*], [
- DIRSEP='/'
- QDIRSEP='/'
- PATHSEP=':'
SOEXT='-0.dll'
SOPREF=cyg],
[*darwin*], [
- DIRSEP='/'
- QDIRSEP='/'
- PATHSEP=':'
SOEXT='.dylib'],
[
- DIRSEP='/'
- QDIRSEP='/'
- PATHSEP=':'
SOEXT='.so'])
-AC_SUBST([DIRSEP])
-AC_SUBST([QDIRSEP])
-AC_SUBST([PATHSEP])
AC_SUBST([SOEXT])
-AC_DEFINE_UNQUOTED([DIR_SEP], ['$QDIRSEP'], [Directory separator])
-AC_DEFINE_UNQUOTED([DIR_SEP_STR], ["$QDIRSEP"], [Directory separator])
-AC_DEFINE_UNQUOTED([PATH_SEP], ['$PATHSEP'], [Path separator])
-AC_DEFINE_UNQUOTED([PATH_SEP_STR], ["$PATHSEP"], [Path separator])
+AC_DEFINE_UNQUOTED([DIR_SEP], ['/'], [Directory separator])
+AC_DEFINE_UNQUOTED([DIR_SEP_STR], ["/"], [Directory separator])
+AC_DEFINE_UNQUOTED([PATH_SEP], [':'], [Path separator])
+AC_DEFINE_UNQUOTED([PATH_SEP_STR], [":"], [Path separator])
AC_DEFINE_UNQUOTED([SO_PREFIX], ["$SOPREF"], [Shared Object prefix])
AC_DEFINE_UNQUOTED([SO_EXT], ["$SOEXT"], [Shared Object extension])
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -3630,7 +3630,6 @@ def main(argv) :
VARS = VARS + [ 'MALCLIENT', 'SQLCLIENT', 'SQLDUMP', 'RCLIENT',
'RUBYCLIENT'] #, 'MONETDB_MOD_PATH' ]
env = {}
- env['DIRSEP'] = os.sep
# most intuitive (?) default settings
dft['TSTSRCBASE'] = r"_configure('@QXSOURCE@')"
diff --git a/tools/merovingian/daemon/config/.merovingian_properties.in
b/tools/merovingian/daemon/config/.merovingian_properties.in
--- a/tools/merovingian/daemon/config/.merovingian_properties.in
+++ b/tools/merovingian/daemon/config/.merovingian_properties.in
@@ -12,5 +12,5 @@
# is, however, crucial that the file locations in this file are present.
-logfile=@Elogdir@@dir...@merovingian.log
-pidfile=@Erundir@@dir...@merovingian.pid
+logfile=@Elogdir@/merovingian.log
+pidfile=@Erundir@/merovingian.pid
diff --git a/tools/merovingian/daemon/config/monetdbd.in
b/tools/merovingian/daemon/config/monetdbd.in
--- a/tools/merovingian/daemon/config/monetdbd.in
+++ b/tools/merovingian/daemon/config/monetdbd.in
@@ -1,9 +1,9 @@
# this is the logrotate configuration for merovingian
-@Elogdir@@dir...@merovingian.log {
+@Elogdir@/merovingian.log {
su monetdb monetdb
missingok
notifempty
postrotate
- [ -s @Erundir@@dir...@merovingian.pid ] && kill -HUP $(cat
@Erundir@@dir...@merovingian.pid)
+ [ -s @Erundir@/merovingian.pid ] && kill -HUP $(cat
@Erundir@/merovingian.pid)
endscript
}
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
