skeletons: rearrange template/skeleton directory structure

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
 

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

data/extra/Makefile.am

@@ -1,4 +1,4 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-SUBDIRS = skeleton
+SUBDIRS = templates
 

data/extra/skeleton/Makefile.am

@@ -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)

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)

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!";    

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.";

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
 

data/meson.build

@@ -1,3 +1,3 @@
 subdir('desktop')
 subdir('images')
-subdir('extra/skeleton')
+subdir('extra/templates')

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);