From 87d1b3f7c4f0b8e90601ccc95726c885a528a39d Mon Sep 17 00:00:00 2001
From: Jean-Philippe Andre <jp.andre@samsung.com>
Date: Tue, 16 Aug 2016 17:24:58 +0900
Subject: [PATCH] elm: Hide new init APIs behind BETA tag

This places the following behind beta:
- efl_quicklaunch_fallback
- efl_build_version_set

I don't think EFL_MAIN would have worked without BETA API support,
so no need to expose those for now.

@fix
---
 src/lib/ecore/Ecore_Common.h     |  4 ++++
 src/lib/elementary/elm_general.h | 22 +++++++++++++++++++---
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/src/lib/ecore/Ecore_Common.h b/src/lib/ecore/Ecore_Common.h
index 4c96d17e10..5404438c49 100644
--- a/src/lib/ecore/Ecore_Common.h
+++ b/src/lib/ecore/Ecore_Common.h
@@ -50,12 +50,16 @@ EAPI int ecore_init(void);
  */
 EAPI int ecore_shutdown(void);
 
+#ifdef EFL_BETA_API_SUPPORT
 /**
  * @brief Inform EFL of the version this application was built for.
  *
  * This is transparently called from $EFL_MAIN().
+ *
+ * @since 1.18 (as beta)
  */
 EWAPI void efl_build_version_set(int vmaj, int vmin, int vmic, int revision, const char *flavor, const char *build_id);
+#endif
 
 /**
  * @}
diff --git a/src/lib/elementary/elm_general.h b/src/lib/elementary/elm_general.h
index 6e4b45e1a2..655e8446d3 100644
--- a/src/lib/elementary/elm_general.h
+++ b/src/lib/elementary/elm_general.h
@@ -69,6 +69,19 @@ typedef Eina_Bool             (*Elm_Event_Cb)(void *data, Evas_Object *obj, Evas
 
 extern EAPI double _elm_startup_time;
 
+#ifndef ELM_LIB_QUICKLAUNCH
+#define ELM_MAIN() int main(int argc, char **argv) { int ret; _EFL_APP_VERSION_SET(); _elm_startup_time = ecore_time_unix_get(); elm_init(argc, argv); ret = elm_main(argc, argv); elm_shutdown(); return ret; } /**< macro to be used after the elm_main() function */
+#else
+/** @deprecated macro to be used after the elm_main() function.
+ * Do not define ELM_LIB_QUICKLAUNCH
+ * Compile your programs with -fpie and -pie -rdynamic instead, to generate a single binary (linkable executable).
+ */
+#define ELM_MAIN() int main(int argc, char **argv) { int ret; _EFL_APP_VERSION_SET(); _elm_startup_time = ecore_time_unix_get(); ret = elm_quicklaunch_fallback(argc, argv); elm_shutdown(); return ret; }
+#endif
+
+
+#ifdef EFL_BETA_API_SUPPORT
+
 #ifdef EFL_VERSION_MICRO
 # define _EFL_VERSION_MICRO EFL_VERSION_MICRO
 #else
@@ -96,17 +109,18 @@ extern EAPI double _elm_startup_time;
 #define _EFL_APP_VERSION_SET() do { if (efl_build_version_set) efl_build_version_set(EFL_VERSION_MAJOR, EFL_VERSION_MINOR, _EFL_VERSION_MICRO, _EFL_VERSION_REVISION, _EFL_VERSION_FLAVOR, _EFL_BUILD_ID); } while (0)
 
 #ifndef ELM_LIB_QUICKLAUNCH
-#define ELM_MAIN() int main(int argc, char **argv) { int ret; _EFL_APP_VERSION_SET(); _elm_startup_time = ecore_time_unix_get(); elm_init(argc, argv); ret = elm_main(argc, argv); elm_shutdown(); return ret; } /**< macro to be used after the elm_main() function */
 #define EFL_MAIN() int main(int argc, char **argv) { int ret; _EFL_APP_VERSION_SET(); _elm_startup_time = ecore_time_unix_get(); elm_init(argc, argv); efl_event_callback_add(ecore_main_loop_get(), EFL_LOOP_EVENT_ARGUMENTS, efl_main, NULL); ret = efl_loop_begin(ecore_main_loop_get()); elm_shutdown(); return ret; }
 #else
 /** @deprecated macro to be used after the elm_main() function.
  * Do not define ELM_LIB_QUICKLAUNCH
  * Compile your programs with -fpie and -pie -rdynamic instead, to generate a single binary (linkable executable).
  */
-#define ELM_MAIN() int main(int argc, char **argv) { int ret; _EFL_APP_VERSION_SET(); _elm_startup_time = ecore_time_unix_get(); ret = elm_quicklaunch_fallback(argc, argv); elm_shutdown(); return ret; }
 #define EFL_MAIN() int main(int argc, char **argv) { int ret; _EFL_APP_VERSION_SET(); _elm_startup_time = ecore_time_unix_get(); ret = efl_quicklaunch_fallback(argc, argv); elm_shutdown(); return ret; }
 #endif
 
+#endif /* EFL_BETA_API_SUPPORT */
+
+
 /**************************************************************************/
 /* General calls */
 
@@ -257,11 +271,13 @@ EAPI void      elm_quicklaunch_cleanup(void);
  */
 EAPI int       elm_quicklaunch_fallback(int argc, char **argv);
 
+#ifdef EFL_BETA_API_SUPPORT
 /**
  * Exposed symbol used only by macros and should not be used by apps
+ * @since 1.18 (as beta)
  */
 EAPI int       efl_quicklaunch_fallback(int argc, char **argv);
-
+#endif
 
 /**
  * Exposed symbol used only by macros and should not be used by apps