Downgrading to API 1

Also fixed up adaptor integration dir changes

diff --git a/build/tizen/.gitignore b/build/tizen/.gitignore
index 26782ba27b93576a7aebd4b9c59029fad0c4cc7c..7775801be2bf200e8af6d838057851286265a6fa 100644 (file)
--- a/build/tizen/.gitignore
+++ b/build/tizen/.gitignore
@@ -2,7 +2,8 @@ build
 dali.info
 *.dylib
 dali2-*-config.cmake
-libdali2-scene3d.so*
+libdali-scene3d.so*
+libdali-toolkit.so*
 dali-shader-generator
 build.ninja
 rules.ninja

diff --git a/build/tizen/CMakeLists.txt b/build/tizen/CMakeLists.txt
index 58aee9a3427e07750dcdb7134d0b5ae7161d41d3..3ab9ecf263f1cd5e85f425b412df8c3ca2152dde 100644 (file)
--- a/build/tizen/CMakeLists.txt
+++ b/build/tizen/CMakeLists.txt
@@ -1,11 +1,12 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 3.8.2)
 CMAKE_POLICY(SET CMP0012 NEW) # Prevent dereferencing of OFF/ON as variables
 
-SET(name "dali2-toolkit")
+SET(name "dali-toolkit")
 
 SET(CMAKE_C_STANDARD 99)
 SET(CMAKE_CXX_STANDARD 17)
-PROJECT(${name})
+
+PROJECT(dali-toolkit C CXX)
 SET(PKG_NAME ${name})
 
 SET(GCC_COMPILER_VERSION_REQUIRED "6")
@@ -16,7 +17,7 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
 endif()
 
 # API VERSION (Not DALi release version)
-SET(${name}_VERSION_MAJOR 2)
+SET(${name}_VERSION_MAJOR 1)
 SET(${name}_VERSION_MINOR 0)
 SET(${name}_VERSION_PATCH 0)
 SET(${name}_VERSION ${${name}_VERSION_MAJOR}.${${name}_VERSION_MINOR}.${${name}_VERSION_PATCH} )
@@ -41,8 +42,8 @@ OPTION(ENABLE_VECTOR_BASED_TEXT_RENDERING "" OFF)
 IF( ENABLE_PKG_CONFIGURE )
   FIND_PACKAGE( PkgConfig REQUIRED )
 
-  PKG_CHECK_MODULES(DALICORE REQUIRED dali2-core)
-  PKG_CHECK_MODULES(DALIADAPTOR REQUIRED dali2-adaptor)
+  PKG_CHECK_MODULES(DALICORE REQUIRED dali-core)
+  PKG_CHECK_MODULES(DALIADAPTOR REQUIRED dali-adaptor)
 ENDIF()
 
 IF( INSTALL_DOXYGEN_DOC )
@@ -51,13 +52,13 @@ ENDIF()
 
 IF( WIN32 ) # WIN32 includes x64 as well according to the cmake doc.
   FIND_PACKAGE( dali-windows-dependencies REQUIRED)
-  FIND_PACKAGE( dali2-core REQUIRED)
-  FIND_PACKAGE( dali2-adaptor REQUIRED)
+  FIND_PACKAGE( dali-core REQUIRED)
+  FIND_PACKAGE( dali-adaptor REQUIRED)
 ENDIF()
 
 IF ( APPLE )
-  FIND_PACKAGE( dali2-core REQUIRED)
-  FIND_PACKAGE( dali2-adaptor REQUIRED)
+  FIND_PACKAGE( dali-core REQUIRED)
+  FIND_PACKAGE( dali-adaptor REQUIRED)
 ENDIF()
 
 SET( VCPKG_INCLUDE_DIR "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include")
@@ -206,7 +207,7 @@ IF( ENABLE_PKG_CONFIGURE )
   # Requires the following variables to be setup:
   # @PREFIX@ @EXEC_PREFIX@ @DALI_VERSION@ @LIB_DIR@ @DEV_INCLUDE_PATH@
   SET( DEV_INCLUDE_PATH ${INCLUDE_DIR} )
-  SET( CORE_PKG_CFG_FILE dali2-toolkit.pc )
+  SET( CORE_PKG_CFG_FILE dali-toolkit.pc )
   CONFIGURE_FILE( ${CORE_PKG_CFG_FILE}.in ${CORE_PKG_CFG_FILE} @ONLY )
 ENDIF()
 
@@ -327,7 +328,7 @@ ENDIF()
 IF( WIN32 OR APPLE )
   SET( DALICORE_LDFLAGS
         "${DALICORE_LDFLAGS}"
-        dali2-core::dali2-core )
+        dali-core::dali-core )
 
   FIND_PACKAGE( curl REQUIRED )
   FIND_LIBRARY( GETOPT_LIBRARY NAMES getopt )
@@ -353,7 +354,7 @@ IF( WIN32 OR APPLE )
 
   SET( DALIADAPTOR_LDFLAGS
        "${DALIADAPTOR_LDFLAGS}"
-       dali2-adaptor::dali2-adaptor )
+       dali-adaptor::dali-adaptor )
 ENDIF()
 
 IF ( WIN32 )
