aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2018-05-15 15:30:14 +0200
committerMike Blumenkrantz <zmike@samsung.com>2018-08-02 09:58:49 -0400
commit5cb6e1e8fafca16f27a3311c36a917cf88b4032d (patch)
tree68183456c4d434cfeb966d573383a295abb8b276
parentupdate arcconfig key:values for new phabricator api (diff)
downloadenlightenment-5cb6e1e8fafca16f27a3311c36a917cf88b4032d.tar.gz
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 https://phab.enlightenment.org/D6013 Reviewers: cedric, raster, bu5hm4n Reviewed By: raster Subscribers: devilhorns Tags: #enlightenment-git Differential Revision: https://phab.enlightenment.org/D6154
-rw-r--r--data/config/default/e.src (renamed from config/default/e.src)0
-rw-r--r--data/config/default/e_bindings.src (renamed from config/default/e_bindings.src)0
-rw-r--r--data/config/default/enlightenment-default.png (renamed from config/default/enlightenment-default.png)bin6871 -> 6871 bytes
-rw-r--r--data/config/default/meson.build (renamed from config/default/meson.build)0
-rw-r--r--data/config/default/profile.desktop (renamed from config/default/profile.desktop)0
-rw-r--r--data/config/meson.build (renamed from config/meson.build)0
-rw-r--r--data/config/mobile/e.src (renamed from config/mobile/e.src)0
-rw-r--r--data/config/mobile/e_bindings.src (renamed from config/mobile/e_bindings.src)0
-rw-r--r--data/config/mobile/enlightenment-mobile.png (renamed from config/mobile/enlightenment-mobile.png)bin3121 -> 3121 bytes
-rw-r--r--data/config/mobile/meson.build (renamed from config/mobile/meson.build)0
-rw-r--r--data/config/mobile/module.battery.src (renamed from config/mobile/module.battery.src)0
-rw-r--r--data/config/mobile/module.conf.src (renamed from config/mobile/module.conf.src)0
-rw-r--r--data/config/mobile/profile.desktop (renamed from config/mobile/profile.desktop)0
-rw-r--r--data/config/profile.src (renamed from config/profile.src)0
-rw-r--r--data/config/standard/e.src (renamed from config/standard/e.src)0
-rw-r--r--data/config/standard/e_bindings.src (renamed from config/standard/e_bindings.src)0
-rw-r--r--data/config/standard/enlightenment-standard.png (renamed from config/standard/enlightenment-standard.png)bin1887 -> 1887 bytes
-rw-r--r--data/config/standard/meson.build (renamed from config/standard/meson.build)0
-rw-r--r--data/config/standard/module.battery.src (renamed from config/standard/module.battery.src)0
-rw-r--r--data/config/standard/module.conf.src (renamed from config/standard/module.conf.src)0
-rw-r--r--data/config/standard/module.cpufreq.src (renamed from config/standard/module.cpufreq.src)0
-rw-r--r--data/config/standard/module.fileman.src (renamed from config/standard/module.fileman.src)0
-rw-r--r--data/config/standard/module.ibar.src (renamed from config/standard/module.ibar.src)0
-rw-r--r--data/config/standard/module.ibox.src (renamed from config/standard/module.ibox.src)0
-rw-r--r--data/config/standard/module.pager.src (renamed from config/standard/module.pager.src)0
-rw-r--r--data/config/standard/module.temperature.src (renamed from config/standard/module.temperature.src)0
-rw-r--r--data/config/standard/profile.desktop (renamed from config/standard/profile.desktop)0
-rw-r--r--data/config/tiling/e.src (renamed from config/tiling/e.src)0
-rw-r--r--data/config/tiling/e_bindings.src (renamed from config/tiling/e_bindings.src)0
-rw-r--r--data/config/tiling/enlightenment-tiling.png (renamed from config/tiling/enlightenment-tiling.png)bin1368 -> 1368 bytes
-rw-r--r--data/config/tiling/meson.build (renamed from config/tiling/meson.build)0
-rw-r--r--data/config/tiling/module.battery.src (renamed from config/tiling/module.battery.src)0
-rw-r--r--data/config/tiling/module.conf.src (renamed from config/tiling/module.conf.src)0
-rw-r--r--data/config/tiling/module.cpufreq.src (renamed from config/tiling/module.cpufreq.src)0
-rw-r--r--data/config/tiling/module.fileman.src (renamed from config/tiling/module.fileman.src)0
-rw-r--r--data/config/tiling/module.ibar.src (renamed from config/tiling/module.ibar.src)0
-rw-r--r--data/config/tiling/module.ibox.src (renamed from config/tiling/module.ibox.src)0
-rw-r--r--data/config/tiling/module.pager.src (renamed from config/tiling/module.pager.src)0
-rw-r--r--data/config/tiling/module.temperature.src (renamed from config/tiling/module.temperature.src)0
-rw-r--r--data/config/tiling/module.tiling.src (renamed from config/tiling/module.tiling.src)0
-rw-r--r--data/config/tiling/profile.desktop (renamed from config/tiling/profile.desktop)0
-rw-r--r--meson.build2
42 files changed, 1 insertions, 1 deletions
diff --git a/config/default/e.src b/data/config/default/e.src
index 6c601c5d3..6c601c5d3 100644
--- a/config/default/e.src
+++ b/data/config/default/e.src
diff --git a/config/default/e_bindings.src b/data/config/default/e_bindings.src
index 0f11f7e11..0f11f7e11 100644
--- a/config/default/e_bindings.src
+++ b/data/config/default/e_bindings.src
diff --git a/config/default/enlightenment-default.png b/data/config/default/enlightenment-default.png
index 1f33694ac..1f33694ac 100644
--- a/config/default/enlightenment-default.png
+++ b/data/config/default/enlightenment-default.png
Binary files differ
diff --git a/config/default/meson.build b/data/config/default/meson.build
index f993a4393..f993a4393 100644
--- a/config/default/meson.build
+++ b/data/config/default/meson.build
diff --git a/config/default/profile.desktop b/data/config/default/profile.desktop
index 9f02f5870..9f02f5870 100644
--- a/config/default/profile.desktop
+++ b/data/config/default/profile.desktop
diff --git a/config/meson.build b/data/config/meson.build
index 3cc83881a..3cc83881a 100644
--- a/config/meson.build
+++ b/data/config/meson.build
diff --git a/config/mobile/e.src b/data/config/mobile/e.src
index d5039a4b1..d5039a4b1 100644
--- a/config/mobile/e.src
+++ b/data/config/mobile/e.src
diff --git a/config/mobile/e_bindings.src b/data/config/mobile/e_bindings.src
index 2580381c0..2580381c0 100644
--- a/config/mobile/e_bindings.src
+++ b/data/config/mobile/e_bindings.src
diff --git a/config/mobile/enlightenment-mobile.png b/data/config/mobile/enlightenment-mobile.png
index 698e2bcb7..698e2bcb7 100644
--- a/config/mobile/enlightenment-mobile.png
+++ b/data/config/mobile/enlightenment-mobile.png
Binary files differ
diff --git a/config/mobile/meson.build b/data/config/mobile/meson.build
index 64be2ad4e..64be2ad4e 100644
--- a/config/mobile/meson.build
+++ b/data/config/mobile/meson.build
diff --git a/config/mobile/module.battery.src b/data/config/mobile/module.battery.src
index e96f88d49..e96f88d49 100644
--- a/config/mobile/module.battery.src
+++ b/data/config/mobile/module.battery.src
diff --git a/config/mobile/module.conf.src b/data/config/mobile/module.conf.src
index 7c36ecb0f..7c36ecb0f 100644
--- a/config/mobile/module.conf.src
+++ b/data/config/mobile/module.conf.src
diff --git a/config/mobile/profile.desktop b/data/config/mobile/profile.desktop
index 5113bb6f2..5113bb6f2 100644
--- a/config/mobile/profile.desktop
+++ b/data/config/mobile/profile.desktop
diff --git a/config/profile.src b/data/config/profile.src
index 331d858ce..331d858ce 100644
--- a/config/profile.src
+++ b/data/config/profile.src
diff --git a/config/standard/e.src b/data/config/standard/e.src
index f43f1933a..f43f1933a 100644
--- a/config/standard/e.src
+++ b/data/config/standard/e.src
diff --git a/config/standard/e_bindings.src b/data/config/standard/e_bindings.src
index 4d7d7fb6d..4d7d7fb6d 100644
--- a/config/standard/e_bindings.src
+++ b/data/config/standard/e_bindings.src
diff --git a/config/standard/enlightenment-standard.png b/data/config/standard/enlightenment-standard.png
index eec2a1e09..eec2a1e09 100644
--- a/config/standard/enlightenment-standard.png
+++ b/data/config/standard/enlightenment-standard.png
Binary files differ
diff --git a/config/standard/meson.build b/data/config/standard/meson.build
index dfaacd8cd..dfaacd8cd 100644
--- a/config/standard/meson.build
+++ b/data/config/standard/meson.build
diff --git a/config/standard/module.battery.src b/data/config/standard/module.battery.src
index 0dcf81a40..0dcf81a40 100644
--- a/config/standard/module.battery.src
+++ b/data/config/standard/module.battery.src
diff --git a/config/standard/module.conf.src b/data/config/standard/module.conf.src
index 187855daf..187855daf 100644
--- a/config/standard/module.conf.src
+++ b/data/config/standard/module.conf.src
diff --git a/config/standard/module.cpufreq.src b/data/config/standard/module.cpufreq.src
index 5c9799494..5c9799494 100644
--- a/config/standard/module.cpufreq.src
+++ b/data/config/standard/module.cpufreq.src
diff --git a/config/standard/module.fileman.src b/data/config/standard/module.fileman.src
index 29d182aab..29d182aab 100644
--- a/config/standard/module.fileman.src
+++ b/data/config/standard/module.fileman.src
diff --git a/config/standard/module.ibar.src b/data/config/standard/module.ibar.src
index 55757663d..55757663d 100644
--- a/config/standard/module.ibar.src
+++ b/data/config/standard/module.ibar.src
diff --git a/config/standard/module.ibox.src b/data/config/standard/module.ibox.src
index 1126554a1..1126554a1 100644
--- a/config/standard/module.ibox.src
+++ b/data/config/standard/module.ibox.src
diff --git a/config/standard/module.pager.src b/data/config/standard/module.pager.src
index 61899b32c..61899b32c 100644
--- a/config/standard/module.pager.src
+++ b/data/config/standard/module.pager.src
diff --git a/config/standard/module.temperature.src b/data/config/standard/module.temperature.src
index dcad5332e..dcad5332e 100644
--- a/config/standard/module.temperature.src
+++ b/data/config/standard/module.temperature.src
diff --git a/config/standard/profile.desktop b/data/config/standard/profile.desktop
index 6a4af1059..6a4af1059 100644
--- a/config/standard/profile.desktop
+++ b/data/config/standard/profile.desktop
diff --git a/config/tiling/e.src b/data/config/tiling/e.src
index eff658c80..eff658c80 100644
--- a/config/tiling/e.src
+++ b/data/config/tiling/e.src
diff --git a/config/tiling/e_bindings.src b/data/config/tiling/e_bindings.src
index fcdd098d0..fcdd098d0 100644
--- a/config/tiling/e_bindings.src
+++ b/data/config/tiling/e_bindings.src
diff --git a/config/tiling/enlightenment-tiling.png b/data/config/tiling/enlightenment-tiling.png
index 76c7c94b3..76c7c94b3 100644
--- a/config/tiling/enlightenment-tiling.png
+++ b/data/config/tiling/enlightenment-tiling.png
Binary files differ
diff --git a/config/tiling/meson.build b/data/config/tiling/meson.build
index 50f074ccb..50f074ccb 100644
--- a/config/tiling/meson.build
+++ b/data/config/tiling/meson.build
diff --git a/config/tiling/module.battery.src b/data/config/tiling/module.battery.src
index 0dcf81a40..0dcf81a40 100644
--- a/config/tiling/module.battery.src
+++ b/data/config/tiling/module.battery.src
diff --git a/config/tiling/module.conf.src b/data/config/tiling/module.conf.src
index 187855daf..187855daf 100644
--- a/config/tiling/module.conf.src
+++ b/data/config/tiling/module.conf.src
diff --git a/config/tiling/module.cpufreq.src b/data/config/tiling/module.cpufreq.src
index 5c9799494..5c9799494 100644
--- a/config/tiling/module.cpufreq.src
+++ b/data/config/tiling/module.cpufreq.src
diff --git a/config/tiling/module.fileman.src b/data/config/tiling/module.fileman.src
index 29d182aab..29d182aab 100644
--- a/config/tiling/module.fileman.src
+++ b/data/config/tiling/module.fileman.src
diff --git a/config/tiling/module.ibar.src b/data/config/tiling/module.ibar.src
index 55757663d..55757663d 100644
--- a/config/tiling/module.ibar.src
+++ b/data/config/tiling/module.ibar.src
diff --git a/config/tiling/module.ibox.src b/data/config/tiling/module.ibox.src
index 1126554a1..1126554a1 100644
--- a/config/tiling/module.ibox.src
+++ b/data/config/tiling/module.ibox.src
diff --git a/config/tiling/module.pager.src b/data/config/tiling/module.pager.src
index 61899b32c..61899b32c 100644
--- a/config/tiling/module.pager.src
+++ b/data/config/tiling/module.pager.src
diff --git a/config/tiling/module.temperature.src b/data/config/tiling/module.temperature.src
index dcad5332e..dcad5332e 100644
--- a/config/tiling/module.temperature.src
+++ b/data/config/tiling/module.temperature.src
diff --git a/config/tiling/module.tiling.src b/data/config/tiling/module.tiling.src
index 2de65893f..2de65893f 100644
--- a/config/tiling/module.tiling.src
+++ b/data/config/tiling/module.tiling.src
diff --git a/config/tiling/profile.desktop b/data/config/tiling/profile.desktop
index 433d364a9..433d364a9 100644
--- a/config/tiling/profile.desktop
+++ b/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')