lottie: rename lottie-player to rlottie for cmake and gbs build, update namespace...

Change-Id: I51f85201c06be4cb42c2036a0162b9124149e781

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 38a8a7a..facf8e7 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,26 +1,26 @@
 cmake_minimum_required( VERSION 3.2 )
 
 #declare project
-project( lottie-player VERSION 0.0.1 LANGUAGES C CXX ASM)
+project( rlottie VERSION 0.0.1 LANGUAGES C CXX ASM)
 
 #declare target
-add_library( lottie-player SHARED  "" )
+add_library( rlottie SHARED  "" )
 
 #declare version of the target
-set(player_version_major 0)
-set(player_version_minor 0)
-set(player_version_patch 1)
-set(player_version ${player_version_major}.${player_version_minor}.${player_version_patch} )
-set_target_properties(lottie-player PROPERTIES
-                        VERSION    ${player_version}
-                        SOVERSION  ${player_version_major}
+set(rlottie_version_major 0)
+set(rlottie_version_minor 0)
+set(rlottie_version_patch 1)
+set(rlottie_version ${rlottie_version_major}.${rlottie_version_minor}.${rlottie_version_patch} )
+set_target_properties(rlottie PROPERTIES
+                        VERSION    ${rlottie_version}
+                        SOVERSION  ${rlottie_version_major}
                       )
 
 #declare alias so that library can be used inside the build tree, e.g. when testing
-add_library(lottie-player::lottie-player ALIAS lottie-player)
+add_library(rlottie::rlottie ALIAS rlottie)
 
 #declare target compilation options
-target_compile_options(lottie-player
+target_compile_options(rlottie
                     PUBLIC
                         -std=c++14
                     PRIVATE
@@ -30,17 +30,17 @@ target_compile_options(lottie-player
 set( CMAKE_THREAD_PREFER_PTHREAD TRUE )
 find_package( Threads )
 
-target_link_libraries(lottie-player
+target_link_libraries(rlottie
                     PUBLIC
                         "${CMAKE_THREAD_LIBS_INIT}"
                      )
 
 # for dlopen, dlsym and dlclose dependancy
-target_link_libraries(lottie-player
+target_link_libraries(rlottie
                     PRIVATE
                     ${CMAKE_DL_LIBS})
 
-target_link_libraries(lottie-player
+target_link_libraries(rlottie
                     PUBLIC
                          "-Wl,--no-undefined"
                       )
@@ -67,7 +67,7 @@ install(FILES
         DESTINATION include)
 
 #install lib
-install( TARGETS lottie-player EXPORT lottie-player-targets
+install( TARGETS rlottie EXPORT rlottie-targets
          LIBRARY     DESTINATION    ${LIB_INSTALL_DIR}
          ARCHIVE     DESTINATION    ${LIB_INSTALL_DIR}
          INCLUDES    DESTINATION    include
@@ -75,36 +75,36 @@ install( TARGETS lottie-player EXPORT lottie-player-targets
 
 #install config file.
 
-install( EXPORT lottie-player-targets
-         FILE          lottie-playerTargets.cmake
-         NAMESPACE     lottie-player::
-         DESTINATION   ${LIB_INSTALL_DIR}/cmake/lottie-player
+install( EXPORT rlottie-targets
+         FILE          rlottieTargets.cmake
+         NAMESPACE     rlottie::
+         DESTINATION   ${LIB_INSTALL_DIR}/cmake/rlottie
        )
 
 
 #Create a ConfigVersion.cmake file
 include(CMakePackageConfigHelpers)
 write_basic_package_version_file(
-    ${CMAKE_CURRENT_BINARY_DIR}/lottie-playerConfigVersion.cmake
+    ${CMAKE_CURRENT_BINARY_DIR}/rlottieConfigVersion.cmake
     VERSION ${PROJECT_VERSION}
     COMPATIBILITY AnyNewerVersion
 )
 
-configure_package_config_file(${CMAKE_CURRENT_LIST_DIR}/cmake/lottie-playerConfig.cmake.in
-    ${CMAKE_CURRENT_BINARY_DIR}/lottie-playerConfig.cmake
-    INSTALL_DESTINATION ${LIB_INSTALL_DIR}/cmake/lottie-player
+configure_package_config_file(${CMAKE_CURRENT_LIST_DIR}/cmake/rlottieConfig.cmake.in
+    ${CMAKE_CURRENT_BINARY_DIR}/rlottieConfig.cmake
+    INSTALL_DESTINATION ${LIB_INSTALL_DIR}/cmake/rlottie
 )
 
 #Install the config, configversion and custom find modules
 install(FILES
-    ${CMAKE_CURRENT_BINARY_DIR}/lottie-playerConfig.cmake
-    ${CMAKE_CURRENT_BINARY_DIR}/lottie-playerConfigVersion.cmake
-    DESTINATION ${LIB_INSTALL_DIR}/cmake/lottie-player
+    ${CMAKE_CURRENT_BINARY_DIR}/rlottieConfig.cmake
+    ${CMAKE_CURRENT_BINARY_DIR}/rlottieConfigVersion.cmake
+    DESTINATION ${LIB_INSTALL_DIR}/cmake/rlottie
 )
 
 
-export(EXPORT lottie-player-targets FILE ${CMAKE_CURRENT_BINARY_DIR}/lottie-playerTargets.cmake NAMESPACE lottie-player::)
+export(EXPORT rlottie-targets FILE ${CMAKE_CURRENT_BINARY_DIR}/rlottieTargets.cmake NAMESPACE rlottie::)
 
 #Register package in user's package registry
-export(PACKAGE lottie-player)
+export(PACKAGE rlottie)
 

diff --git a/COPYING b/COPYING
index 550e1e9..293d8da 100644 (file)
--- a/COPYING
+++ b/COPYING
@@ -1,6 +1,6 @@
 Licensing
 
-lottie-player basically comes with LGPL-v2.1 license(licenses/COPYING.LGPL)
+rlottie basically comes with LGPL-v2.1 license(licenses/COPYING.LGPL)
 but some parts of shared code are covered by different licenses. Listed
 below are the folder names and the license file covering it. Note that this
 license would cover all of the source invovled in each folders, unless

diff --git a/README.txt b/README.txt
index e028653..dce83ba 100644 (file)
--- a/README.txt
+++ b/README.txt
@@ -21,7 +21,7 @@ RUN TESTS
 
 BUILD WITH CMAKE
 ================
-liblottie-player can also be built using the cmake build system.
+librlottie can also be built using the cmake build system.
 
 1. install cmake.  (Follow instructions at https://cmake.org/download/)
 2. create a new build/ directory

diff --git a/cmake/lottie-playerConfig.cmake.in b/cmake/lottie-playerConfig.cmake.in
deleted file mode 100644 (file)
index 8367242..0000000
--- a/cmake/lottie-playerConfig.cmake.in
+++ /dev/null
@@ -1,16 +0,0 @@
-get_filename_component(lottie-player_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
-include(CMakeFindDependencyMacro)
-
-list(APPEND CMAKE_MODULE_PATH ${lottie-player_CMAKE_DIR})
-
-# NOTE Had to use find_package because find_dependency does not support COMPONENTS or MODULE until 3.8.0
-
-#find_dependency(RapidJSON 1.0 REQUIRED MODULE)
-#find_package(Boost 1.55 REQUIRED COMPONENTS regex)
-list(REMOVE_AT CMAKE_MODULE_PATH -1)
-
-if(NOT TARGET lottie-player::lottie-player)
-    include("${lottie-player_CMAKE_DIR}/lottie-playerTargets.cmake")
-endif()
-
-set(lottie-player_LIBRARIES lottie-player::lottie-player)

diff --git a/cmake/rlottieConfig.cmake.in b/cmake/rlottieConfig.cmake.in
new file mode 100644 (file)
index 0000000..730672a
--- /dev/null
+++ b/cmake/rlottieConfig.cmake.in
@@ -0,0 +1,16 @@
+get_filename_component(rlottie_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
+include(CMakeFindDependencyMacro)
+
+list(APPEND CMAKE_MODULE_PATH ${rlottie_CMAKE_DIR})
+
+# NOTE Had to use find_package because find_dependency does not support COMPONENTS or MODULE until 3.8.0
+
+#find_dependency(RapidJSON 1.0 REQUIRED MODULE)
+#find_package(Boost 1.55 REQUIRED COMPONENTS regex)
+list(REMOVE_AT CMAKE_MODULE_PATH -1)
+
+if(NOT TARGET rlottie::rlottie)
+    include("${rlottie_CMAKE_DIR}/rlottieTargets.cmake")
+endif()
+
+set(rlottie_LIBRARIES rlottie::rlottie)

diff --git a/example/lottieview.cpp b/example/lottieview.cpp
index a09417a..7671735 100644 (file)
--- a/example/lottieview.cpp
+++ b/example/lottieview.cpp
@@ -18,7 +18,7 @@
 
 #include"lottieview.h"
 
-using namespace lottie;
+using namespace rlottie;
 
 static Eina_Bool
 animator(void *data , double pos)
@@ -321,14 +321,14 @@ void LottieView::seek(float pos)
             mDirty = true;
             auto buffer = (uint32_t *)evas_object_image_data_get(mImage, EINA_TRUE);
             size_t bytesperline =  evas_object_image_stride_get(mImage);
-            lottie::Surface surface(buffer, width, height, bytesperline);
+            rlottie::Surface surface(buffer, width, height, bytesperline);
             mRenderTask = mPlayer->render(mCurFrame, surface);
             // to force a redraw
             evas_object_image_data_update_add(mImage, 0 , 0, surface.width(), surface.height());
         } else {
             auto buffer = (uint32_t *)evas_object_image_data_get(mImage, EINA_TRUE);
             size_t bytesperline =  evas_object_image_stride_get(mImage);
-            lottie::Surface surface(buffer, width, height, bytesperline);
+            rlottie::Surface surface(buffer, width, height, bytesperline);
             mPlayer->renderSync(mCurFrame, surface);
             evas_object_image_data_set(mImage, surface.buffer());
             evas_object_image_data_update_add(mImage, 0 , 0, surface.width(), surface.height());

diff --git a/example/lottieview.h b/example/lottieview.h
index aab0336..1ff8266 100644 (file)
--- a/example/lottieview.h
+++ b/example/lottieview.h
@@ -108,7 +108,7 @@ public:
     Evas_Object             *mVg;
     int                      mRepeatCount;
     LottieView::RepeatMode   mRepeatMode;
-    std::unique_ptr<lottie::Animation>       mPlayer;
+    std::unique_ptr<rlottie::Animation>       mPlayer;
     size_t                   mCurFrame{UINT_MAX};
     Ecore_Animator          *mAnimator{nullptr};
     bool                     mLoop;
@@ -123,7 +123,7 @@ public:
     float                    mPos;
     float                    mFrameRate;
     long                     mTotalFrame;
-    std::future<lottie::Surface>        mRenderTask;
+    std::future<rlottie::Surface>        mRenderTask;
 
     //keep a segment of the animation default is [0, 1]
     float                   mMinProgress{0};

diff --git a/inc/CMakeLists.txt b/inc/CMakeLists.txt
index adc3dc0..0e31a66 100644 (file)
--- a/inc/CMakeLists.txt
+++ b/inc/CMakeLists.txt
@@ -1,4 +1,4 @@
-target_include_directories(lottie-player
+target_include_directories(rlottie
     PRIVATE
         "${CMAKE_CURRENT_LIST_DIR}"
     )
\ No newline at end of file

diff --git a/inc/rlottie.h b/inc/rlottie.h
index 47aa4e2..7821641 100644 (file)
--- a/inc/rlottie.h
+++ b/inc/rlottie.h
@@ -49,7 +49,7 @@ class AnimationImpl;
 struct LOTNode;
 struct LOTLayerNode;
 
-namespace lottie {
+namespace rlottie {
 
 class LOT_EXPORT Surface {
 public:

diff --git a/lottie-player.manifest b/lottie-player.manifest
deleted file mode 100644 (file)
index 017d22d..0000000
--- a/lottie-player.manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-<manifest>
- <request>
-    <domain name="_"/>
- </request>
-</manifest>

diff --git a/lottie-player.pc.in b/lottie-player.pc.in
deleted file mode 100644 (file)
index f7ea6f0..0000000
--- a/lottie-player.pc.in
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=@PREFIX@
-exec_prefix=@EXEC_DIR@
-apiversion=@player_version@
-libdir=@LIBDIR@
-includedir=@INCDIR@
-
-Name: lottie-player
-Description: A lottie-player library
-Version: @player_version@
-Requires:
-Libs: -L${libdir} -llottie-player
-Cflags: -I${includedir} -std=c++14

diff --git a/packaging/lottie-player.manifest b/packaging/rlottie.manifest
similarity index 100%
rename from packaging/lottie-player.manifest
rename to packaging/rlottie.manifest

diff --git a/packaging/lottie-player.spec b/packaging/rlottie.spec
similarity index 76%
rename from packaging/lottie-player.spec
rename to packaging/rlottie.spec
index f2bf9e4..2e39542 100644 (file)
--- a/packaging/lottie-player.spec
+++ b/packaging/rlottie.spec
@@ -1,5 +1,5 @@
-Name:       lottie-player
-Summary:    lottie player library
+Name:       rlottie
+Summary:    lottie rendering library
 Version:    0.0.1
 Release:    1
 Group:      UI Framework/Services
@@ -15,13 +15,13 @@ lottie player library
 
 
 %package devel
-Summary:    lottie player library (devel)
+Summary:    lottie rendering library (devel)
 Group:      Development/Libraries
 Requires:   %{name} = %{version}-%{release}
 
 
 %description devel
-lottie player library (devel)
+lottie rendering library (devel)
 
 
 %prep
@@ -54,13 +54,13 @@ make %{?jobs:-j%jobs}
 
 %files
 %defattr(-,root,root,-)
-%{_libdir}/liblottie-player.so.*
-%manifest %{name}.manifest
+%{_libdir}/librlottie.so.*
+%manifest packaging/%{name}.manifest
 %license COPYING licenses/COPYING*
 
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/*.h
-%{_libdir}/liblottie-player.so
-%{_libdir}/cmake/lottie-player/*.cmake
-%{_libdir}/pkgconfig/lottie-player.pc
+%{_libdir}/librlottie.so
+%{_libdir}/cmake/rlottie/*.cmake
+%{_libdir}/pkgconfig/rlottie.pc

diff --git a/rlottie.pc.in b/rlottie.pc.in
new file mode 100644 (file)
index 0000000..bf279e2
--- /dev/null
+++ b/rlottie.pc.in
@@ -0,0 +1,12 @@
+prefix=@PREFIX@
+exec_prefix=@EXEC_DIR@
+apiversion=@rlottie_version@
+libdir=@LIBDIR@
+includedir=@INCDIR@
+
+Name: rlottie
+Description: A rlottie library
+Version: @rlottie_version@
+Requires:
+Libs: -L${libdir} -lrlottie
+Cflags: -I${includedir} -std=c++14

diff --git a/src/binding/c/CMakeLists.txt b/src/binding/c/CMakeLists.txt
index 7737952..30a049a 100644 (file)
--- a/src/binding/c/CMakeLists.txt
+++ b/src/binding/c/CMakeLists.txt
@@ -1,9 +1,9 @@
-target_sources(lottie-player
+target_sources(rlottie
     PRIVATE
         "${CMAKE_CURRENT_LIST_DIR}/lottieanimation_capi.cpp"
     )
 
-target_include_directories(lottie-player
+target_include_directories(rlottie
     PRIVATE
         "${CMAKE_CURRENT_LIST_DIR}"
     )

diff --git a/src/binding/c/lottieanimation_capi.cpp b/src/binding/c/lottieanimation_capi.cpp
index 6748f20..dd7f5e1 100644 (file)
--- a/src/binding/c/lottieanimation_capi.cpp
+++ b/src/binding/c/lottieanimation_capi.cpp
@@ -19,7 +19,7 @@
 #include "rlottie.h"
 #include "vdebug.h"
 
-using namespace lottie;
+using namespace rlottie;
 
 extern "C" {
 
@@ -117,7 +117,7 @@ lottie_animation_render_async(Lottie_Animation_S *animation,
 {
     if (!animation) return;
 
-    lottie::Surface surface(buffer, width, height, bytes_per_line);
+    rlottie::Surface surface(buffer, width, height, bytes_per_line);
     animation->mRenderTask = animation->mAnimation->render(frame_number, surface);
     animation->mBufferRef = buffer;
 }

diff --git a/src/lottie/CMakeLists.txt b/src/lottie/CMakeLists.txt
index 4fb944a..7261d43 100644 (file)
--- a/src/lottie/CMakeLists.txt
+++ b/src/lottie/CMakeLists.txt
@@ -1,5 +1,5 @@
 
-target_sources(lottie-player
+target_sources(rlottie
     PRIVATE
         "${CMAKE_CURRENT_LIST_DIR}/lottieitem.cpp"
         "${CMAKE_CURRENT_LIST_DIR}/lottieloader.cpp"
@@ -8,7 +8,7 @@ target_sources(lottie-player
         "${CMAKE_CURRENT_LIST_DIR}/lottieanimation.cpp"
     )
 
-target_include_directories(lottie-player
+target_include_directories(rlottie
     PRIVATE
         "${CMAKE_CURRENT_LIST_DIR}"
     )

diff --git a/src/lottie/lottieanimation.cpp b/src/lottie/lottieanimation.cpp
index 1f041f8..1084a23 100644 (file)
--- a/src/lottie/lottieanimation.cpp
+++ b/src/lottie/lottieanimation.cpp
@@ -23,7 +23,7 @@
 
 #include <fstream>
 
-using namespace lottie;
+using namespace rlottie;
 
 struct RenderTask {
     RenderTask() { receiver = sender.get_future(); }

diff --git a/src/lottie/lottieitem.cpp b/src/lottie/lottieitem.cpp
index aa88896..3cd78fd 100644 (file)
--- a/src/lottie/lottieitem.cpp
+++ b/src/lottie/lottieitem.cpp
@@ -121,7 +121,7 @@ const LOTLayerNode * LOTCompItem::renderTree() const
     return mRootLayer->layerNode();
 }
 
-bool LOTCompItem::render(const lottie::Surface &surface)
+bool LOTCompItem::render(const rlottie::Surface &surface)
 {
     VBitmap bitmap(reinterpret_cast<uchar *>(surface.buffer()),
                    surface.width(), surface.height(),

diff --git a/src/lottie/lottieitem.h b/src/lottie/lottieitem.h
index b38a379..9eda6d1 100644 (file)
--- a/src/lottie/lottieitem.h
+++ b/src/lottie/lottieitem.h
@@ -56,7 +56,7 @@ public:
    VSize size() const;
    void buildRenderTree();
    const LOTLayerNode * renderTree()const;
-   bool render(const lottie::Surface &surface);
+   bool render(const rlottie::Surface &surface);
 private:
    VMatrix                                    mScaleMatrix;
    VSize                                      mViewSize;

diff --git a/src/vector/CMakeLists.txt b/src/vector/CMakeLists.txt
index cbf9c98..30f9d29 100644 (file)
--- a/src/vector/CMakeLists.txt
+++ b/src/vector/CMakeLists.txt
@@ -2,7 +2,7 @@
 add_subdirectory(freetype)
 add_subdirectory(pixman)
 
-target_sources(lottie-player
+target_sources(rlottie
     PRIVATE
         "${CMAKE_CURRENT_LIST_DIR}/vrect.cpp"
         "${CMAKE_CURRENT_LIST_DIR}/vdasher.cpp"
@@ -26,7 +26,7 @@ target_sources(lottie-player
         "${CMAKE_CURRENT_LIST_DIR}/vimageloader.cpp"
     )
 
-target_include_directories(lottie-player
+target_include_directories(rlottie
     PRIVATE
         "${CMAKE_CURRENT_LIST_DIR}"
     )

diff --git a/src/vector/freetype/CMakeLists.txt b/src/vector/freetype/CMakeLists.txt
index 0ce7e69..31a9f08 100644 (file)
--- a/src/vector/freetype/CMakeLists.txt
+++ b/src/vector/freetype/CMakeLists.txt
@@ -1,11 +1,11 @@
-target_sources(lottie-player
+target_sources(rlottie
     PRIVATE
         "${CMAKE_CURRENT_LIST_DIR}/v_ft_math.cpp"
         "${CMAKE_CURRENT_LIST_DIR}/v_ft_raster.cpp"
         "${CMAKE_CURRENT_LIST_DIR}/v_ft_stroker.cpp"
     )
 
-target_include_directories(lottie-player
+target_include_directories(rlottie
     PRIVATE
         "${CMAKE_CURRENT_LIST_DIR}"
     )
\ No newline at end of file

diff --git a/src/vector/pixman/CMakeLists.txt b/src/vector/pixman/CMakeLists.txt
index d38a094..c08593f 100644 (file)
--- a/src/vector/pixman/CMakeLists.txt
+++ b/src/vector/pixman/CMakeLists.txt
@@ -1,17 +1,17 @@
-target_sources(lottie-player
+target_sources(rlottie
     PRIVATE
         "${CMAKE_CURRENT_LIST_DIR}/vregion.cpp"
     )
 
 IF("${ARCH}" STREQUAL "arm")
 SET(CMAKE_ASM_FLAGS "${CFLAGS} -x assembler-with-cpp")
-target_sources(lottie-player
+target_sources(rlottie
     PRIVATE
         "${CMAKE_CURRENT_LIST_DIR}/pixman-arm-neon-asm.S"
     )
 ENDIF("${ARCH}" STREQUAL "arm")
 
-target_include_directories(lottie-player
+target_include_directories(rlottie
     PRIVATE
         "${CMAKE_CURRENT_LIST_DIR}"
     )

diff --git a/test/test_lottieanimation.cpp b/test/test_lottieanimation.cpp
index 7b08b4f..d704fb4 100644 (file)
--- a/test/test_lottieanimation.cpp
+++ b/test/test_lottieanimation.cpp
@@ -5,10 +5,10 @@ class AnimationTest : public ::testing::Test {
 public:
     void SetUp()
     {
-        animationInvalid = lottie::Animation::loadFromFile("wrong_file.json");
+        animationInvalid = rlottie::Animation::loadFromFile("wrong_file.json");
         std::string filePath = DEMO_DIR;
         filePath +="mask.json";
-        animation = lottie::Animation::loadFromFile(filePath);
+        animation = rlottie::Animation::loadFromFile(filePath);
 
     }
     void TearDown()
@@ -16,8 +16,8 @@ public:
 
     }
 public:
-    std::unique_ptr<lottie::Animation> animationInvalid;
-    std::unique_ptr<lottie::Animation> animation;
+    std::unique_ptr<rlottie::Animation> animationInvalid;
+    std::unique_ptr<rlottie::Animation> animation;
 };
 
 TEST_F(AnimationTest, loadFromFile_N) {