{"id":23,"url":"https://patchwork.libcamera.org/api/patches/23/?format=json","web_url":"https://patchwork.libcamera.org/patch/23/","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":"<20181204221123.571-2-laurent.pinchart@ideasonboard.com>","date":"2018-12-04T22:11:21","name":"[libcamera-devel,1/3] Overhaul the directory structure","commit_ref":"913b3ee817a34bd78d5a8dc4fc9025920202db09","pull_url":null,"state":"accepted","archived":false,"hash":"5eef82447a2515b0299add31f880ba865109d1ea","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/23/mbox/","series":[{"id":13,"url":"https://patchwork.libcamera.org/api/series/13/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=13","date":"2018-12-04T22:11:20","name":"libcamera: Add initial logger support","version":1,"mbox":"https://patchwork.libcamera.org/series/13/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/23/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/23/checks/","tags":{},"headers":{"Return-Path":"","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id E74BF60B13\n\tfor ;\n\tTue, 4 Dec 2018 23:10:52 +0100 (CET)","from avalon.bb.dnainternet.fi\n\t(dfj612ybrt5fhg77mgycy-3.rev.dnainternet.fi\n\t[IPv6:2001:14ba:21f5:5b00:2e86:4862:ef6a:2804])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 50644553\n\tfor ;\n\tTue, 4 Dec 2018 23:10:52 +0100 (CET)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1543961452;\n\tbh=kvJlXRmY8v8mS0YDVtbi5VpKQgTATPdxMfZN3JyM3t4=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=Llg3xT7eVd7FRE1rRIr6aMT09iZFLHzhK/+aS0m2cF+KPdUbD6c76qDovmgQZJ/mL\n\tNMjCpr7FflYIl9myzo0ROAUnF7aaBwxkCsVcDPWGIdE3CdWnnazffazeH2CH+gopuj\n\t5mCEoNarh6kZTUf+hQksg/MYn+ItPA8Jowjrx0Yg=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Date":"Wed, 5 Dec 2018 00:11:21 +0200","Message-Id":"<20181204221123.571-2-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.19.2","In-Reply-To":"<20181204221123.571-1-laurent.pinchart@ideasonboard.com>","References":"<20181204221123.571-1-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH 1/3] Overhaul the directory structure","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":"Tue, 04 Dec 2018 22:10:53 -0000"},"content":"In order to match the directory structure of traditional projects,\nrename the top-level lib/ directory to src/libcamera/. Other libraries\ndeveloped as part of the project will later find a home in src/.\n\nSplit the libcamera header files in three categories: public headers\ndescribing the public API in include/libcamera/, internal headers\ndescribing the internal API in src/libcamera/include/, and private\nheaders local to one or a small number of compilation units along the\ncorresponding .cpp files. As no internal header exists yet the\nsrc/libcamera/include/ directory is created empty as the build system\nwould fail otherwise.\n\nSigned-off-by: Laurent Pinchart \n---\n meson.build | 4 ++--\n src/libcamera/include/.keep_empty | 0\n {lib => src/libcamera}/main.cpp | 0\n {lib => src/libcamera}/meson.build | 7 ++++++-\n src/meson.build | 1 +\n test/meson.build | 2 +-\n 6 files changed, 10 insertions(+), 4 deletions(-)\n create mode 100644 src/libcamera/include/.keep_empty\n rename {lib => src/libcamera}/main.cpp (100%)\n rename {lib => src/libcamera}/meson.build (50%)\n create mode 100644 src/meson.build","diff":"diff --git a/meson.build b/meson.build\nindex e0aeefa30330..e6ed03f951c7 100644\n--- a/meson.build\n+++ b/meson.build\n@@ -21,11 +21,11 @@ cpp_arguments = common_arguments\n add_project_arguments(c_arguments, language: 'c')\n add_project_arguments(cpp_arguments, language: 'cpp')\n \n-inc = include_directories('include')\n+libcamera_includes = include_directories('include')\n \n subdir('Documentation')\n subdir('include')\n-subdir('lib')\n+subdir('src')\n subdir('test')\n subdir('utils')\n \ndiff --git a/src/libcamera/include/.keep_empty b/src/libcamera/include/.keep_empty\nnew file mode 100644\nindex 000000000000..e69de29bb2d1\ndiff --git a/lib/main.cpp b/src/libcamera/main.cpp\nsimilarity index 100%\nrename from lib/main.cpp\nrename to src/libcamera/main.cpp\ndiff --git a/lib/meson.build b/src/libcamera/meson.build\nsimilarity index 50%\nrename from lib/meson.build\nrename to src/libcamera/meson.build\nindex fcd738cc86d8..07d9cd448342 100644\n--- a/lib/meson.build\n+++ b/src/libcamera/meson.build\n@@ -1,6 +1,11 @@\n sources = ['main.cpp']\n \n+includes = [\n+ libcamera_includes,\n+ include_directories('include'),\n+]\n+\n libcamera = shared_library('camera',\n sources,\n install : true,\n- include_directories : inc)\n+ include_directories : includes)\ndiff --git a/src/meson.build b/src/meson.build\nnew file mode 100644\nindex 000000000000..4ce9668caa7b\n--- /dev/null\n+++ b/src/meson.build\n@@ -0,0 +1 @@\n+subdir('libcamera')\ndiff --git a/test/meson.build b/test/meson.build\nindex afe9bd9a741c..924a26f1ca66 100644\n--- a/test/meson.build\n+++ b/test/meson.build\n@@ -1,5 +1,5 @@\n test_init = executable('test_init', 'init.cpp',\n link_with : libcamera,\n- include_directories : inc)\n+ include_directories : libcamera_includes)\n \n test('Initialisation test', test_init)\n","prefixes":["libcamera-devel","1/3"]}