Skip to content

Commit 9cbbf28

Browse files
hermethermet
committed
packaging: rename lottie-player to rlottie.
This is a trial-error test that could be accepted by server test. Change-Id: Ib7ccc4f5d5282df9d119b1efb1de51ffb3cbb0b9
1 parent 660ef0d commit 9cbbf28

15 files changed

+70
-63
lines changed

‎CMakeLists.txt

+28-23
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
cmake_minimum_required( VERSION 3.2 )
22

33
#declare project
4-
project( lottie-player VERSION 0.0.1 LANGUAGES C CXX ASM)
4+
project( rlottie VERSION 0.0.1 LANGUAGES C CXX ASM)
55

66
#declare target
7-
add_library( lottie-player SHARED "" )
7+
add_library( rlottie SHARED "" )
88

99
#declare version of the target
1010
set(player_version_major 0)
1111
set(player_version_minor 0)
1212
set(player_version_patch 1)
1313
set(player_version ${player_version_major}.${player_version_minor}.${player_version_patch} )
14-
set_target_properties(lottie-player PROPERTIES
14+
set_target_properties(rlottie PROPERTIES
1515
VERSION ${player_version}
1616
SOVERSION ${player_version_major}
1717
)
1818

1919
#declare alias so that library can be used inside the build tree, e.g. when testing
20-
add_library(lottie-player::lottie-player ALIAS lottie-player)
20+
add_library(rlottie::rlottie ALIAS rlottie)
2121

2222
#declare target compilation options
23-
target_compile_options(lottie-player
23+
target_compile_options(rlottie
2424
PUBLIC
2525
-std=c++14
2626
PRIVATE
@@ -30,17 +30,17 @@ target_compile_options(lottie-player
3030
set( CMAKE_THREAD_PREFER_PTHREAD TRUE )
3131
find_package( Threads )
3232

33-
target_link_libraries(lottie-player
33+
target_link_libraries(rlottie
3434
PUBLIC
3535
"${CMAKE_THREAD_LIBS_INIT}"
3636
)
3737

3838
# for dlopen, dlsym and dlclose dependancy
39-
target_link_libraries(lottie-player
39+
target_link_libraries(rlottie
4040
PRIVATE
4141
${CMAKE_DL_LIBS})
4242

43-
target_link_libraries(lottie-player
43+
target_link_libraries(rlottie
4444
PUBLIC
4545
"-Wl,--no-undefined"
4646
)
@@ -53,9 +53,14 @@ SET(PREFIX ${CMAKE_INSTALL_PREFIX})
5353
SET(EXEC_DIR ${PREFIX})
5454
SET(LIBDIR ${LIB_INSTALL_DIR})
5555
SET(INCDIR ${PREFIX}/include)
56-
CONFIGURE_FILE(${PROJECT_NAME}.pc.in ${PROJECT_NAME}.pc @ONLY)
56+
CONFIGURE_FILE(${PROJECT_NAME}.pc.in ${PROJECT_NAME}.pc)
5757
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
5858

59+
#temporary for lottie-player dependency.
60+
CONFIGURE_FILE(${PROJECT_NAME}.pc.in lottie-player.pc)
61+
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/lottie-player.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
62+
63+
5964
#install header
6065
install(FILES
6166
inc/rlottie.h
@@ -65,44 +70,44 @@ install(FILES
6570
DESTINATION include)
6671

6772
#install lib
68-
install( TARGETS lottie-player EXPORT lottie-player-targets
73+
install( TARGETS rlottie EXPORT rlottie-targets
6974
LIBRARY DESTINATION ${LIB_INSTALL_DIR}
7075
ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
7176
INCLUDES DESTINATION include
7277
)
7378

7479
#install config file.
7580

76-
install( EXPORT lottie-player-targets
77-
FILE lottie-playerTargets.cmake
78-
NAMESPACE lottie-player::
79-
DESTINATION ${LIB_INSTALL_DIR}/cmake/lottie-player
81+
install( EXPORT rlottie-targets
82+
FILE rlottieTargets.cmake
83+
NAMESPACE rlottie::
84+
DESTINATION ${LIB_INSTALL_DIR}/cmake/rlottie
8085
)
8186

8287

8388
#Create a ConfigVersion.cmake file
8489
include(CMakePackageConfigHelpers)
8590
write_basic_package_version_file(
86-
${CMAKE_CURRENT_BINARY_DIR}/lottie-playerConfigVersion.cmake
91+
${CMAKE_CURRENT_BINARY_DIR}/rlottieConfigVersion.cmake
8792
VERSION ${PROJECT_VERSION}
8893
COMPATIBILITY AnyNewerVersion
8994
)
9095

91-
configure_package_config_file(${CMAKE_CURRENT_LIST_DIR}/cmake/lottie-playerConfig.cmake.in
92-
${CMAKE_CURRENT_BINARY_DIR}/lottie-playerConfig.cmake
93-
INSTALL_DESTINATION ${LIB_INSTALL_DIR}/cmake/lottie-player
96+
configure_package_config_file(${CMAKE_CURRENT_LIST_DIR}/cmake/rlottieConfig.cmake.in
97+
${CMAKE_CURRENT_BINARY_DIR}/rlottieConfig.cmake
98+
INSTALL_DESTINATION ${LIB_INSTALL_DIR}/cmake/rlottie
9499
)
95100

96101
#Install the config, configversion and custom find modules
97102
install(FILES
98-
${CMAKE_CURRENT_BINARY_DIR}/lottie-playerConfig.cmake
99-
${CMAKE_CURRENT_BINARY_DIR}/lottie-playerConfigVersion.cmake
100-
DESTINATION ${LIB_INSTALL_DIR}/cmake/lottie-player
103+
${CMAKE_CURRENT_BINARY_DIR}/rlottieConfig.cmake
104+
${CMAKE_CURRENT_BINARY_DIR}/rlottieConfigVersion.cmake
105+
DESTINATION ${LIB_INSTALL_DIR}/cmake/rlottie
101106
)
102107

103108

104-
export(EXPORT lottie-player-targets FILE ${CMAKE_CURRENT_BINARY_DIR}/lottie-playerTargets.cmake NAMESPACE lottie-player::)
109+
export(EXPORT rlottie-targets FILE ${CMAKE_CURRENT_BINARY_DIR}/rlottieTargets.cmake NAMESPACE rlottie::)
105110

106111
#Register package in user's package registry
107-
export(PACKAGE lottie-player)
112+
export(PACKAGE rlottie)
108113

‎COPYING

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Licensing
22

3-
lottie-player basically comes with LGPL-v2.1 license(licenses/COPYING.LGPL)
3+
rlottie basically comes with LGPL-v2.1 license(licenses/COPYING.LGPL)
44
but some parts of shared code are covered by different licenses. Listed
55
below are the folder names and the license file covering it. Note that this
66
license would cover all of the source invovled in each folders, unless

‎README.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ RUN TESTS
2121

2222
BUILD WITH CMAKE
2323
================
24-
liblottie-player can also be built using the cmake build system.
24+
librlottie can also be built using the cmake build system.
2525

2626
1. install cmake. (Follow instructions at https://cmake.org/download/)
2727
2. create a new build/ directory

‎cmake/lottie-playerConfig.cmake.in

-16
This file was deleted.

‎cmake/rlottieConfig.cmake.in

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
get_filename_component(rlottie_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
2+
include(CMakeFindDependencyMacro)
3+
4+
list(APPEND CMAKE_MODULE_PATH ${rlottie_CMAKE_DIR})
5+
6+
# NOTE Had to use find_package because find_dependency does not support COMPONENTS or MODULE until 3.8.0
7+
8+
#find_dependency(RapidJSON 1.0 REQUIRED MODULE)
9+
#find_package(Boost 1.55 REQUIRED COMPONENTS regex)
10+
list(REMOVE_AT CMAKE_MODULE_PATH -1)
11+
12+
if(NOT TARGET rlottie::rlottie)
13+
include("${rlottie_CMAKE_DIR}/rlottieTargets.cmake")
14+
endif()
15+
16+
set(rlottie_LIBRARIES rlottie::rlottie)

‎inc/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
target_include_directories(lottie-player
1+
target_include_directories(rlottie
22
PRIVATE
33
"${CMAKE_CURRENT_LIST_DIR}"
4-
)
4+
)

‎lottie-player.manifest renamed to ‎packaging/rlottie.manifest

File renamed without changes.

‎packaging/lottie-player.spec renamed to ‎packaging/rlottie.spec

+7-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
Name: lottie-player
2-
Summary: lottie player library
1+
Name: rlottie
2+
Summary: rlottie ibrary
33
Version: 0.0.1
44
Release: 1
55
Group: UI Framework/Services
@@ -54,13 +54,15 @@ make %{?jobs:-j%jobs}
5454

5555
%files
5656
%defattr(-,root,root,-)
57-
%{_libdir}/liblottie-player.so.*
57+
%{_libdir}/librlottie.so.*
5858
%manifest %{name}.manifest
5959
%license COPYING licenses/COPYING*
6060

6161
%files devel
6262
%defattr(-,root,root,-)
6363
%{_includedir}/*.h
64-
%{_libdir}/liblottie-player.so
65-
%{_libdir}/cmake/lottie-player/*.cmake
64+
%{_libdir}/librlottie.so
65+
66+
%{_libdir}/cmake/rlottie/*.cmake
6667
%{_libdir}/pkgconfig/lottie-player.pc
68+
%{_libdir}/pkgconfig/rlottie.pc

‎packaging/lottie-player.manifest renamed to ‎rlottie.manifest

File renamed without changes.

‎lottie-player.pc.in renamed to ‎rlottie.pc.in

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ apiversion=@player_version@
44
libdir=@LIBDIR@
55
includedir=@INCDIR@
66

7-
Name: lottie-player
8-
Description: A lottie-player library
7+
Name: rlottie
8+
Description: A rlottie library
99
Version: @player_version@
1010
Requires:
11-
Libs: -L${libdir} -llottie-player
11+
Libs: -L${libdir} -lrlottie
1212
Cflags: -I${includedir} -std=c++14

‎src/binding/c/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
target_sources(lottie-player
1+
target_sources(rlottie
22
PRIVATE
33
"${CMAKE_CURRENT_LIST_DIR}/lottieanimation_capi.cpp"
44
)
55

6-
target_include_directories(lottie-player
6+
target_include_directories(rlottie
77
PRIVATE
88
"${CMAKE_CURRENT_LIST_DIR}"
99
)

‎src/lottie/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
target_sources(lottie-player
2+
target_sources(rlottie
33
PRIVATE
44
"${CMAKE_CURRENT_LIST_DIR}/lottieitem.cpp"
55
"${CMAKE_CURRENT_LIST_DIR}/lottieloader.cpp"
@@ -8,7 +8,7 @@ target_sources(lottie-player
88
"${CMAKE_CURRENT_LIST_DIR}/lottieanimation.cpp"
99
)
1010

11-
target_include_directories(lottie-player
11+
target_include_directories(rlottie
1212
PRIVATE
1313
"${CMAKE_CURRENT_LIST_DIR}"
1414
)

‎src/vector/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
add_subdirectory(freetype)
33
add_subdirectory(pixman)
44

5-
target_sources(lottie-player
5+
target_sources(rlottie
66
PRIVATE
77
"${CMAKE_CURRENT_LIST_DIR}/vrect.cpp"
88
"${CMAKE_CURRENT_LIST_DIR}/vdasher.cpp"
@@ -26,7 +26,7 @@ target_sources(lottie-player
2626
"${CMAKE_CURRENT_LIST_DIR}/vimageloader.cpp"
2727
)
2828

29-
target_include_directories(lottie-player
29+
target_include_directories(rlottie
3030
PRIVATE
3131
"${CMAKE_CURRENT_LIST_DIR}"
3232
)

‎src/vector/freetype/CMakeLists.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
target_sources(lottie-player
1+
target_sources(rlottie
22
PRIVATE
33
"${CMAKE_CURRENT_LIST_DIR}/v_ft_math.cpp"
44
"${CMAKE_CURRENT_LIST_DIR}/v_ft_raster.cpp"
55
"${CMAKE_CURRENT_LIST_DIR}/v_ft_stroker.cpp"
66
)
77

8-
target_include_directories(lottie-player
8+
target_include_directories(rlottie
99
PRIVATE
1010
"${CMAKE_CURRENT_LIST_DIR}"
11-
)
11+
)

‎src/vector/pixman/CMakeLists.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
target_sources(lottie-player
1+
target_sources(rlottie
22
PRIVATE
33
"${CMAKE_CURRENT_LIST_DIR}/vregion.cpp"
44
)
55

66
IF("${ARCH}" STREQUAL "arm")
77
SET(CMAKE_ASM_FLAGS "${CFLAGS} -x assembler-with-cpp")
8-
target_sources(lottie-player
8+
target_sources(rlottie
99
PRIVATE
1010
"${CMAKE_CURRENT_LIST_DIR}/pixman-arm-neon-asm.S"
1111
)
1212
ENDIF("${ARCH}" STREQUAL "arm")
1313

14-
target_include_directories(lottie-player
14+
target_include_directories(rlottie
1515
PRIVATE
1616
"${CMAKE_CURRENT_LIST_DIR}"
1717
)

0 commit comments

Comments
 (0)