discomfitor pushed a commit to branch enlightenment-0.22. http://git.enlightenment.org/core/enlightenment.git/commit/?id=5cb6e1e8fafca16f27a3311c36a917cf88b4032d
commit 5cb6e1e8fafca16f27a3311c36a917cf88b4032d Author: Mike Blumenkrantz <zm...@osg.samsung.com> Date: Tue May 15 15:30:14 2018 +0200 move config/ to data/config/ Summary: this is part of the datadir distribution, it should not be in a different directory than the rest of the datadir distribution the gnu coding standards (https://www.gnu.org/prep/standards/html_node/Directory-Variables.html) define 'datadir' as: The directory for installing idiosyncratic read-only architecture-independent data files for this program. This is usually the same place as ‘datarootdir’, but we use the two separate variables so that you can move these program-specific files without altering the location for Info files, man pages, etc. This should normally be /usr/local/share, but write it as $(datarootdir). (If you are using Autoconf, write it as ‘@datadir@’.) The definition of ‘datadir’ is the same for all packages, so you should install your data in a subdirectory thereof. Most packages install their data under $(datadir)/package-name/. while this text has no clear requirement or suggestion for a corresponding repository layout, projects typically employ a certain consistency in their repository layout both for ease of maintenance and ease of learning for new contributors. this project has both a data/ directory, which contains the datadir distribution, as well as the config/ directory, which also contains the datadir distribution. this complicates matters both for active maintainers/developers who must remember that the repository and build tree layouts have this exception, and for new contributors who will initially be confused by this exception other well-organized open source projects, such as wayland, have chosen to not use a data/ directory. these projects have the datadir distribution in the base directory of the repositor, which is a fine practice as it maintains consistency for the project since all the files for the datadir distribution are in the same directory. by applying this patch, the project will move towards a more easily readable and learnable layout. current and future developers will no longer need to wonder why this directory is outside of the data/ directory, and anyone attempting to reference these files from the source/build trees will be able to do so more easily ref D6013 Reviewers: cedric, raster, bu5hm4n Reviewed By: raster Subscribers: devilhorns Tags: #enlightenment-git Differential Revision: https://phab.enlightenment.org/D6154 --- {config => data/config}/default/e.src | 0 {config => data/config}/default/e_bindings.src | 0 {config => data/config}/default/enlightenment-default.png | Bin {config => data/config}/default/meson.build | 0 {config => data/config}/default/profile.desktop | 0 {config => data/config}/meson.build | 0 {config => data/config}/mobile/e.src | 0 {config => data/config}/mobile/e_bindings.src | 0 {config => data/config}/mobile/enlightenment-mobile.png | Bin {config => data/config}/mobile/meson.build | 0 {config => data/config}/mobile/module.battery.src | 0 {config => data/config}/mobile/module.conf.src | 0 {config => data/config}/mobile/profile.desktop | 0 {config => data/config}/profile.src | 0 {config => data/config}/standard/e.src | 0 {config => data/config}/standard/e_bindings.src | 0 {config => data/config}/standard/enlightenment-standard.png | Bin {config => data/config}/standard/meson.build | 0 {config => data/config}/standard/module.battery.src | 0 {config => data/config}/standard/module.conf.src | 0 {config => data/config}/standard/module.cpufreq.src | 0 {config => data/config}/standard/module.fileman.src | 0 {config => data/config}/standard/module.ibar.src | 0 {config => data/config}/standard/module.ibox.src | 0 {config => data/config}/standard/module.pager.src | 0 {config => data/config}/standard/module.temperature.src | 0 {config => data/config}/standard/profile.desktop | 0 {config => data/config}/tiling/e.src | 0 {config => data/config}/tiling/e_bindings.src | 0 {config => data/config}/tiling/enlightenment-tiling.png | Bin {config => data/config}/tiling/meson.build | 0 {config => data/config}/tiling/module.battery.src | 0 {config => data/config}/tiling/module.conf.src | 0 {config => data/config}/tiling/module.cpufreq.src | 0 {config => data/config}/tiling/module.fileman.src | 0 {config => data/config}/tiling/module.ibar.src | 0 {config => data/config}/tiling/module.ibox.src | 0 {config => data/config}/tiling/module.pager.src | 0 {config => data/config}/tiling/module.temperature.src | 0 {config => data/config}/tiling/module.tiling.src | 0 {config => data/config}/tiling/profile.desktop | 0 meson.build | 2 +- 42 files changed, 1 insertion(+), 1 deletion(-) diff --git a/config/default/e.src b/data/config/default/e.src similarity index 100% rename from config/default/e.src rename to data/config/default/e.src diff --git a/config/default/e_bindings.src b/data/config/default/e_bindings.src similarity index 100% rename from config/default/e_bindings.src rename to data/config/default/e_bindings.src diff --git a/config/default/enlightenment-default.png b/data/config/default/enlightenment-default.png similarity index 100% rename from config/default/enlightenment-default.png rename to data/config/default/enlightenment-default.png diff --git a/config/default/meson.build b/data/config/default/meson.build similarity index 100% rename from config/default/meson.build rename to data/config/default/meson.build diff --git a/config/default/profile.desktop b/data/config/default/profile.desktop similarity index 100% rename from config/default/profile.desktop rename to data/config/default/profile.desktop diff --git a/config/meson.build b/data/config/meson.build similarity index 100% rename from config/meson.build rename to data/config/meson.build diff --git a/config/mobile/e.src b/data/config/mobile/e.src similarity index 100% rename from config/mobile/e.src rename to data/config/mobile/e.src diff --git a/config/mobile/e_bindings.src b/data/config/mobile/e_bindings.src similarity index 100% rename from config/mobile/e_bindings.src rename to data/config/mobile/e_bindings.src diff --git a/config/mobile/enlightenment-mobile.png b/data/config/mobile/enlightenment-mobile.png similarity index 100% rename from config/mobile/enlightenment-mobile.png rename to data/config/mobile/enlightenment-mobile.png diff --git a/config/mobile/meson.build b/data/config/mobile/meson.build similarity index 100% rename from config/mobile/meson.build rename to data/config/mobile/meson.build diff --git a/config/mobile/module.battery.src b/data/config/mobile/module.battery.src similarity index 100% rename from config/mobile/module.battery.src rename to data/config/mobile/module.battery.src diff --git a/config/mobile/module.conf.src b/data/config/mobile/module.conf.src similarity index 100% rename from config/mobile/module.conf.src rename to data/config/mobile/module.conf.src diff --git a/config/mobile/profile.desktop b/data/config/mobile/profile.desktop similarity index 100% rename from config/mobile/profile.desktop rename to data/config/mobile/profile.desktop diff --git a/config/profile.src b/data/config/profile.src similarity index 100% rename from config/profile.src rename to data/config/profile.src diff --git a/config/standard/e.src b/data/config/standard/e.src similarity index 100% rename from config/standard/e.src rename to data/config/standard/e.src diff --git a/config/standard/e_bindings.src b/data/config/standard/e_bindings.src similarity index 100% rename from config/standard/e_bindings.src rename to data/config/standard/e_bindings.src diff --git a/config/standard/enlightenment-standard.png b/data/config/standard/enlightenment-standard.png similarity index 100% rename from config/standard/enlightenment-standard.png rename to data/config/standard/enlightenment-standard.png diff --git a/config/standard/meson.build b/data/config/standard/meson.build similarity index 100% rename from config/standard/meson.build rename to data/config/standard/meson.build diff --git a/config/standard/module.battery.src b/data/config/standard/module.battery.src similarity index 100% rename from config/standard/module.battery.src rename to data/config/standard/module.battery.src diff --git a/config/standard/module.conf.src b/data/config/standard/module.conf.src similarity index 100% rename from config/standard/module.conf.src rename to data/config/standard/module.conf.src diff --git a/config/standard/module.cpufreq.src b/data/config/standard/module.cpufreq.src similarity index 100% rename from config/standard/module.cpufreq.src rename to data/config/standard/module.cpufreq.src diff --git a/config/standard/module.fileman.src b/data/config/standard/module.fileman.src similarity index 100% rename from config/standard/module.fileman.src rename to data/config/standard/module.fileman.src diff --git a/config/standard/module.ibar.src b/data/config/standard/module.ibar.src similarity index 100% rename from config/standard/module.ibar.src rename to data/config/standard/module.ibar.src diff --git a/config/standard/module.ibox.src b/data/config/standard/module.ibox.src similarity index 100% rename from config/standard/module.ibox.src rename to data/config/standard/module.ibox.src diff --git a/config/standard/module.pager.src b/data/config/standard/module.pager.src similarity index 100% rename from config/standard/module.pager.src rename to data/config/standard/module.pager.src diff --git a/config/standard/module.temperature.src b/data/config/standard/module.temperature.src similarity index 100% rename from config/standard/module.temperature.src rename to data/config/standard/module.temperature.src diff --git a/config/standard/profile.desktop b/data/config/standard/profile.desktop similarity index 100% rename from config/standard/profile.desktop rename to data/config/standard/profile.desktop diff --git a/config/tiling/e.src b/data/config/tiling/e.src similarity index 100% rename from config/tiling/e.src rename to data/config/tiling/e.src diff --git a/config/tiling/e_bindings.src b/data/config/tiling/e_bindings.src similarity index 100% rename from config/tiling/e_bindings.src rename to data/config/tiling/e_bindings.src diff --git a/config/tiling/enlightenment-tiling.png b/data/config/tiling/enlightenment-tiling.png similarity index 100% rename from config/tiling/enlightenment-tiling.png rename to data/config/tiling/enlightenment-tiling.png diff --git a/config/tiling/meson.build b/data/config/tiling/meson.build similarity index 100% rename from config/tiling/meson.build rename to data/config/tiling/meson.build diff --git a/config/tiling/module.battery.src b/data/config/tiling/module.battery.src similarity index 100% rename from config/tiling/module.battery.src rename to data/config/tiling/module.battery.src diff --git a/config/tiling/module.conf.src b/data/config/tiling/module.conf.src similarity index 100% rename from config/tiling/module.conf.src rename to data/config/tiling/module.conf.src diff --git a/config/tiling/module.cpufreq.src b/data/config/tiling/module.cpufreq.src similarity index 100% rename from config/tiling/module.cpufreq.src rename to data/config/tiling/module.cpufreq.src diff --git a/config/tiling/module.fileman.src b/data/config/tiling/module.fileman.src similarity index 100% rename from config/tiling/module.fileman.src rename to data/config/tiling/module.fileman.src diff --git a/config/tiling/module.ibar.src b/data/config/tiling/module.ibar.src similarity index 100% rename from config/tiling/module.ibar.src rename to data/config/tiling/module.ibar.src diff --git a/config/tiling/module.ibox.src b/data/config/tiling/module.ibox.src similarity index 100% rename from config/tiling/module.ibox.src rename to data/config/tiling/module.ibox.src diff --git a/config/tiling/module.pager.src b/data/config/tiling/module.pager.src similarity index 100% rename from config/tiling/module.pager.src rename to data/config/tiling/module.pager.src diff --git a/config/tiling/module.temperature.src b/data/config/tiling/module.temperature.src similarity index 100% rename from config/tiling/module.temperature.src rename to data/config/tiling/module.temperature.src diff --git a/config/tiling/module.tiling.src b/data/config/tiling/module.tiling.src similarity index 100% rename from config/tiling/module.tiling.src rename to data/config/tiling/module.tiling.src diff --git a/config/tiling/profile.desktop b/data/config/tiling/profile.desktop similarity index 100% rename from config/tiling/profile.desktop rename to data/config/tiling/profile.desktop diff --git a/meson.build b/meson.build index b0cd91da6..a2c134ad6 100644 --- a/meson.build +++ b/meson.build @@ -344,9 +344,9 @@ subdir('src/bin') subdir('src/modules') -subdir('config') subdir('data/backgrounds') +subdir('data/config') subdir('data/desktop') subdir('data/etc') subdir('data/favorites') --