@@ -597,7 +598,7 @@ IF( DOXYGEN_FOUND )
 
   IF ( BUILD_SCENE3D )
     ADD_CUSTOM_TARGET( doc_doxygen ALL
-      DEPENDS ${name} dali2-scene3d
+      DEPENDS ${name} dali-scene3d
       COMMAND ${DOXYGEN_EXECUTABLE} -u ${DOXYGEN_SRC_DIR}/dali.doxy
       COMMAND ${DOXYGEN_EXECUTABLE} ${DOXYGEN_SRC_DIR}/dali.doxy
       COMMAND ${CMAKE_COMMAND} -P ${DOXYGEN_SRC_DIR}/check_for_errors.cmake

diff --git a/build/tizen/dali-toolkit.pc.in b/build/tizen/dali-toolkit.pc.in
new file mode 100644 (file)
index 0000000..6e1ed27
--- /dev/null
+++ b/build/tizen/dali-toolkit.pc.in
@@ -0,0 +1,12 @@
+prefix=@PREFIX@
+exec_prefix=@EXEC_PREFIX@
+apiversion=@DALI_TOOLKIT_VERSION@
+libdir=@LIB_DIR@
+includedir=@DEV_INCLUDE_PATH@
+
+Name: Dali 3D Engine Toolkit
+Description: Cross platform 3D Engine Toolkit
+Version: ${apiversion}
+Requires: dali-core
+Libs: -L${libdir} -ldali-toolkit
+Cflags: -I${includedir}

diff --git a/build/tizen/dali2-toolkit.pc.in b/build/tizen/dali2-toolkit.pc.in
deleted file mode 100644 (file)
index 70387e5..0000000
--- a/build/tizen/dali2-toolkit.pc.in
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=@PREFIX@
-exec_prefix=@EXEC_PREFIX@
-apiversion=@DALI_TOOLKIT_VERSION@
-libdir=@LIB_DIR@
-includedir=@DEV_INCLUDE_PATH@
-
-Name: Dali 3D Engine Toolkit
-Description: Cross platform 3D Engine Toolkit
-Version: ${apiversion}
-Requires: dali2-core
-Libs: -L${libdir} -ldali2-toolkit
-Cflags: -I${includedir}

diff --git a/dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp b/dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp
index 7ca679cc472fc933706fc21d0cea81228c094126..5bbd497772bcf1638ec15c9e52d07bd35b315b2b 100755 (executable)
--- a/dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp
+++ b/dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp
@@ -27,7 +27,7 @@
 #include <dali/devel-api/actors/actor-devel.h>
 #include <dali/devel-api/object/property-helper-devel.h>
 #include <dali/public-api/object/type-registry-helper.h>
-#include <dali/integration-api/adaptors/adaptor.h>
+#include <dali/integration-api/adaptor-framework/adaptor.h>
 #include <dali/integration-api/debug.h>
 
 // INTERNAL INCLUDES

diff --git a/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp b/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp
index d870272e82f17dc54c498a9f65e0bf8e818ddba2..681e5d3f1e52e2cf86ac28b58f692598965a4cac 100755 (executable)
--- a/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp
+++ b/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp
@@ -27,7 +27,7 @@
 #include <dali/devel-api/object/property-helper-devel.h>
 #include <dali/devel-api/actors/actor-devel.h>
 #include <dali/public-api/object/type-registry-helper.h>
-#include <dali/integration-api/adaptors/adaptor.h>
+#include <dali/integration-api/adaptor-framework/adaptor.h>
 #include <dali/integration-api/debug.h>
 
 // INTERNAL INCLUDES

diff --git a/dali-toolkit/internal/controls/video-view/video-view-impl.cpp b/dali-toolkit/internal/controls/video-view/video-view-impl.cpp
index e20fda51e43c3075de72f2526ee69d7caafd444c..d4eff52434785e87420e0eb4ef704229dca46ff9 100755 (executable)
--- a/dali-toolkit/internal/controls/video-view/video-view-impl.cpp
+++ b/dali-toolkit/internal/controls/video-view/video-view-impl.cpp
@@ -25,7 +25,7 @@
 #include <dali/public-api/common/stage.h>
 #include <dali/devel-api/scripting/scripting.h>
 #include <dali/public-api/adaptor-framework/native-image-source.h>
-#include <dali/integration-api/adaptors/adaptor.h>
+#include <dali/integration-api/adaptor-framework/adaptor.h>
 #include <dali/integration-api/debug.h>
 #include <dali/public-api/animation/constraint.h>
 #include <dali/devel-api/actors/actor-devel.h>

diff --git a/dali-toolkit/internal/controls/video-view/video-view-impl.h b/dali-toolkit/internal/controls/video-view/video-view-impl.h
index 0a05b46936909fc1c110a352e6d5c59c315db159..701191e6061141ca166c7be3992d16d61c135a55 100755 (executable)
--- a/dali-toolkit/internal/controls/video-view/video-view-impl.h
+++ b/dali-toolkit/internal/controls/video-view/video-view-impl.h
@@ -22,7 +22,7 @@
 #include <dali/public-api/object/property-map.h>
 #include <dali/public-api/images/native-image.h>
 #include <dali/devel-api/adaptor-framework/video-player.h>
-#include <dali/integration-api/adaptors/trigger-event-factory.h>
+#include <dali/integration-api/adaptor-framework/trigger-event-factory.h>
 #include <dali/public-api/object/property-notification.h>
 #include <dali/public-api/object/property-conditions.h>
 #include <dali/public-api/rendering/renderer.h>

diff --git a/dali-toolkit/internal/image-loader/async-image-loader-impl.cpp b/dali-toolkit/internal/image-loader/async-image-loader-impl.cpp
index 966da79bcae345ba8bca1015b72d04371bf998a8..e381d26387100969a23ae23c3676733327dd02c0 100644 (file)
--- a/dali-toolkit/internal/image-loader/async-image-loader-impl.cpp
+++ b/dali-toolkit/internal/image-loader/async-image-loader-impl.cpp
@@ -19,7 +19,7 @@
 #include "async-image-loader-impl.h"
 
 // EXTERNAL INCLUDES
-#include <dali/integration-api/adaptors/adaptor.h>
+#include <dali/integration-api/adaptor-framework/adaptor.h>
 
 namespace Dali
 {

diff --git a/dali-toolkit/internal/image-loader/image-load-thread.cpp b/dali-toolkit/internal/image-loader/image-load-thread.cpp
index f4ba3d37304bbd1183ffc2ff5eaf9de1e72c00d6..be057b66fdd5d3f80512adc3ac1f17f4be858de0 100644 (file)
--- a/dali-toolkit/internal/image-loader/image-load-thread.cpp
+++ b/dali-toolkit/internal/image-loader/image-load-thread.cpp
@@ -20,7 +20,7 @@
 
 // EXTERNAL INCLUDES
 #include <dali/devel-api/adaptor-framework/image-loading.h>
-#include <dali/integration-api/adaptors/adaptor.h>
+#include <dali/integration-api/adaptor-framework/adaptor.h>
 #include <dali/devel-api/adaptor-framework/thread-settings.h>
 
 namespace Dali

diff --git a/dali-toolkit/internal/image-loader/image-load-thread.h b/dali-toolkit/internal/image-loader/image-load-thread.h
index bf8eaacd31d12cebdb460ecefff12c1abf369050..a3818e290428bf70a4d326dadbea9945f598a895 100644 (file)
--- a/dali-toolkit/internal/image-loader/image-load-thread.h
+++ b/dali-toolkit/internal/image-loader/image-load-thread.h
@@ -26,7 +26,7 @@
 #include <dali/devel-api/threading/thread.h>
 #include <dali/devel-api/adaptor-framework/event-thread-callback.h>
 #include <dali/devel-api/adaptor-framework/pixel-buffer.h>
-#include <dali/integration-api/adaptors/log-factory-interface.h>
+#include <dali/integration-api/adaptor-framework/log-factory-interface.h>
 #include <dali-toolkit/internal/visuals/visual-url.h>
 
 namespace Dali

diff --git a/dali-toolkit/internal/visuals/animated-vector-image/vector-rasterize-thread.cpp b/dali-toolkit/internal/visuals/animated-vector-image/vector-rasterize-thread.cpp
index c7d7d767f539d1bee7bffc666f49df6adc9da092..4aeabaeabf9b452fc151dcbda798931a0557805c 100644 (file)
--- a/dali-toolkit/internal/visuals/animated-vector-image/vector-rasterize-thread.cpp
+++ b/dali-toolkit/internal/visuals/animated-vector-image/vector-rasterize-thread.cpp
@@ -20,7 +20,7 @@
 
 // EXTERNAL INCLUDES
 #include <dali/devel-api/adaptor-framework/thread-settings.h>
-#include <dali/integration-api/adaptors/adaptor.h>
+#include <dali/integration-api/adaptor-framework/adaptor.h>
 #include <dali/integration-api/debug.h>
 #include <chrono>
 #include <thread>

diff --git a/dali-toolkit/internal/visuals/animated-vector-image/vector-rasterize-thread.h b/dali-toolkit/internal/visuals/animated-vector-image/vector-rasterize-thread.h
index 048645e3ae91832b1555a044720ec1f99201b12e..52d8a909fe773aa1880483019a6721a87ca6ef95 100644 (file)
--- a/dali-toolkit/internal/visuals/animated-vector-image/vector-rasterize-thread.h
+++ b/dali-toolkit/internal/visuals/animated-vector-image/vector-rasterize-thread.h
@@ -23,7 +23,7 @@
 #include <dali/devel-api/threading/conditional-wait.h>
 #include <dali/devel-api/threading/mutex.h>
 #include <dali/devel-api/threading/thread.h>
-#include <dali/integration-api/adaptors/log-factory-interface.h>
+#include <dali/integration-api/adaptor-framework/log-factory-interface.h>
 #include <string>
 #include <memory>