Remove control-depth-index-ranges.h as it was never actually installed, install devel...

The public-api file was not actually ever installed and was erroneously put in the public-api folder.
This change also ensures that the devel-api version is installed (we can still change this as it is not public-api)

Change-Id: Iff2cabf197e1454e18e9e6e876650d2859f0dec7

diff --git a/build/tizen/dali-toolkit/Makefile.am b/build/tizen/dali-toolkit/Makefile.am
index 0e36158..3d63299 100644 (file)
--- a/build/tizen/dali-toolkit/Makefile.am
+++ b/build/tizen/dali-toolkit/Makefile.am
@@ -106,6 +106,7 @@ develapitoolbardir =            $(develapicontrolsdir)/tool-bar
 develapitextselectionpopupdir = $(develapicontrolsdir)/text-controls
 
 # devel headers
 develapitextselectionpopupdir = $(develapicontrolsdir)/text-controls
 
 # devel headers

+develapicontrols_HEADERS =          $(devel_api_controls_header_files)

 develapibloomview_HEADERS =         $(devel_api_bloom_view_header_files)
 develapibubbleemitter_HEADERS =     $(devel_api_bubble_emitter_header_files)
 develapibuilder_HEADERS =           $(devel_api_builder_header_files)
 develapibloomview_HEADERS =         $(devel_api_bloom_view_header_files)
 develapibubbleemitter_HEADERS =     $(devel_api_bubble_emitter_header_files)
 develapibuilder_HEADERS =           $(devel_api_builder_header_files)


@@ -126,44 +127,44 @@ develapitransitioneffects_HEADERS = $(devel_api_transition_effects_header_files)
 develapitextselectionpopup_HEADERS = $(devel_api_text_controls_header_files)
 
 # public api source
 develapitextselectionpopup_HEADERS = $(devel_api_text_controls_header_files)
 
 # public api source

-publicapidir =                    $(topleveldir)/public-api
-publicapicontrolsdir =            $(publicapidir)/controls
-develapiaccessibilitymanagerdir = $(publicapidir)/accessibility-manager
-publicapialignmentdir =           $(publicapicontrolsdir)/alignment
-publicapibuttonsdir =             $(publicapicontrolsdir)/buttons
-publicapidefaultcontrolsdir =     $(publicapicontrolsdir)/default-controls
-publicapigaussianblurviewdir =    $(publicapicontrolsdir)/gaussian-blur-view
-publicapiimageviewdir =           $(publicapicontrolsdir)/image-view
-publicapimodel3dviewdir =         $(publicapicontrolsdir)/model3d-view
-publicapipageturnviewdir =        $(publicapicontrolsdir)/page-turn-view
-publicapiscrollbardir =           $(publicapicontrolsdir)/scroll-bar
-publicapiscrollabledir =          $(publicapicontrolsdir)/scrollable
-publicapiscrollviewdir =          $(publicapicontrolsdir)/scrollable/scroll-view
-publicapiitemviewdir =            $(publicapicontrolsdir)/scrollable/item-view
-publicapitableviewdir =           $(publicapicontrolsdir)/table-view
-publicapitextcontrolsdir =        $(publicapicontrolsdir)/text-controls
-publicapifocusmanagerdir =        $(publicapidir)/focus-manager
-publicapirenderingbackenddir =    $(publicapidir)/text
+publicapidir =                     $(topleveldir)/public-api
+publicapicontrolsdir =             $(publicapidir)/controls
+publicapiaccessibilitymanagerdir = $(publicapidir)/accessibility-manager
+publicapialignmentdir =            $(publicapicontrolsdir)/alignment
+publicapibuttonsdir =              $(publicapicontrolsdir)/buttons
+publicapidefaultcontrolsdir =      $(publicapicontrolsdir)/default-controls
+publicapigaussianblurviewdir =     $(publicapicontrolsdir)/gaussian-blur-view
+publicapiimageviewdir =            $(publicapicontrolsdir)/image-view
+publicapimodel3dviewdir =          $(publicapicontrolsdir)/model3d-view
+publicapipageturnviewdir =         $(publicapicontrolsdir)/page-turn-view
+publicapiscrollbardir =            $(publicapicontrolsdir)/scroll-bar
+publicapiscrollabledir =           $(publicapicontrolsdir)/scrollable
+publicapiscrollviewdir =           $(publicapicontrolsdir)/scrollable/scroll-view
+publicapiitemviewdir =             $(publicapicontrolsdir)/scrollable/item-view
+publicapitableviewdir =            $(publicapicontrolsdir)/table-view
+publicapitextcontrolsdir =         $(publicapicontrolsdir)/text-controls
+publicapifocusmanagerdir =         $(publicapidir)/focus-manager
+publicapirenderingbackenddir =     $(publicapidir)/text

 
 # public api headers
 
 # public api headers

