summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2018-05-14 17:26:06 +0200
committerStefan Schmidt <s.schmidt@samsung.com>2018-05-14 18:26:21 +0200
commitb83da71d89a7da1a12f83c4fc2a2b0bc900146ad (patch)
treed5f2be21ebfbe577167051580c7464c85d626429
parent8c14de85419f88cbc64e1208269c6ccef8489a23 (diff)
build: move config/ to data/elementary/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 Reviewers: cedric, stefan_schmidt, raster Reviewed By: stefan_schmidt, raster Tags: #efl Differential Revision: https://phab.enlightenment.org/D6013
-rw-r--r--Makefile.am2
-rw-r--r--configure.ac14
-rw-r--r--data/Makefile.am3
-rw-r--r--data/elementary/config/.gitignore (renamed from config/.gitignore)0
-rw-r--r--data/elementary/config/Makefile.am (renamed from config/Makefile.am)6
-rw-r--r--data/elementary/config/default/Makefile.am (renamed from config/default/Makefile.am)6
-rw-r--r--data/elementary/config/default/base.src.in (renamed from config/default/base.src.in)0
-rw-r--r--data/elementary/config/default/icon.png (renamed from config/default/icon.png)bin6871 -> 6871 bytes
-rw-r--r--data/elementary/config/default/profile.desktop (renamed from config/default/profile.desktop)0
-rw-r--r--data/elementary/config/mobile/Makefile.am (renamed from config/mobile/Makefile.am)6
-rw-r--r--data/elementary/config/mobile/base.src.in (renamed from config/mobile/base.src.in)0
-rw-r--r--data/elementary/config/mobile/icon.png (renamed from config/mobile/icon.png)bin7555 -> 7555 bytes
-rw-r--r--data/elementary/config/mobile/profile.desktop (renamed from config/mobile/profile.desktop)0
-rw-r--r--data/elementary/config/profile.src (renamed from config/profile.src)0
-rw-r--r--data/elementary/config/standard/Makefile.am (renamed from config/standard/Makefile.am)6
-rw-r--r--data/elementary/config/standard/base.src.in (renamed from config/standard/base.src.in)0
-rw-r--r--data/elementary/config/standard/icon.png (renamed from config/standard/icon.png)bin12068 -> 12068 bytes
-rw-r--r--data/elementary/config/standard/profile.desktop (renamed from config/standard/profile.desktop)0
18 files changed, 23 insertions, 20 deletions
diff --git a/Makefile.am b/Makefile.am
index e8624efc28..a753de855d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,7 +5,7 @@ AM_DISTCHECK_CONFIGURE_FLAGS = \
5--with-systemdunitdir=. \ 5--with-systemdunitdir=. \
6--enable-always-build-examples 6--enable-always-build-examples
7 7
8SUBDIRS = src data config doc 8SUBDIRS = src data doc
9 9
10if HAVE_PO 10if HAVE_PO
11 11
diff --git a/configure.ac b/configure.ac
index 84ea995299..f2cb49fce1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5698,13 +5698,13 @@ esac
5698AC_CONFIG_FILES([ 5698AC_CONFIG_FILES([
5699Makefile 5699Makefile
5700data/Makefile 5700data/Makefile
5701config/Makefile 5701data/elementary/config/Makefile
5702config/default/Makefile 5702data/elementary/config/default/Makefile
5703config/default/base.src 5703data/elementary/config/default/base.src
5704config/mobile/Makefile 5704data/elementary/config/mobile/Makefile
5705config/mobile/base.src 5705data/elementary/config/mobile/base.src
5706config/standard/Makefile 5706data/elementary/config/standard/Makefile
5707config/standard/base.src 5707data/elementary/config/standard/base.src
5708doc/Makefile 5708doc/Makefile
5709doc/Doxyfile 5709doc/Doxyfile
5710doc/previews/Makefile 5710doc/previews/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index 74a025ef8f..6f409a3afe 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -2,6 +2,7 @@ MAINTAINERCLEANFILES = Makefile.in
2 2
3EXTRA_DIST = 3EXTRA_DIST =
4CLEANFILES = 4CLEANFILES =
5SUBDIRS =
5 6
6######################################################################## 7########################################################################
7# Embryo 8# Embryo
@@ -119,6 +120,8 @@ EXTRA_DIST += $(eluafiles_DATA)
119 120
120# themes 121# themes
121 122
123SUBDIRS += elementary/config
124
122elementaryfilesdir = $(datadir)/elementary/themes 125elementaryfilesdir = $(datadir)/elementary/themes
123elementaryfiles_DATA = elementary/themes/default.edj 126elementaryfiles_DATA = elementary/themes/default.edj
124CLEANFILES += elementary/themes/default.edj 127CLEANFILES += elementary/themes/default.edj
diff --git a/config/.gitignore b/data/elementary/config/.gitignore
index fb84a6a5b1..fb84a6a5b1 100644
--- a/config/.gitignore
+++ b/data/elementary/config/.gitignore
diff --git a/config/Makefile.am b/data/elementary/config/Makefile.am
index 690067909d..692651353e 100644
--- a/config/Makefile.am
+++ b/data/elementary/config/Makefile.am
@@ -1,7 +1,7 @@
1MAINTAINERCLEANFILES = Makefile.in 1MAINTAINERCLEANFILES = Makefile.in
2SUBDIRS = default standard mobile 2SUBDIRS = default standard mobile
3 3
4include ../src/Makefile_Eet_Helper.am 4include ../../../src/Makefile_Eet_Helper.am
5 5
6EXTRA_DIST = profile.src 6EXTRA_DIST = profile.src
7 7
@@ -11,8 +11,8 @@ files_DATA = profile.cfg
11 11
12%.cfg: %.src 12%.cfg: %.src
13 $(AM_V_EET) \ 13 $(AM_V_EET) \
14 $(MKDIR_P) $(top_builddir)/config/; \ 14 $(MKDIR_P) $(top_builddir)/data/elementary/config/; \
15 $(EET) -i $(top_builddir)/config/$@ config $< 0 15 $(EET) -i $(top_builddir)/data/elementary/config/$@ config $< 0
16 16
17clean-local: 17clean-local:
18 rm -rf *.cfg *~ 18 rm -rf *.cfg *~
diff --git a/config/default/Makefile.am b/data/elementary/config/default/Makefile.am
index 6211ff7e1f..3986ae6b20 100644
--- a/config/default/Makefile.am
+++ b/data/elementary/config/default/Makefile.am
@@ -1,6 +1,6 @@
1MAINTAINERCLEANFILES = Makefile.in 1MAINTAINERCLEANFILES = Makefile.in
2 2
3include ../../src/Makefile_Eet_Helper.am 3include ../../../../src/Makefile_Eet_Helper.am
4 4
5EXTRA_DIST = \ 5EXTRA_DIST = \
6 profile.desktop \ 6 profile.desktop \
@@ -15,8 +15,8 @@ files_DATA = \
15 15
16%.cfg: %.src 16%.cfg: %.src
17 $(AM_V_EET) \ 17 $(AM_V_EET) \
18 $(MKDIR_P) $(top_builddir)/config/default/; \ 18 $(MKDIR_P) $(top_builddir)/data/elementary/config/default/; \
19 $(EET) -e $(top_builddir)/config/default/$@ config $< 1 19 $(EET) -e $(top_builddir)/data/elementary/config/default/$@ config $< 1
20 20
21clean-local: 21clean-local:
22 rm -rf *.cfg *~ 22 rm -rf *.cfg *~
diff --git a/config/default/base.src.in b/data/elementary/config/default/base.src.in
index ad01206c7c..ad01206c7c 100644
--- a/config/default/base.src.in
+++ b/data/elementary/config/default/base.src.in
diff --git a/config/default/icon.png b/data/elementary/config/default/icon.png
index 1f33694ace..1f33694ace 100644
--- a/config/default/icon.png
+++ b/data/elementary/config/default/icon.png
Binary files differ
diff --git a/config/default/profile.desktop b/data/elementary/config/default/profile.desktop
index be4045df0b..be4045df0b 100644
--- a/config/default/profile.desktop
+++ b/data/elementary/config/default/profile.desktop
diff --git a/config/mobile/Makefile.am b/data/elementary/config/mobile/Makefile.am
index 7cdfbd5881..2c6c9e2ef7 100644
--- a/config/mobile/Makefile.am
+++ b/data/elementary/config/mobile/Makefile.am
@@ -1,6 +1,6 @@
1MAINTAINERCLEANFILES = Makefile.in 1MAINTAINERCLEANFILES = Makefile.in
2 2
3include ../../src/Makefile_Eet_Helper.am 3include ../../../../src/Makefile_Eet_Helper.am
4 4
5EXTRA_DIST = \ 5EXTRA_DIST = \
6 profile.desktop \ 6 profile.desktop \
@@ -15,8 +15,8 @@ files_DATA = \
15 15
16%.cfg: %.src 16%.cfg: %.src
17 $(AM_V_EET) \ 17 $(AM_V_EET) \
18 $(MKDIR_P) $(top_builddir)/config/; \ 18 $(MKDIR_P) $(top_builddir)/data/elementary/config/; \
19 $(EET) -e $(top_builddir)/config/mobile/$@ config $< 1 19 $(EET) -e $(top_builddir)/data/elementary/config/mobile/$@ config $< 1
20 20
21clean-local: 21clean-local:
22 rm -rf *.cfg *~ 22 rm -rf *.cfg *~
diff --git a/config/mobile/base.src.in b/data/elementary/config/mobile/base.src.in
index c09b2b2c5b..c09b2b2c5b 100644
--- a/config/mobile/base.src.in
+++ b/data/elementary/config/mobile/base.src.in
diff --git a/config/mobile/icon.png b/data/elementary/config/mobile/icon.png
index 9e0ed3dac8..9e0ed3dac8 100644
--- a/config/mobile/icon.png
+++ b/data/elementary/config/mobile/icon.png
Binary files differ
diff --git a/config/mobile/profile.desktop b/data/elementary/config/mobile/profile.desktop
index 9ed279a9d0..9ed279a9d0 100644
--- a/config/mobile/profile.desktop
+++ b/data/elementary/config/mobile/profile.desktop
diff --git a/config/profile.src b/data/elementary/config/profile.src
index aa0bc074b6..aa0bc074b6 100644
--- a/config/profile.src
+++ b/data/elementary/config/profile.src
diff --git a/config/standard/Makefile.am b/data/elementary/config/standard/Makefile.am
index 3dd3c88c68..7ab55d0f80 100644
--- a/config/standard/Makefile.am
+++ b/data/elementary/config/standard/Makefile.am
@@ -1,6 +1,6 @@
1MAINTAINERCLEANFILES = Makefile.in 1MAINTAINERCLEANFILES = Makefile.in
2 2
3include ../../src/Makefile_Eet_Helper.am 3include ../../../../src/Makefile_Eet_Helper.am
4 4
5EXTRA_DIST = \ 5EXTRA_DIST = \
6 profile.desktop \ 6 profile.desktop \
@@ -15,8 +15,8 @@ files_DATA = \
15 15
16%.cfg: %.src 16%.cfg: %.src
17 $(AM_V_EET) \ 17 $(AM_V_EET) \
18 $(MKDIR_P) $(top_builddir)/config/standard/; \ 18 $(MKDIR_P) $(top_builddir)/data/elementary/config/standard/; \
19 $(EET) -e $(top_builddir)/config/standard/$@ config $< 1 19 $(EET) -e $(top_builddir)/data/elementary/config/standard/$@ config $< 1
20 20
21clean-local: 21clean-local:
22 rm -rf *.cfg *~ 22 rm -rf *.cfg *~
diff --git a/config/standard/base.src.in b/data/elementary/config/standard/base.src.in
index cde1824eec..cde1824eec 100644
--- a/config/standard/base.src.in
+++ b/data/elementary/config/standard/base.src.in
diff --git a/config/standard/icon.png b/data/elementary/config/standard/icon.png
index 90b57af47d..90b57af47d 100644
--- a/config/standard/icon.png
+++ b/data/elementary/config/standard/icon.png
Binary files differ
diff --git a/config/standard/profile.desktop b/data/elementary/config/standard/profile.desktop
index 361da2b862..361da2b862 100644
--- a/config/standard/profile.desktop
+++ b/data/elementary/config/standard/profile.desktop