{"id":1261,"url":"https://patchwork.libcamera.org/api/patches/1261/?format=json","web_url":"https://patchwork.libcamera.org/patch/1261/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20190522212253.3307-1-laurent.pinchart@ideasonboard.com>","date":"2019-05-22T21:22:51","name":"[libcamera-devel,v3,1/3] meson: Fix coding style in meson.build files","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"06e68e44d52042baedf0151af8cab5aa91abe926","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/1261/mbox/","series":[{"id":318,"url":"https://patchwork.libcamera.org/api/series/318/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=318","date":"2019-05-22T21:22:51","name":"[libcamera-devel,v3,1/3] meson: Fix coding style in meson.build files","version":3,"mbox":"https://patchwork.libcamera.org/series/318/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/1261/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/1261/checks/","tags":{},"headers":{"Return-Path":"","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 0093960C02\n\tfor ;\n\tWed, 22 May 2019 23:23:13 +0200 (CEST)","from pendragon.bb.dnainternet.fi\n\t(dfj612yhrgyx302h3jwwy-3.rev.dnainternet.fi\n\t[IPv6:2001:14ba:21f5:5b00:ce28:277f:58d7:3ca4])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 80C9D443\n\tfor ;\n\tWed, 22 May 2019 23:23:13 +0200 (CEST)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1558560193;\n\tbh=MMrBFBUhFF84kPeee7ldw3HhpN9X2Fcc3FETo8C7WOM=;\n\th=From:To:Subject:Date:From;\n\tb=ElUsYridrabld5r7k1T4xgl0h/RYZQpBRKdHir5sMEUHNjZ+FQKDclir/RuKJ4k78\n\tfxk9/Ws7PqPbuhVd4cR7joXj0Os1NsnxDsUcH6l3eASzpRy0xz0XoaUNAfybMxiQu9\n\tIsw4UTtFaW24sl3NKPgPPufi8lvAEM67o4idOlS4=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Date":"Thu, 23 May 2019 00:22:51 +0300","Message-Id":"<20190522212253.3307-1-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.21.0","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v3 1/3] meson: Fix coding style in\n\tmeson.build files","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.23","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Wed, 22 May 2019 21:23:14 -0000"},"content":"Consistently go for 4 spaces indentation, and always put a space between\nthe colon in argument lists, as per the examples from the meson\ndocumentation.\n\nSigned-off-by: Laurent Pinchart \n---\n Documentation/meson.build | 34 ++++++++++++++++-----------------\n meson.build | 28 +++++++++++++--------------\n src/libcamera/meson.build | 2 +-\n test/camera/meson.build | 16 ++++++++--------\n test/ipa/meson.build | 6 +++---\n test/media_device/meson.build | 2 +-\n test/pipeline/ipu3/meson.build | 4 ++--\n test/v4l2_device/meson.build | 20 +++++++++----------\n test/v4l2_subdevice/meson.build | 2 +-\n 9 files changed, 57 insertions(+), 57 deletions(-)","diff":"diff --git a/Documentation/meson.build b/Documentation/meson.build\nindex 12a99307c741..629e853120cb 100644\n--- a/Documentation/meson.build\n+++ b/Documentation/meson.build\n@@ -4,7 +4,7 @@ doc_install_dir = join_paths(get_option('datadir'), 'doc', 'libcamera-@0@'.forma\n # Doxygen\n #\n \n-doxygen = find_program('doxygen', required: false)\n+doxygen = find_program('doxygen', required : false)\n \n if doxygen.found()\n cdata = configuration_data()\n@@ -12,30 +12,30 @@ if doxygen.found()\n cdata.set('TOP_SRCDIR', meson.source_root())\n cdata.set('TOP_BUILDDIR', meson.build_root())\n \n- doxyfile = configure_file(input: 'Doxyfile.in',\n- output: 'Doxyfile',\n- configuration: cdata)\n+ doxyfile = configure_file(input : 'Doxyfile.in',\n+ output : 'Doxyfile',\n+ configuration : cdata)\n \n custom_target('doxygen',\n- input: [\n+ input : [\n doxyfile,\n libcamera_api,\n libcamera_headers,\n libcamera_sources,\n ],\n- output: 'api-html',\n- command: [doxygen, doxyfile],\n- install: true,\n- install_dir: doc_install_dir)\n+ output : 'api-html',\n+ command : [doxygen, doxyfile],\n+ install : true,\n+ install_dir : doc_install_dir)\n endif\n \n #\n # Sphinx\n #\n \n-sphinx = find_program('sphinx-build-3', required: false)\n+sphinx = find_program('sphinx-build-3', required : false)\n if not sphinx.found()\n- sphinx = find_program('sphinx-build', required: false)\n+ sphinx = find_program('sphinx-build', required : false)\n endif\n \n if sphinx.found()\n@@ -48,10 +48,10 @@ if sphinx.found()\n ]\n \n custom_target('documentation',\n- command: [sphinx, '-q', '-W', '-b', 'html', meson.current_source_dir(), '@OUTPUT@'],\n- input: docs_sources,\n- output: 'html',\n- build_by_default: true,\n- install: true,\n- install_dir: doc_install_dir)\n+ command : [sphinx, '-q', '-W', '-b', 'html', meson.current_source_dir(), '@OUTPUT@'],\n+ input : docs_sources,\n+ output : 'html',\n+ build_by_default : true,\n+ install : true,\n+ install_dir : doc_install_dir)\n endif\ndiff --git a/meson.build b/meson.build\nindex d272ff33b100..4d3e99d3e58f 100644\n--- a/meson.build\n+++ b/meson.build\n@@ -1,12 +1,12 @@\n project('libcamera', 'c', 'cpp',\n- meson_version: '>= 0.40',\n- version : '0.1',\n- default_options: [\n- 'werror=true',\n- 'warning_level=2',\n- 'cpp_std=c++11',\n- ],\n- license : 'LGPL 2.1+')\n+ meson_version : '>= 0.40',\n+ version : '0.1',\n+ default_options : [\n+ 'werror=true',\n+ 'warning_level=2',\n+ 'cpp_std=c++11',\n+ ],\n+ license : 'LGPL 2.1+')\n \n # TODO: Extract this from project.version.\n # Ideally the version at Documentation/conf.py should be\n@@ -16,7 +16,7 @@ api_version = '0.1'\n cc = meson.get_compiler('c')\n config_h = configuration_data()\n \n-if cc.has_header_symbol('stdlib.h', 'secure_getenv', prefix: '#define _GNU_SOURCE')\n+if cc.has_header_symbol('stdlib.h', 'secure_getenv', prefix : '#define _GNU_SOURCE')\n config_h.set('HAVE_SECURE_GETENV', 1)\n endif\n \n@@ -28,8 +28,8 @@ common_arguments = [\n c_arguments = common_arguments\n cpp_arguments = common_arguments\n \n-add_project_arguments(c_arguments, language: 'c')\n-add_project_arguments(cpp_arguments, language: 'cpp')\n+add_project_arguments(c_arguments, language : 'c')\n+add_project_arguments(cpp_arguments, language : 'cpp')\n \n libcamera_includes = include_directories('include')\n \n@@ -41,14 +41,14 @@ subdir('utils')\n # through configuration values. They are enabled by default.\n \n if get_option('documentation')\n- subdir('Documentation')\n+ subdir('Documentation')\n endif\n \n if get_option('tests')\n- subdir('test')\n+ subdir('test')\n endif\n \n-configure_file(output: 'config.h', configuration: config_h)\n+configure_file(output : 'config.h', configuration : config_h)\n \n pkg_mod = import('pkgconfig')\n pkg_mod.generate(libraries : libcamera,\ndiff --git a/src/libcamera/meson.build b/src/libcamera/meson.build\nindex e5b48f226ef3..8294ed357154 100644\n--- a/src/libcamera/meson.build\n+++ b/src/libcamera/meson.build\n@@ -51,7 +51,7 @@ includes = [\n \n subdir('pipeline')\n \n-libudev = dependency('libudev', required: false)\n+libudev = dependency('libudev', required : false)\n \n if libudev.found()\n config_h.set('HAVE_LIBUDEV', 1)\ndiff --git a/test/camera/meson.build b/test/camera/meson.build\nindex c4427945e4a2..b01e7e025de1 100644\n--- a/test/camera/meson.build\n+++ b/test/camera/meson.build\n@@ -1,15 +1,15 @@\n # Tests are listed in order of complexity.\n # They are not alphabetically sorted.\n camera_tests = [\n- [ 'configuration_default', 'configuration_default.cpp' ],\n- [ 'configuration_set', 'configuration_set.cpp' ],\n- [ 'statemachine', 'statemachine.cpp' ],\n- [ 'capture', 'capture.cpp' ],\n+ [ 'configuration_default', 'configuration_default.cpp' ],\n+ [ 'configuration_set', 'configuration_set.cpp' ],\n+ [ 'statemachine', 'statemachine.cpp' ],\n+ [ 'capture', 'capture.cpp' ],\n ]\n \n foreach t : camera_tests\n- exe = executable(t[0], [t[1], 'camera_test.cpp'],\n- link_with : test_libraries,\n- include_directories : test_includes_internal)\n- test(t[0], exe, suite: 'camera', is_parallel: false)\n+ exe = executable(t[0], [t[1], 'camera_test.cpp'],\n+ link_with : test_libraries,\n+ include_directories : test_includes_internal)\n+ test(t[0], exe, suite : 'camera', is_parallel : false)\n endforeach\ndiff --git a/test/ipa/meson.build b/test/ipa/meson.build\nindex 6df0671bd595..53015e38381f 100644\n--- a/test/ipa/meson.build\n+++ b/test/ipa/meson.build\n@@ -4,8 +4,8 @@ ipa_modules_sources = [\n ]\n \n foreach m : ipa_modules_sources\n- shared_library(m, name_prefix: '',\n- include_directories: test_includes_public)\n+ shared_library(m, name_prefix : '',\n+ include_directories : test_includes_public)\n endforeach\n \n ipa_test = [\n@@ -17,5 +17,5 @@ foreach t : ipa_test\n link_with : test_libraries,\n include_directories : test_includes_internal)\n \n- test(t[0], exe, suite: 'ipa', is_parallel: false)\n+ test(t[0], exe, suite : 'ipa', is_parallel : false)\n endforeach\ndiff --git a/test/media_device/meson.build b/test/media_device/meson.build\nindex 7ac6c2db7513..124f454ec865 100644\n--- a/test/media_device/meson.build\n+++ b/test/media_device/meson.build\n@@ -16,5 +16,5 @@ foreach t : media_device_tests\n link_with : [test_libraries, lib_mdev_test],\n include_directories : test_includes_internal)\n \n- test(t[0], exe, suite: 'media_device', is_parallel: false)\n+ test(t[0], exe, suite : 'media_device', is_parallel : false)\n endforeach\ndiff --git a/test/pipeline/ipu3/meson.build b/test/pipeline/ipu3/meson.build\nindex caba5c74f236..87074588c651 100644\n--- a/test/pipeline/ipu3/meson.build\n+++ b/test/pipeline/ipu3/meson.build\n@@ -1,5 +1,5 @@\n ipu3_test = [\n- ['ipu3_pipeline_test',\t 'ipu3_pipeline_test.cpp'],\n+ ['ipu3_pipeline_test', 'ipu3_pipeline_test.cpp'],\n ]\n \n foreach t : ipu3_test\n@@ -7,5 +7,5 @@ foreach t : ipu3_test\n link_with : test_libraries,\n include_directories : test_includes_internal)\n \n- test(t[0], exe, suite: 'ipu3', is_parallel: false)\n+ test(t[0], exe, suite : 'ipu3', is_parallel : false)\n endforeach\ndiff --git a/test/v4l2_device/meson.build b/test/v4l2_device/meson.build\nindex aa617b6dc837..32556cf5ea18 100644\n--- a/test/v4l2_device/meson.build\n+++ b/test/v4l2_device/meson.build\n@@ -1,17 +1,17 @@\n # Tests are listed in order of complexity.\n # They are not alphabetically sorted.\n v4l2_device_tests = [\n- [ 'double_open', 'double_open.cpp' ],\n- [ 'formats', 'formats.cpp' ],\n- [ 'request_buffers', 'request_buffers.cpp' ],\n- [ 'stream_on_off', 'stream_on_off.cpp' ],\n- [ 'capture_async', 'capture_async.cpp' ],\n- [ 'buffer_sharing', 'buffer_sharing.cpp' ],\n+ [ 'double_open', 'double_open.cpp' ],\n+ [ 'formats', 'formats.cpp' ],\n+ [ 'request_buffers', 'request_buffers.cpp' ],\n+ [ 'stream_on_off', 'stream_on_off.cpp' ],\n+ [ 'capture_async', 'capture_async.cpp' ],\n+ [ 'buffer_sharing', 'buffer_sharing.cpp' ],\n ]\n \n foreach t : v4l2_device_tests\n- exe = executable(t[0], [t[1], 'v4l2_device_test.cpp'],\n-\t\t link_with : test_libraries,\n-\t\t include_directories : test_includes_internal)\n- test(t[0], exe, suite: 'v4l2_device', is_parallel: false)\n+ exe = executable(t[0], [t[1], 'v4l2_device_test.cpp'],\n+ link_with : test_libraries,\n+ include_directories : test_includes_internal)\n+ test(t[0], exe, suite : 'v4l2_device', is_parallel : false)\n endforeach\ndiff --git a/test/v4l2_subdevice/meson.build b/test/v4l2_subdevice/meson.build\nindex 80cfbbbf9413..282f6e234ec1 100644\n--- a/test/v4l2_subdevice/meson.build\n+++ b/test/v4l2_subdevice/meson.build\n@@ -7,5 +7,5 @@ foreach t : v4l2_subdevice_tests\n exe = executable(t[0], [t[1], 'v4l2_subdevice_test.cpp'],\n link_with : test_libraries,\n include_directories : test_includes_internal)\n- test(t[0], exe, suite: 'v4l2_subdevice', is_parallel: false)\n+ test(t[0], exe, suite : 'v4l2_subdevice', is_parallel : false)\n endforeach\n","prefixes":["libcamera-devel","v3","1/3"]}