-publicapi_HEADERS =                    $(public_api_header_files)
-publicapicontrols_HEADERS =            $(public_api_controls_header_files)
-develapiaccessibilitymanager_HEADERS = $(public_api_accessibility_manager_header_files)
-publicapialignment_HEADERS =           $(public_api_alignment_header_files)
-publicapibuttons_HEADERS =             $(public_api_buttons_header_files)
-publicapidefaultcontrols_HEADERS =     $(public_api_default_controls_header_files)
-publicapigaussianblurview_HEADERS =    $(public_api_gaussian_blur_view_header_files)
-publicapiimageview_HEADERS =           $(public_api_image_view_header_files)
-publicapiitemview_HEADERS =            $(public_api_item_view_header_files)
-publicapimodel3dview_HEADERS =         $(public_api_model3d_view_header_files)
-publicapipageturnview_HEADERS =        $(public_api_page_turn_view_header_files)
-publicapiscrollbar_HEADERS =           $(public_api_scroll_bar_header_files)
-publicapiscrollable_HEADERS =          $(public_api_scrollable_header_files)
-publicapiscrollview_HEADERS =          $(public_api_scroll_view_header_files)
-publicapitableview_HEADERS =           $(public_api_table_view_header_files)
-publicapitextcontrols_HEADERS =        $(public_api_text_controls_header_files)
-publicapifocusmanager_HEADERS =        $(public_api_focus_manager_header_files)
-publicapirenderingbackend_HEADERS =    $(public_api_rendering_backend_header_files)
+publicapi_HEADERS =                     $(public_api_header_files)
+publicapicontrols_HEADERS =             $(public_api_controls_header_files)
+publicapiaccessibilitymanager_HEADERS = $(public_api_accessibility_manager_header_files)
+publicapialignment_HEADERS =            $(public_api_alignment_header_files)
+publicapibuttons_HEADERS =              $(public_api_buttons_header_files)
+publicapidefaultcontrols_HEADERS =      $(public_api_default_controls_header_files)
+publicapigaussianblurview_HEADERS =     $(public_api_gaussian_blur_view_header_files)
+publicapiimageview_HEADERS =            $(public_api_image_view_header_files)
+publicapiitemview_HEADERS =             $(public_api_item_view_header_files)
+publicapimodel3dview_HEADERS =          $(public_api_model3d_view_header_files)
+publicapipageturnview_HEADERS =         $(public_api_page_turn_view_header_files)
+publicapiscrollbar_HEADERS =            $(public_api_scroll_bar_header_files)
+publicapiscrollable_HEADERS =           $(public_api_scrollable_header_files)
+publicapiscrollview_HEADERS =           $(public_api_scroll_view_header_files)
+publicapitableview_HEADERS =            $(public_api_table_view_header_files)
+publicapitextcontrols_HEADERS =         $(public_api_text_controls_header_files)
+publicapifocusmanager_HEADERS =         $(public_api_focus_manager_header_files)
+publicapirenderingbackend_HEADERS =     $(public_api_rendering_backend_header_files)

 
 # package doxygen file (contains doxygen grouping information)
 packagedoxydir = $(topleveldir)/doc
 
 # package doxygen file (contains doxygen grouping information)
 packagedoxydir = $(topleveldir)/doc

diff --git a/dali-toolkit/devel-api/file.list b/dali-toolkit/devel-api/file.list
index ff91aa7..a2220cd 100755 (executable)
--- a/dali-toolkit/devel-api/file.list
+++ b/dali-toolkit/devel-api/file.list
@@ -30,6 +30,9 @@ devel_api_src_files = \
 
 # Add devel header files here
 
 
 # Add devel header files here
 

+devel_api_controls_header_files = \
+  $(devel_api_src_dir)/controls/control-depth-index-ranges.h
+

 devel_api_bloom_view_header_files = \
   $(devel_api_src_dir)/controls/bloom-view/bloom-view.h
 
 devel_api_bloom_view_header_files = \
   $(devel_api_src_dir)/controls/bloom-view/bloom-view.h
 

diff --git a/dali-toolkit/public-api/controls/control-depth-index-ranges.h b/dali-toolkit/public-api/controls/control-depth-index-ranges.h
deleted file mode 100644 (file)
index 684d258..0000000
--- a/dali-toolkit/public-api/controls/control-depth-index-ranges.h
+++ /dev/null
@@ -1,53 +0,0 @@
-#ifndef __DALI_TOOLKIT_CONTROL_DEPTH_INDEX_RANGES_H__
-#define __DALI_TOOLKIT_CONTROL_DEPTH_INDEX_RANGES_H__
-
-/*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// EXTERNAL INCLUDES
-#include <dali/public-api/actors/layer.h>
-
-namespace Dali
-{
-namespace Toolkit
-{
-/**
- * @addtogroup dali_toolkit_controls
- * @{
- */
-
-/**
- * @DEPRECATED_1_1.16
- *
- * @brief These depth indices should not be used.
- * @SINCE_1_0.0
- */
-enum DepthIndexRanges
-{
-    BACKGROUND_DEPTH_INDEX    = static_cast<int>( -Dali::Layer::TREE_DEPTH_MULTIPLIER * 0.1f ), ///< @DEPRECATED_1_1.16 @SINCE_1_0.0
-    CONTENT_DEPTH_INDEX       = 0,                                                              ///< @DEPRECATED_1_1.16 @SINCE_1_0.0
-    DECORATION_DEPTH_INDEX    = static_cast<int>( Dali::Layer::TREE_DEPTH_MULTIPLIER * 0.1f )   ///< @DEPRECATED_1_1.16 @SINCE_1_0.0
-};
-
-/**
- * @}
- */
-}
-
-}
-
-#endif