Changeset: 0d0256d5d5b1 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/0d0256d5d5b1
Modified Files:
CMakeLists.txt
buildtools/conf/CMakeLists.txt
clients/NT/CMakeLists.txt
clients/examples/C/CMakeLists.txt
clients/examples/perl/CMakeLists.txt
clients/examples/php/CMakeLists.txt
clients/mapiclient/CMakeLists.txt
clients/mapilib/CMakeLists.txt
clients/odbc/driver/CMakeLists.txt
clients/odbc/samples/CMakeLists.txt
clients/odbc/setup/CMakeLists.txt
clients/odbc/winsetup/CMakeLists.txt
cmake/monetdb-defines.cmake
cmake/monetdb-findpackages.cmake
common/utils/muuid.h
geom/monetdb5/CMakeLists.txt
geom/sql/CMakeLists.txt
monetdb5/NT/CMakeLists.txt
monetdb5/tools/CMakeLists.txt
sql/NT/CMakeLists.txt
sql/backends/monet5/UDF/capi/CMakeLists.txt
sql/backends/monet5/UDF/pyapi3/CMakeLists.txt
testing/CMakeLists.txt
testing/Mconvert.py.in
testing/Mtest.py.in
testing/Mz.py.in
tools/merovingian/client/CMakeLists.txt
tools/merovingian/client/monetdb.c
tools/merovingian/daemon/CMakeLists.txt
tools/merovingian/daemon/client.c
tools/merovingian/daemon/client.h
tools/merovingian/daemon/config/CMakeLists.txt
tools/merovingian/daemon/connections.c
tools/merovingian/daemon/connections.h
tools/merovingian/daemon/controlrunner.c
tools/merovingian/daemon/controlrunner.h
tools/merovingian/daemon/discoveryrunner.c
tools/merovingian/daemon/discoveryrunner.h
tools/merovingian/daemon/forkmserver.c
tools/merovingian/daemon/forkmserver.h
tools/merovingian/daemon/handlers.c
tools/merovingian/daemon/handlers.h
tools/merovingian/daemon/merovingian.c
tools/merovingian/daemon/merovingian.h
tools/merovingian/daemon/multiplex-funnel.c
tools/merovingian/daemon/multiplex-funnel.h
tools/merovingian/daemon/proxy.c
tools/merovingian/daemon/proxy.h
tools/merovingian/daemon/snapshot.h
tools/merovingian/utils/glob.h
tools/merovingian/utils/properties.c
tools/merovingian/utils/properties.h
tools/merovingian/utils/utils.c
tools/merovingian/utils/utils.h
tools/mserver/CMakeLists.txt
tools/mserver/monet_version.c.in
Branch: Jan2022
Log Message:
Remove vim-specific configs. We use editorconfig for that nowadays.
diffs (truncated from 525 to 300 lines):
diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -183,6 +183,3 @@ add_subdirectory(documentation)
if(CMAKE_SUMMARY)
monetdb_cmake_summary()
endif()
-
-
-# vim: set ts=2:sw=2:et
diff --git a/buildtools/conf/CMakeLists.txt b/buildtools/conf/CMakeLists.txt
--- a/buildtools/conf/CMakeLists.txt
+++ b/buildtools/conf/CMakeLists.txt
@@ -22,5 +22,3 @@ if(DEVELOPMENT AND NOT WIN32)
PERMISSIONS ${PROGRAM_PERMISSIONS_DEFAULT}
DESTINATION ${CMAKE_INSTALL_BINDIR})
endif()
-
-# vim: set ts=2:sw=2:et
diff --git a/clients/NT/CMakeLists.txt b/clients/NT/CMakeLists.txt
--- a/clients/NT/CMakeLists.txt
+++ b/clients/NT/CMakeLists.txt
@@ -17,5 +17,3 @@ if(WIN32)
DESTINATION "."
COMPONENT server)
endif()
-
-# vim: set ts=2:sw=2:et
diff --git a/clients/examples/C/CMakeLists.txt
b/clients/examples/C/CMakeLists.txt
--- a/clients/examples/C/CMakeLists.txt
+++ b/clients/examples/C/CMakeLists.txt
@@ -95,5 +95,3 @@ if(TESTING)
OPTIONAL)
endif()
endif()
-
-# vim: set ts=2:sw=2:et
diff --git a/clients/examples/perl/CMakeLists.txt
b/clients/examples/perl/CMakeLists.txt
--- a/clients/examples/perl/CMakeLists.txt
+++ b/clients/examples/perl/CMakeLists.txt
@@ -8,7 +8,7 @@
if(TESTING)
install(FILES
- sqlsample.pl
+ sqlsample.pl
PERMISSIONS ${PROGRAM_PERMISSIONS_DEFAULT}
DESTINATION ${CMAKE_INSTALL_BINDIR}
COMPONENT clienttest)
@@ -19,5 +19,3 @@ if(TESTING)
DESTINATION ${CMAKE_INSTALL_BINDIR}
COMPONENT clienttest)
endif()
-
-# vim: set ts=2:sw=2:et
diff --git a/clients/examples/php/CMakeLists.txt
b/clients/examples/php/CMakeLists.txt
--- a/clients/examples/php/CMakeLists.txt
+++ b/clients/examples/php/CMakeLists.txt
@@ -8,10 +8,8 @@
if(TESTING)
install(FILES
- sqlsample.php
+ sqlsample.php
PERMISSIONS ${PROGRAM_PERMISSIONS_DEFAULT}
DESTINATION ${CMAKE_INSTALL_BINDIR}
COMPONENT clienttest)
endif()
-
-# vim: set ts=2:sw=2:et
diff --git a/clients/mapiclient/CMakeLists.txt
b/clients/mapiclient/CMakeLists.txt
--- a/clients/mapiclient/CMakeLists.txt
+++ b/clients/mapiclient/CMakeLists.txt
@@ -102,5 +102,3 @@ if(WIN32)
DESTINATION ${CMAKE_INSTALL_BINDIR}
OPTIONAL)
endif()
-
-# vim: set ts=2:sw=2:et
diff --git a/clients/mapilib/CMakeLists.txt b/clients/mapilib/CMakeLists.txt
--- a/clients/mapilib/CMakeLists.txt
+++ b/clients/mapilib/CMakeLists.txt
@@ -87,5 +87,3 @@ if(WIN32)
DESTINATION ${CMAKE_INSTALL_LIBDIR}
OPTIONAL)
endif()
-
-# vim: set ts=2:sw=2:et
diff --git a/clients/odbc/driver/CMakeLists.txt
b/clients/odbc/driver/CMakeLists.txt
--- a/clients/odbc/driver/CMakeLists.txt
+++ b/clients/odbc/driver/CMakeLists.txt
@@ -151,5 +151,3 @@ if(WIN32)
DESTINATION ${CMAKE_INSTALL_LIBDIR}
OPTIONAL)
endif()
-
-# vim: set ts=2:sw=2:et
diff --git a/clients/odbc/samples/CMakeLists.txt
b/clients/odbc/samples/CMakeLists.txt
--- a/clients/odbc/samples/CMakeLists.txt
+++ b/clients/odbc/samples/CMakeLists.txt
@@ -56,5 +56,3 @@ if(TESTING)
OPTIONAL)
endif()
endif()
-
-# vim: set ts=2:sw=2:et
diff --git a/clients/odbc/setup/CMakeLists.txt
b/clients/odbc/setup/CMakeLists.txt
--- a/clients/odbc/setup/CMakeLists.txt
+++ b/clients/odbc/setup/CMakeLists.txt
@@ -52,5 +52,3 @@ if(WIN32)
DESTINATION ${CMAKE_INSTALL_LIBDIR}
OPTIONAL)
endif()
-
-# vim: set ts=2:sw=2:et
diff --git a/clients/odbc/winsetup/CMakeLists.txt
b/clients/odbc/winsetup/CMakeLists.txt
--- a/clients/odbc/winsetup/CMakeLists.txt
+++ b/clients/odbc/winsetup/CMakeLists.txt
@@ -82,5 +82,3 @@ if(WIN32)
DESTINATION ${CMAKE_INSTALL_LIBDIR}
OPTIONAL)
endif()
-
-# vim: set ts=2:sw=2:et
diff --git a/cmake/monetdb-defines.cmake b/cmake/monetdb-defines.cmake
--- a/cmake/monetdb-defines.cmake
+++ b/cmake/monetdb-defines.cmake
@@ -325,5 +325,3 @@ macro(monetdb_configure_misc)
set(inline "__inline")
endif()
endmacro()
-
-# vim: set ts=2:sw=2:et
diff --git a/cmake/monetdb-findpackages.cmake b/cmake/monetdb-findpackages.cmake
--- a/cmake/monetdb-findpackages.cmake
+++ b/cmake/monetdb-findpackages.cmake
@@ -109,5 +109,3 @@ find_package(Reprepro)
find_package(Semodule)
find_package(Awk)
find_package(Candle)
-
-# vim: set ts=2:sw=2:et
diff --git a/common/utils/muuid.h b/common/utils/muuid.h
--- a/common/utils/muuid.h
+++ b/common/utils/muuid.h
@@ -24,5 +24,3 @@ extern
char *generateUUID(void);
#endif
-
-/* vim:set ts=4 sw=4 noexpandtab: */
diff --git a/geom/monetdb5/CMakeLists.txt b/geom/monetdb5/CMakeLists.txt
--- a/geom/monetdb5/CMakeLists.txt
+++ b/geom/monetdb5/CMakeLists.txt
@@ -79,5 +79,3 @@ if(GEOS_FOUND)
OPTIONAL)
endif()
endif()
-
-# vim: set ts=2:sw=2:et
diff --git a/geom/sql/CMakeLists.txt b/geom/sql/CMakeLists.txt
--- a/geom/sql/CMakeLists.txt
+++ b/geom/sql/CMakeLists.txt
@@ -12,4 +12,3 @@
# DESTINATION ${CMAKE_INSTALL_LIBDIR}/monetdb5/createdb
# COMPONENT server)
#endif()
-# vim: set ts=2:sw=2:et
diff --git a/monetdb5/NT/CMakeLists.txt b/monetdb5/NT/CMakeLists.txt
--- a/monetdb5/NT/CMakeLists.txt
+++ b/monetdb5/NT/CMakeLists.txt
@@ -12,5 +12,3 @@ if(WIN32)
DESTINATION "."
COMPONENT server)
endif()
-
-# vim: set ts=2:sw=2:et
diff --git a/monetdb5/tools/CMakeLists.txt b/monetdb5/tools/CMakeLists.txt
--- a/monetdb5/tools/CMakeLists.txt
+++ b/monetdb5/tools/CMakeLists.txt
@@ -76,5 +76,3 @@ if(WIN32)
DESTINATION ${CMAKE_INSTALL_LIBDIR}
OPTIONAL)
endif()
-
-# vim: set ts=2:sw=2:et
diff --git a/sql/NT/CMakeLists.txt b/sql/NT/CMakeLists.txt
--- a/sql/NT/CMakeLists.txt
+++ b/sql/NT/CMakeLists.txt
@@ -17,5 +17,3 @@ if(WIN32)
DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}
COMPONENT server)
endif()
-
-# vim: set ts=2:sw=2:et
diff --git a/sql/backends/monet5/UDF/capi/CMakeLists.txt
b/sql/backends/monet5/UDF/capi/CMakeLists.txt
--- a/sql/backends/monet5/UDF/capi/CMakeLists.txt
+++ b/sql/backends/monet5/UDF/capi/CMakeLists.txt
@@ -58,5 +58,3 @@ if(CINTEGRATION)
OPTIONAL)
endif()
endif()
-
-# vim: set ts=2:sw=2:et
diff --git a/sql/backends/monet5/UDF/pyapi3/CMakeLists.txt
b/sql/backends/monet5/UDF/pyapi3/CMakeLists.txt
--- a/sql/backends/monet5/UDF/pyapi3/CMakeLists.txt
+++ b/sql/backends/monet5/UDF/pyapi3/CMakeLists.txt
@@ -90,4 +90,3 @@ if(HAVE_LIBPY3)
COMPONENT server)
endif()
endif()
-# vim: set ts=2:sw=2:et
diff --git a/testing/CMakeLists.txt b/testing/CMakeLists.txt
--- a/testing/CMakeLists.txt
+++ b/testing/CMakeLists.txt
@@ -178,5 +178,3 @@ install(FILES
PERMISSIONS ${PROGRAM_PERMISSIONS_DEFAULT}
DESTINATION ${CMAKE_INSTALL_BINDIR}
COMPONENT pytesting)
-
-# vim: set ts=2:sw=2:et
diff --git a/testing/Mconvert.py.in b/testing/Mconvert.py.in
--- a/testing/Mconvert.py.in
+++ b/testing/Mconvert.py.in
@@ -2843,4 +2843,3 @@ if __name__ == "__main__":
# END
#############################################################################
-# vim: set ts=4 sw=4 expandtab:
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -4233,4 +4233,3 @@ if __name__ == "__main__":
# END
#############################################################################
-# vim: set ts=4 sw=4 expandtab:
diff --git a/testing/Mz.py.in b/testing/Mz.py.in
--- a/testing/Mz.py.in
+++ b/testing/Mz.py.in
@@ -2702,4 +2702,3 @@ if __name__ == "__main__":
# END
#############################################################################
-# vim: set ts=4 sw=4 expandtab:
diff --git a/tools/merovingian/client/CMakeLists.txt
b/tools/merovingian/client/CMakeLists.txt
--- a/tools/merovingian/client/CMakeLists.txt
+++ b/tools/merovingian/client/CMakeLists.txt
@@ -50,5 +50,3 @@ if(WIN32)
DESTINATION ${CMAKE_INSTALL_BINDIR}
OPTIONAL)
endif()
-
-# vim: set ts=2:sw=2:et
diff --git a/tools/merovingian/client/monetdb.c
b/tools/merovingian/client/monetdb.c
--- a/tools/merovingian/client/monetdb.c
+++ b/tools/merovingian/client/monetdb.c
@@ -2584,5 +2584,3 @@ main(int argc, char *argv[])
return retval;
}
-
-/* vim:set ts=4 sw=4 noexpandtab: */
diff --git a/tools/merovingian/daemon/CMakeLists.txt
b/tools/merovingian/daemon/CMakeLists.txt
--- a/tools/merovingian/daemon/CMakeLists.txt
+++ b/tools/merovingian/daemon/CMakeLists.txt
@@ -83,5 +83,3 @@ if(WIN32)
endif()
add_subdirectory(config)
-
-# vim: set ts=2:sw=2:et
diff --git a/tools/merovingian/daemon/client.c
b/tools/merovingian/daemon/client.c
--- a/tools/merovingian/daemon/client.c
+++ b/tools/merovingian/daemon/client.c
@@ -649,5 +649,3 @@ error:
}
return(newErr("accept connection: %s", msg));
}
-
-/* vim:set ts=4 sw=4 noexpandtab: */
diff --git a/tools/merovingian/daemon/client.h
b/tools/merovingian/daemon/client.h
--- a/tools/merovingian/daemon/client.h
+++ b/tools/merovingian/daemon/client.h
@@ -12,5 +12,3 @@
char *acceptConnections(int socks[3]);
#endif
-
-/* vim:set ts=4 sw=4 noexpandtab: */
diff --git a/tools/merovingian/daemon/config/CMakeLists.txt
b/tools/merovingian/daemon/config/CMakeLists.txt
--- a/tools/merovingian/daemon/config/CMakeLists.txt
+++ b/tools/merovingian/daemon/config/CMakeLists.txt
@@ -34,12 +34,10 @@ install(FILES
DESTINATION ${CMAKE_INSTALL_LOCALSTATEDIR}/monetdb5/dbfarm
COMPONENT sql)
-install(DIRECTORY
+install(DIRECTORY
DESTINATION ${CMAKE_INSTALL_LOCALSTATEDIR}/log/monetdb
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
