netstar pushed a commit to branch master.
http://git.enlightenment.org/tools/edi.git/commit/?id=4737aa611c85981b011f3dcbc9fb9c3d269f3acc
commit 4737aa611c85981b011f3dcbc9fb9c3d269f3acc
Author: Al Poole <nets...@gmail.com>
Date: Sun Oct 15 16:29:06 2017 +0100
skeletons: rearrange template/skeleton directory structure
---
COPYING | 2 +-
configure.ac | 2 +-
data/extra/Makefile.am | 2 +-
data/extra/skeleton/Makefile.am | 23 ------------------
data/extra/templates/Makefile.am | 26 +++++++++++++++++++++
data/extra/{skeleton => templates}/eflproject.edc | 2 +-
.../{skeleton => templates}/eflproject_python.edc | 2 +-
data/extra/{skeleton => templates}/images/c.png | Bin
.../{skeleton => templates}/images/python.png | Bin
data/extra/{skeleton => templates}/meson.build | 12 +++++-----
.../skeletons}/eflproject/.gitignore | 0
.../skeletons}/eflproject/AUTHORS | 0
.../skeletons}/eflproject/COPYING | 0
.../skeletons}/eflproject/ChangeLog | 0
.../skeletons}/eflproject/INSTALL | 0
.../skeletons}/eflproject/Makefile.am | 0
.../skeletons}/eflproject/Makefile_Edje_Helper.am | 0
.../skeletons}/eflproject/NEWS | 0
.../skeletons}/eflproject/README | 0
.../skeletons}/eflproject/TODO | 0
.../skeletons}/eflproject/autogen.sh | 0
.../skeletons}/eflproject/configure.ac | 0
.../skeletons}/eflproject/data/Makefile.am | 0
.../eflproject/data/desktop/${edi_name}.desktop.in | 0
.../eflproject/data/desktop/${edi_name}.png | Bin
.../skeletons}/eflproject/data/desktop/Makefile.am | 0
.../skeletons}/eflproject/data/themes/Makefile.am | 0
.../eflproject/data/themes/default/Makefile.am | 0
.../eflproject/data/themes/default/default.edc | 0
.../data/themes/default/images/enlightenment.png | Bin
.../eflproject/data/themes/default/sounds/bell.wav | Bin
.../skeletons}/eflproject/description | 0
.../skeletons}/eflproject/doc/${edi_name}.1.in | 0
.../skeletons}/eflproject/doc/Makefile.am | 0
.../skeletons}/eflproject/m4/efl.m4 | 0
.../skeletons}/eflproject/m4/efl_attribute.m4 | 0
.../skeletons}/eflproject/m4/efl_binary.m4 | 0
.../skeletons}/eflproject/m4/efl_compiler_flag.m4 | 0
.../skeletons}/eflproject/m4/efl_doxygen.m4 | 0
.../skeletons}/eflproject/m4/efl_path_max.m4 | 0
.../skeletons}/eflproject/m4/efl_tests.m4 | 0
.../skeletons}/eflproject/po/Makevars | 0
.../skeletons}/eflproject/po/POTFILES.in | 0
.../skeletons}/eflproject/src/Makefile.am | 0
.../eflproject/src/bin/${edi_name}_main.c | 0
.../eflproject/src/bin/${edi_name}_private.h | 0
.../skeletons}/eflproject/src/bin/Makefile.am | 0
.../skeletons}/eflproject/src/bin/gettext.h | 0
.../skeletons}/eflproject/src/lib/${Edi_Name}.h | 0
.../skeletons}/eflproject/src/lib/${edi_name}.c | 0
.../eflproject/src/lib/${edi_name}_private.h | 0
.../skeletons}/eflproject/src/lib/Makefile.am | 0
.../skeletons}/eflproject/src/tests/Makefile.am | 0
.../eflproject/src/tests/test_${edi_name}.c | 0
.../skeletons}/eflproject_python/COPYING | 0
.../skeletons}/eflproject_python/README | 0
.../skeletons}/eflproject_python/bin/${Edi_Name} | 0
.../data/desktop/${edi_name}.desktop | 0
.../data/icons/48x48/apps/${edi_name}.png | Bin
.../skeletons}/eflproject_python/setup.py | 0
.../skeletons}/eflproject_python/src/__init__.py | 0
.../skeletons}/eflproject_python/src/main.py | 0
data/meson.build | 2 +-
src/bin/screens/edi_welcome.c | 4 ++--
64 files changed, 40 insertions(+), 37 deletions(-)
diff --git a/COPYING b/COPYING
index 739c37e..a7ed6c9 100644
--- a/COPYING
+++ b/COPYING
@@ -6,6 +6,6 @@ With the exception of "edi" which constitutes all remaining work
in this code base the licenses apply to projects within their
own top level directory. The project licenses are as follows:
-data/extra/skeleton No license - public domain
+data/extra/templates/ No license - public domain
edi: COPYING.GPLv2
diff --git a/configure.ac b/configure.ac
index fa72c17..7c7d79a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -180,7 +180,7 @@ data/desktop/edi.desktop
data/themes/Makefile
data/themes/default/Makefile
data/extra/Makefile
-data/extra/skeleton/Makefile
+data/extra/templates/Makefile
doc/Makefile
packaging/Makefile
packaging/pkgbuild/Makefile
diff --git a/data/extra/Makefile.am b/data/extra/Makefile.am
index bd1fba9..e935538 100644
--- a/data/extra/Makefile.am
+++ b/data/extra/Makefile.am
@@ -1,4 +1,4 @@
MAINTAINERCLEANFILES = Makefile.in
-SUBDIRS = skeleton
+SUBDIRS = templates
diff --git a/data/extra/skeleton/Makefile.am b/data/extra/skeleton/Makefile.am
deleted file mode 100644
index 6787854..0000000
--- a/data/extra/skeleton/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-
-MAINTAINERCLEANFILES = Makefile.in
-
-skeletondir = $(datadir)/$(PACKAGE)/skeleton
-skeleton_DATA = \
-eflproject.tar.gz \
-eflproject.edj \
-eflproject_python.tar.gz \
-eflproject_python.edj
-
-eflproject.tar.gz:
- tar zcvf eflproject.tar.gz -C $(srcdir) eflproject
-
-eflproject_python.tar.gz:
- tar zcvf eflproject_python.tar.gz -C $(srcdir) eflproject_python
-
-eflproject.edj:
- edje_cc -id images/ eflproject.edc
-
-eflproject_python.edj:
- edje_cc -id images/ eflproject_python.edc
-
-EXTRA_DIST = $(skeleton_DATA)
diff --git a/data/extra/templates/Makefile.am b/data/extra/templates/Makefile.am
new file mode 100644
index 0000000..cfac464
--- /dev/null
+++ b/data/extra/templates/Makefile.am
@@ -0,0 +1,26 @@
+
+MAINTAINERCLEANFILES = Makefile.in
+
+templatesdir = $(datadir)/$(PACKAGE)/templates
+skeletonsdir = $(datadir)/$(PACKAGE)/templates/skeletons
+templates_DATA = \
+eflproject.edj \
+eflproject_python.edj
+
+skeletons_DATA = \
+eflproject.tar.gz \
+eflproject_python.tar.gz
+
+eflproject.tar.gz:
+ tar zcvf eflproject.tar.gz -C skeletons eflproject
+
+eflproject_python.tar.gz:
+ tar zcvf eflproject_python.tar.gz -C skeletons eflproject_python
+
+eflproject.edj:
+ edje_cc -id images/ eflproject.edc
+
+eflproject_python.edj:
+ edje_cc -id images/ eflproject_python.edc
+
+EXTRA_DIST = $(templates_DATA) $(skeletons_DATA)
diff --git a/data/extra/skeleton/eflproject.edc
b/data/extra/templates/eflproject.edc
similarity index 92%
rename from data/extra/skeleton/eflproject.edc
rename to data/extra/templates/eflproject.edc
index fa5056a..57ec59f 100644
--- a/data/extra/skeleton/eflproject.edc
+++ b/data/extra/templates/eflproject.edc
@@ -1,6 +1,6 @@
data {
item: "title" "C EFL Project";
- item: "file" "eflproject.tar.gz";
+ item: "file" "skeletons/eflproject.tar.gz";
item: "description"
"C EFL Project.<br><br>Begin your C programming EFL project. All content
is freely modifiable and distributable and licensed in the
public-domain.<br><br>Happy hacking!";
diff --git a/data/extra/skeleton/eflproject_python.edc
b/data/extra/templates/eflproject_python.edc
similarity index 91%
rename from data/extra/skeleton/eflproject_python.edc
rename to data/extra/templates/eflproject_python.edc
index 87bd914..98589bf 100644
--- a/data/extra/skeleton/eflproject_python.edc
+++ b/data/extra/templates/eflproject_python.edc
@@ -1,6 +1,6 @@
data {
item: "title" "Python EFL Project";
- item: "file" "eflproject_python.tar.gz";
+ item: "file" "skeletons/eflproject_python.tar.gz";
item: "description"
"Python EFL Project.<br><br>Start your new EFL Python programming project.
All code is in the public-domain, you are free to modify and distribute as you
wish.";
diff --git a/data/extra/skeleton/images/c.png
b/data/extra/templates/images/c.png
similarity index 100%
rename from data/extra/skeleton/images/c.png
rename to data/extra/templates/images/c.png
diff --git a/data/extra/skeleton/images/python.png
b/data/extra/templates/images/python.png
similarity index 100%
rename from data/extra/skeleton/images/python.png
rename to data/extra/templates/images/python.png
diff --git a/data/extra/skeleton/meson.build b/data/extra/templates/meson.build
similarity index 75%
rename from data/extra/skeleton/meson.build
rename to data/extra/templates/meson.build
index 7ae8183..b806e58 100644
--- a/data/extra/skeleton/meson.build
+++ b/data/extra/templates/meson.build
@@ -6,17 +6,17 @@ skeleton_names = ['eflproject', 'eflproject_python']
foreach skeleton_name : skeleton_names
custom_target('skeleton ' + skeleton_name,
- command : [tar, 'zcf', '@OUTPUT@', '-C', '../data/extra/skeleton',
skeleton_name],
- input : skeleton_name,
+ command : [tar, 'zcf', '@OUTPUT@', '-C',
'../data/extra/templates/skeletons', skeleton_name],
+ input : 'skeletons' + '/' + skeleton_name,
output : skeleton_name + '.tar.gz',
- install_dir: join_paths(get_option('prefix'), get_option('datadir'),
'edi', 'skeleton'),
+ install_dir: join_paths(get_option('prefix'), get_option('datadir'),
'edi', 'templates', 'skeletons'),
install : true,
)
endforeach
cmd = [ edje_cc,
- '-id', join_paths(meson.source_root(), 'data' , 'extra', 'skeleton',
'images'),
+ '-id', join_paths(meson.source_root(), 'data' , 'extra', 'templates',
'images'),
'@INPUT@', '@OUTPUT@'
]
@@ -27,10 +27,10 @@ foreach meta : skeleton_meta
input : meta + '.edc',
output : meta + '.edj',
command : cmd,
- install_dir: join_paths(get_option('prefix'), get_option('datadir'),
'edi', 'skeleton'),
+ install_dir: join_paths(get_option('prefix'), get_option('datadir'),
'edi', 'templates'),
install: true,
)
- out = join_paths(get_option('prefix'), get_option('datadir'), 'edi',
'skeleton') + '/' + meta + '.edj'
+ out = join_paths(get_option('prefix'), get_option('datadir'), 'edi',
'templates') + '/' + meta + '.edj'
meson.add_install_script('chmod', 'a+r', out)
endforeach
diff --git a/data/extra/skeleton/eflproject/.gitignore
b/data/extra/templates/skeletons/eflproject/.gitignore
similarity index 100%
rename from data/extra/skeleton/eflproject/.gitignore
rename to data/extra/templates/skeletons/eflproject/.gitignore
diff --git a/data/extra/skeleton/eflproject/AUTHORS
b/data/extra/templates/skeletons/eflproject/AUTHORS
similarity index 100%
rename from data/extra/skeleton/eflproject/AUTHORS
rename to data/extra/templates/skeletons/eflproject/AUTHORS
diff --git a/data/extra/skeleton/eflproject/COPYING
b/data/extra/templates/skeletons/eflproject/COPYING
similarity index 100%
rename from data/extra/skeleton/eflproject/COPYING
rename to data/extra/templates/skeletons/eflproject/COPYING
diff --git a/data/extra/skeleton/eflproject/ChangeLog
b/data/extra/templates/skeletons/eflproject/ChangeLog
similarity index 100%
rename from data/extra/skeleton/eflproject/ChangeLog
rename to data/extra/templates/skeletons/eflproject/ChangeLog
diff --git a/data/extra/skeleton/eflproject/INSTALL
b/data/extra/templates/skeletons/eflproject/INSTALL
similarity index 100%
rename from data/extra/skeleton/eflproject/INSTALL
rename to data/extra/templates/skeletons/eflproject/INSTALL
diff --git a/data/extra/skeleton/eflproject/Makefile.am
b/data/extra/templates/skeletons/eflproject/Makefile.am
similarity index 100%
rename from data/extra/skeleton/eflproject/Makefile.am
rename to data/extra/templates/skeletons/eflproject/Makefile.am
diff --git a/data/extra/skeleton/eflproject/Makefile_Edje_Helper.am
b/data/extra/templates/skeletons/eflproject/Makefile_Edje_Helper.am
similarity index 100%
rename from data/extra/skeleton/eflproject/Makefile_Edje_Helper.am
rename to data/extra/templates/skeletons/eflproject/Makefile_Edje_Helper.am
diff --git a/data/extra/skeleton/eflproject/NEWS
b/data/extra/templates/skeletons/eflproject/NEWS
similarity index 100%
rename from data/extra/skeleton/eflproject/NEWS
rename to data/extra/templates/skeletons/eflproject/NEWS
diff --git a/data/extra/skeleton/eflproject/README
b/data/extra/templates/skeletons/eflproject/README
similarity index 100%
rename from data/extra/skeleton/eflproject/README
rename to data/extra/templates/skeletons/eflproject/README
diff --git a/data/extra/skeleton/eflproject/TODO
b/data/extra/templates/skeletons/eflproject/TODO
similarity index 100%
rename from data/extra/skeleton/eflproject/TODO
rename to data/extra/templates/skeletons/eflproject/TODO
diff --git a/data/extra/skeleton/eflproject/autogen.sh
b/data/extra/templates/skeletons/eflproject/autogen.sh
similarity index 100%
rename from data/extra/skeleton/eflproject/autogen.sh
rename to data/extra/templates/skeletons/eflproject/autogen.sh
diff --git a/data/extra/skeleton/eflproject/configure.ac
b/data/extra/templates/skeletons/eflproject/configure.ac
similarity index 100%
rename from data/extra/skeleton/eflproject/configure.ac
rename to data/extra/templates/skeletons/eflproject/configure.ac
diff --git a/data/extra/skeleton/eflproject/data/Makefile.am
b/data/extra/templates/skeletons/eflproject/data/Makefile.am
similarity index 100%
rename from data/extra/skeleton/eflproject/data/Makefile.am
rename to data/extra/templates/skeletons/eflproject/data/Makefile.am
diff --git a/data/extra/skeleton/eflproject/data/desktop/${edi_name}.desktop.in
b/data/extra/templates/skeletons/eflproject/data/desktop/${edi_name}.desktop.in
similarity index 100%
rename from data/extra/skeleton/eflproject/data/desktop/${edi_name}.desktop.in
rename to
data/extra/templates/skeletons/eflproject/data/desktop/${edi_name}.desktop.in
diff --git a/data/extra/skeleton/eflproject/data/desktop/${edi_name}.png
b/data/extra/templates/skeletons/eflproject/data/desktop/${edi_name}.png
similarity index 100%
rename from data/extra/skeleton/eflproject/data/desktop/${edi_name}.png
rename to data/extra/templates/skeletons/eflproject/data/desktop/${edi_name}.png
diff --git a/data/extra/skeleton/eflproject/data/desktop/Makefile.am
b/data/extra/templates/skeletons/eflproject/data/desktop/Makefile.am
similarity index 100%
rename from data/extra/skeleton/eflproject/data/desktop/Makefile.am
rename to data/extra/templates/skeletons/eflproject/data/desktop/Makefile.am
diff --git a/data/extra/skeleton/eflproject/data/themes/Makefile.am
b/data/extra/templates/skeletons/eflproject/data/themes/Makefile.am
similarity index 100%
rename from data/extra/skeleton/eflproject/data/themes/Makefile.am
rename to data/extra/templates/skeletons/eflproject/data/themes/Makefile.am
diff --git a/data/extra/skeleton/eflproject/data/themes/default/Makefile.am
b/data/extra/templates/skeletons/eflproject/data/themes/default/Makefile.am
similarity index 100%
rename from data/extra/skeleton/eflproject/data/themes/default/Makefile.am
rename to
data/extra/templates/skeletons/eflproject/data/themes/default/Makefile.am
diff --git a/data/extra/skeleton/eflproject/data/themes/default/default.edc
b/data/extra/templates/skeletons/eflproject/data/themes/default/default.edc
similarity index 100%
rename from data/extra/skeleton/eflproject/data/themes/default/default.edc
rename to
data/extra/templates/skeletons/eflproject/data/themes/default/default.edc
diff --git
a/data/extra/skeleton/eflproject/data/themes/default/images/enlightenment.png
b/data/extra/templates/skeletons/eflproject/data/themes/default/images/enlightenment.png
similarity index 100%
rename from
data/extra/skeleton/eflproject/data/themes/default/images/enlightenment.png
rename to
data/extra/templates/skeletons/eflproject/data/themes/default/images/enlightenment.png
diff --git a/data/extra/skeleton/eflproject/data/themes/default/sounds/bell.wav
b/data/extra/templates/skeletons/eflproject/data/themes/default/sounds/bell.wav
similarity index 100%
rename from data/extra/skeleton/eflproject/data/themes/default/sounds/bell.wav
rename to
data/extra/templates/skeletons/eflproject/data/themes/default/sounds/bell.wav
diff --git a/data/extra/skeleton/eflproject/description
b/data/extra/templates/skeletons/eflproject/description
similarity index 100%
rename from data/extra/skeleton/eflproject/description
rename to data/extra/templates/skeletons/eflproject/description
diff --git a/data/extra/skeleton/eflproject/doc/${edi_name}.1.in
b/data/extra/templates/skeletons/eflproject/doc/${edi_name}.1.in
similarity index 100%
rename from data/extra/skeleton/eflproject/doc/${edi_name}.1.in
rename to data/extra/templates/skeletons/eflproject/doc/${edi_name}.1.in
diff --git a/data/extra/skeleton/eflproject/doc/Makefile.am
b/data/extra/templates/skeletons/eflproject/doc/Makefile.am
similarity index 100%
rename from data/extra/skeleton/eflproject/doc/Makefile.am
rename to data/extra/templates/skeletons/eflproject/doc/Makefile.am
diff --git a/data/extra/skeleton/eflproject/m4/efl.m4
b/data/extra/templates/skeletons/eflproject/m4/efl.m4
similarity index 100%
rename from data/extra/skeleton/eflproject/m4/efl.m4
rename to data/extra/templates/skeletons/eflproject/m4/efl.m4
diff --git a/data/extra/skeleton/eflproject/m4/efl_attribute.m4
b/data/extra/templates/skeletons/eflproject/m4/efl_attribute.m4
similarity index 100%
rename from data/extra/skeleton/eflproject/m4/efl_attribute.m4
rename to data/extra/templates/skeletons/eflproject/m4/efl_attribute.m4
diff --git a/data/extra/skeleton/eflproject/m4/efl_binary.m4
b/data/extra/templates/skeletons/eflproject/m4/efl_binary.m4
similarity index 100%
rename from data/extra/skeleton/eflproject/m4/efl_binary.m4
rename to data/extra/templates/skeletons/eflproject/m4/efl_binary.m4
diff --git a/data/extra/skeleton/eflproject/m4/efl_compiler_flag.m4
b/data/extra/templates/skeletons/eflproject/m4/efl_compiler_flag.m4
similarity index 100%
rename from data/extra/skeleton/eflproject/m4/efl_compiler_flag.m4
rename to data/extra/templates/skeletons/eflproject/m4/efl_compiler_flag.m4
diff --git a/data/extra/skeleton/eflproject/m4/efl_doxygen.m4
b/data/extra/templates/skeletons/eflproject/m4/efl_doxygen.m4
similarity index 100%
rename from data/extra/skeleton/eflproject/m4/efl_doxygen.m4
rename to data/extra/templates/skeletons/eflproject/m4/efl_doxygen.m4
diff --git a/data/extra/skeleton/eflproject/m4/efl_path_max.m4
b/data/extra/templates/skeletons/eflproject/m4/efl_path_max.m4
similarity index 100%
rename from data/extra/skeleton/eflproject/m4/efl_path_max.m4
rename to data/extra/templates/skeletons/eflproject/m4/efl_path_max.m4
diff --git a/data/extra/skeleton/eflproject/m4/efl_tests.m4
b/data/extra/templates/skeletons/eflproject/m4/efl_tests.m4
similarity index 100%
rename from data/extra/skeleton/eflproject/m4/efl_tests.m4
rename to data/extra/templates/skeletons/eflproject/m4/efl_tests.m4
diff --git a/data/extra/skeleton/eflproject/po/Makevars
b/data/extra/templates/skeletons/eflproject/po/Makevars
similarity index 100%
rename from data/extra/skeleton/eflproject/po/Makevars
rename to data/extra/templates/skeletons/eflproject/po/Makevars
diff --git a/data/extra/skeleton/eflproject/po/POTFILES.in
b/data/extra/templates/skeletons/eflproject/po/POTFILES.in
similarity index 100%
rename from data/extra/skeleton/eflproject/po/POTFILES.in
rename to data/extra/templates/skeletons/eflproject/po/POTFILES.in
diff --git a/data/extra/skeleton/eflproject/src/Makefile.am
b/data/extra/templates/skeletons/eflproject/src/Makefile.am
similarity index 100%
rename from data/extra/skeleton/eflproject/src/Makefile.am
rename to data/extra/templates/skeletons/eflproject/src/Makefile.am
diff --git a/data/extra/skeleton/eflproject/src/bin/${edi_name}_main.c
b/data/extra/templates/skeletons/eflproject/src/bin/${edi_name}_main.c
similarity index 100%
rename from data/extra/skeleton/eflproject/src/bin/${edi_name}_main.c
rename to data/extra/templates/skeletons/eflproject/src/bin/${edi_name}_main.c
diff --git a/data/extra/skeleton/eflproject/src/bin/${edi_name}_private.h
b/data/extra/templates/skeletons/eflproject/src/bin/${edi_name}_private.h
similarity index 100%
rename from data/extra/skeleton/eflproject/src/bin/${edi_name}_private.h
rename to
data/extra/templates/skeletons/eflproject/src/bin/${edi_name}_private.h
diff --git a/data/extra/skeleton/eflproject/src/bin/Makefile.am
b/data/extra/templates/skeletons/eflproject/src/bin/Makefile.am
similarity index 100%
rename from data/extra/skeleton/eflproject/src/bin/Makefile.am
rename to data/extra/templates/skeletons/eflproject/src/bin/Makefile.am
diff --git a/data/extra/skeleton/eflproject/src/bin/gettext.h
b/data/extra/templates/skeletons/eflproject/src/bin/gettext.h
similarity index 100%
rename from data/extra/skeleton/eflproject/src/bin/gettext.h
rename to data/extra/templates/skeletons/eflproject/src/bin/gettext.h
diff --git a/data/extra/skeleton/eflproject/src/lib/${Edi_Name}.h
b/data/extra/templates/skeletons/eflproject/src/lib/${Edi_Name}.h
similarity index 100%
rename from data/extra/skeleton/eflproject/src/lib/${Edi_Name}.h
rename to data/extra/templates/skeletons/eflproject/src/lib/${Edi_Name}.h
diff --git a/data/extra/skeleton/eflproject/src/lib/${edi_name}.c
b/data/extra/templates/skeletons/eflproject/src/lib/${edi_name}.c
similarity index 100%
rename from data/extra/skeleton/eflproject/src/lib/${edi_name}.c
rename to data/extra/templates/skeletons/eflproject/src/lib/${edi_name}.c
diff --git a/data/extra/skeleton/eflproject/src/lib/${edi_name}_private.h
b/data/extra/templates/skeletons/eflproject/src/lib/${edi_name}_private.h
similarity index 100%
rename from data/extra/skeleton/eflproject/src/lib/${edi_name}_private.h
rename to
data/extra/templates/skeletons/eflproject/src/lib/${edi_name}_private.h
diff --git a/data/extra/skeleton/eflproject/src/lib/Makefile.am
b/data/extra/templates/skeletons/eflproject/src/lib/Makefile.am
similarity index 100%
rename from data/extra/skeleton/eflproject/src/lib/Makefile.am
rename to data/extra/templates/skeletons/eflproject/src/lib/Makefile.am
diff --git a/data/extra/skeleton/eflproject/src/tests/Makefile.am
b/data/extra/templates/skeletons/eflproject/src/tests/Makefile.am
similarity index 100%
rename from data/extra/skeleton/eflproject/src/tests/Makefile.am
rename to data/extra/templates/skeletons/eflproject/src/tests/Makefile.am
diff --git a/data/extra/skeleton/eflproject/src/tests/test_${edi_name}.c
b/data/extra/templates/skeletons/eflproject/src/tests/test_${edi_name}.c
similarity index 100%
rename from data/extra/skeleton/eflproject/src/tests/test_${edi_name}.c
rename to data/extra/templates/skeletons/eflproject/src/tests/test_${edi_name}.c
diff --git a/data/extra/skeleton/eflproject_python/COPYING
b/data/extra/templates/skeletons/eflproject_python/COPYING
similarity index 100%
rename from data/extra/skeleton/eflproject_python/COPYING
rename to data/extra/templates/skeletons/eflproject_python/COPYING
diff --git a/data/extra/skeleton/eflproject_python/README
b/data/extra/templates/skeletons/eflproject_python/README
similarity index 100%
rename from data/extra/skeleton/eflproject_python/README
rename to data/extra/templates/skeletons/eflproject_python/README
diff --git a/data/extra/skeleton/eflproject_python/bin/${Edi_Name}
b/data/extra/templates/skeletons/eflproject_python/bin/${Edi_Name}
similarity index 100%
rename from data/extra/skeleton/eflproject_python/bin/${Edi_Name}
rename to data/extra/templates/skeletons/eflproject_python/bin/${Edi_Name}
diff --git
a/data/extra/skeleton/eflproject_python/data/desktop/${edi_name}.desktop
b/data/extra/templates/skeletons/eflproject_python/data/desktop/${edi_name}.desktop
similarity index 100%
rename from
data/extra/skeleton/eflproject_python/data/desktop/${edi_name}.desktop
rename to
data/extra/templates/skeletons/eflproject_python/data/desktop/${edi_name}.desktop
diff --git
a/data/extra/skeleton/eflproject_python/data/icons/48x48/apps/${edi_name}.png
b/data/extra/templates/skeletons/eflproject_python/data/icons/48x48/apps/${edi_name}.png
similarity index 100%
rename from
data/extra/skeleton/eflproject_python/data/icons/48x48/apps/${edi_name}.png
rename to
data/extra/templates/skeletons/eflproject_python/data/icons/48x48/apps/${edi_name}.png
diff --git a/data/extra/skeleton/eflproject_python/setup.py
b/data/extra/templates/skeletons/eflproject_python/setup.py
similarity index 100%
rename from data/extra/skeleton/eflproject_python/setup.py
rename to data/extra/templates/skeletons/eflproject_python/setup.py
diff --git a/data/extra/skeleton/eflproject_python/src/__init__.py
b/data/extra/templates/skeletons/eflproject_python/src/__init__.py
similarity index 100%
rename from data/extra/skeleton/eflproject_python/src/__init__.py
rename to data/extra/templates/skeletons/eflproject_python/src/__init__.py
diff --git a/data/extra/skeleton/eflproject_python/src/main.py
b/data/extra/templates/skeletons/eflproject_python/src/main.py
similarity index 100%
rename from data/extra/skeleton/eflproject_python/src/main.py
rename to data/extra/templates/skeletons/eflproject_python/src/main.py
diff --git a/data/meson.build b/data/meson.build
index 49fa804..36ee18d 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -1,3 +1,3 @@
subdir('desktop')
subdir('images')
-subdir('extra/skeleton')
+subdir('extra/templates')
diff --git a/src/bin/screens/edi_welcome.c b/src/bin/screens/edi_welcome.c
index fd919a0..78bd2d0 100644
--- a/src/bin/screens/edi_welcome.c
+++ b/src/bin/screens/edi_welcome.c
@@ -487,9 +487,9 @@ _edi_welcome_project_new_cb(void *data, Evas_Object *obj
EINA_UNUSED, void *even
EINA_LIST_FREE(_available_templates, template)
_edi_template_free(template);
- snprintf(path, sizeof(path), "%s/skeleton", _edi_config_dir_get());
+ snprintf(path, sizeof(path), "%s/templates", _edi_config_dir_get());
- _edi_templates_discover(PACKAGE_DATA_DIR "/skeleton");
+ _edi_templates_discover(PACKAGE_DATA_DIR "/templates");
_edi_templates_discover(path);
content = elm_box_add(naviframe);
--
