Peter M. Groen / dali-demo

Commit e2f6ca7f3c83a1a5d6130ea447897a4b23b63996

Authored by Richard Huang
2 parents 50ce4b79 8527a1ec

[dali_2.2.15] Merge branch 'devel/master' 

Change-Id: I8b9c25d5cd6be321dfd4165a3b06ae9c4bcadcaa
Inline Side-by-side
Showing 4 changed files with 62 additions and 15 deletions
README.md
  View file @e2f6ca7
... ... @@ -52,6 +52,13 @@ Before running make install as normal:
52 52  
53 53 $ make install -j8
54 54  
  55 +### Build Only specific sample
  56 +
  57 +You can set the sample's name and can build that sample only. For example, If you want to build 'hello-world',
  58 +
  59 + $ cmake -DCMAKE_INSTALL_PREFIX=$DESKTOP_PREFIX -DBUILD_EXAMPLE_NAME=hello-world
  60 + $ make install -j9
  61 +
55 62 ## 2. GBS Builds
56 63  
57 64 ### NON-SMACK Targets
... ... @@ -70,6 +77,10 @@ Before running make install as normal:
70 77  
71 78 $ gbs build -A [TARGET_ARCH] --define "%rpi_style 1"
72 79  
  80 +### Build specific sample only
  81 +
  82 + $ gbs build -A [TARGET_ARCH] --define "build_example_name hello-world"
  83 +
73 84 # Creating an example
74 85  
75 86 - Make a directory in the "examples" directory. Only one example will be created per directory.
... ... @@ -162,6 +173,7 @@ vcpkg-script folder in the windows-dependencies repository.
162 173 - INTERNATIONALIZATION ---> Whether to generate and install internazionalization '.po' Portable Object files.
163 174 - CMAKE_INSTALL_PREFIX ---> Were DALi is installed.
164 175 - ENABLE_DEBUG ---> Whether to build with debug enabled.
  176 + - BUILD_EXAMPLE_NAME ---> The name of sample what you want to build. To reduce the memory of rpm file, we didn't copy resources now.
165 177  
166 178 * If dali-toolkit has been compiled with the USE_DEFAULT_RESOURCE_DIR option disabled then is needed to set global environment variables in order to find the default toolkit resources.
167 179  
... ...
build/tizen/CMakeLists.txt
  View file @e2f6ca7
... ... @@ -144,40 +144,52 @@ MACRO(INSTALL_TREE_FILES ROOT TREE FILTER DESTINATION)
144 144 ENDMACRO()
145 145  
146 146 GET_TREE(LOCAL_IMAGES_TREE "${LOCAL_IMAGES_DIR}")
  147 +
  148 +# If we try to build specific samples, we don't install some heavy things.
  149 +# TODO : Currently, we did hard-coding.
  150 +IF( NOT BUILD_EXAMPLE_NAME )
147 151 INSTALL_TREE_FILES(${LOCAL_IMAGES_DIR} "${LOCAL_IMAGES_TREE}" "*.png" ${IMAGES_DIR})
148 152 INSTALL_TREE_FILES(${LOCAL_IMAGES_DIR} "${LOCAL_IMAGES_TREE}" "*.jpg" ${IMAGES_DIR})
  153 +INSTALL_TREE_FILES(${LOCAL_IMAGES_DIR} "${LOCAL_IMAGES_TREE}" "*.ico" ${IMAGES_DIR})
149 154 INSTALL_TREE_FILES(${LOCAL_IMAGES_DIR} "${LOCAL_IMAGES_TREE}" "*.gif" ${IMAGES_DIR})
150 155 INSTALL_TREE_FILES(${LOCAL_IMAGES_DIR} "${LOCAL_IMAGES_TREE}" "*.webp" ${IMAGES_DIR})
151 156 INSTALL_TREE_FILES(${LOCAL_IMAGES_DIR} "${LOCAL_IMAGES_TREE}" "*.bmp" ${IMAGES_DIR})
152   -INSTALL_TREE_FILES(${LOCAL_IMAGES_DIR} "${LOCAL_IMAGES_TREE}" "*.ico" ${IMAGES_DIR})
153 157 INSTALL_TREE_FILES(${LOCAL_IMAGES_DIR} "${LOCAL_IMAGES_TREE}" "*.wbmp" ${IMAGES_DIR})
154 158 INSTALL_TREE_FILES(${LOCAL_IMAGES_DIR} "${LOCAL_IMAGES_TREE}" "*.ktx" ${IMAGES_DIR})
155 159 INSTALL_TREE_FILES(${LOCAL_IMAGES_DIR} "${LOCAL_IMAGES_TREE}" "*.astc" ${IMAGES_DIR})
156 160 INSTALL_TREE_FILES(${LOCAL_IMAGES_DIR} "${LOCAL_IMAGES_TREE}" "*.svg" ${IMAGES_DIR})
157 161 INSTALL_TREE_FILES(${LOCAL_IMAGES_DIR} "${LOCAL_IMAGES_TREE}" "*.json" ${IMAGES_DIR})
  162 +ELSE()
  163 +INSTALL_TREE_FILES(${LOCAL_IMAGES_DIR} "${LOCAL_IMAGES_TREE}" "*com.samsung.dali-demo.png" ${IMAGES_DIR})
  164 +INSTALL_TREE_FILES(${LOCAL_IMAGES_DIR} "${LOCAL_IMAGES_TREE}" "*dali-examples.png" ${IMAGES_DIR})
  165 +INSTALL_TREE_FILES(${LOCAL_IMAGES_DIR} "${LOCAL_IMAGES_TREE}" "*dali-tests.png" ${IMAGES_DIR})
  166 +ENDIF()
158 167  
159   -FILE(GLOB LOCAL_VIDEOS_LIST RELATIVE "${LOCAL_VIDEOS_DIR}" "${LOCAL_VIDEOS_DIR}/*")
160   -FOREACH(flag ${LOCAL_VIDEOS_LIST})
161   - INSTALL(FILES ${LOCAL_VIDEOS_DIR}/${flag} DESTINATION ${VIDEOS_DIR})
  168 +FILE(GLOB LOCAL_SHADERS_LIST RELATIVE "${LOCAL_SHADERS_DIR}" "${LOCAL_SHADERS_DIR}/*")
  169 +FOREACH(flag ${LOCAL_SHADERS_LIST})
  170 + INSTALL(FILES ${LOCAL_SHADERS_DIR}/${flag} DESTINATION ${SHADERS_DIR})
162 171 ENDFOREACH(flag)
163 172  
164   -GET_TREE(LOCAL_MODELS_TREE "${LOCAL_MODELS_DIR}")
165   -INSTALL_TREE_FILES(${LOCAL_MODELS_DIR} "${LOCAL_MODELS_TREE}" "*" ${MODELS_DIR})
166   -
167 173 FILE(GLOB LOCAL_SCRIPTS_LIST RELATIVE "${LOCAL_SCRIPTS_DIR}" "${LOCAL_SCRIPTS_DIR}/*.json")
168 174 FOREACH(flag ${LOCAL_SCRIPTS_LIST})
169 175 INSTALL(FILES ${LOCAL_SCRIPTS_DIR}/${flag} DESTINATION ${SCRIPTS_DIR})
170 176 ENDFOREACH(flag)
171 177  
172   -FILE(GLOB LOCAL_SHADERS_LIST RELATIVE "${LOCAL_SHADERS_DIR}" "${LOCAL_SHADERS_DIR}/*")
173   -FOREACH(flag ${LOCAL_SHADERS_LIST})
174   - INSTALL(FILES ${LOCAL_SHADERS_DIR}/${flag} DESTINATION ${SHADERS_DIR})
  178 +# If we try to build specific samples, we don't install some heavy things.
  179 +IF( NOT BUILD_EXAMPLE_NAME )
  180 +FILE(GLOB LOCAL_VIDEOS_LIST RELATIVE "${LOCAL_VIDEOS_DIR}" "${LOCAL_VIDEOS_DIR}/*")
  181 +FOREACH(flag ${LOCAL_VIDEOS_LIST})
  182 + INSTALL(FILES ${LOCAL_VIDEOS_DIR}/${flag} DESTINATION ${VIDEOS_DIR})
175 183 ENDFOREACH(flag)
176 184  
  185 +GET_TREE(LOCAL_MODELS_TREE "${LOCAL_MODELS_DIR}")
  186 +INSTALL_TREE_FILES(${LOCAL_MODELS_DIR} "${LOCAL_MODELS_TREE}" "*" ${MODELS_DIR})
  187 +
177 188 FILE(GLOB LOCAL_GAME_LIST RELATIVE "${LOCAL_GAME_DIR}" "${LOCAL_GAME_DIR}/*.*")
178 189 FOREACH(flag ${LOCAL_GAME_LIST})
179 190 INSTALL(FILES ${LOCAL_GAME_DIR}/${flag} DESTINATION ${GAME_DIR})
180 191 ENDFOREACH(flag)
  192 +ENDIF()
181 193  
182 194 #Create resources location file
183 195 CONFIGURE_FILE( resources-location.in ${DEMO_SHARED}/resources-location.cpp )
... ... @@ -456,6 +468,14 @@ ELSE()
456 468 SET(CURRENT_BUILD_PLATFORM "Ubuntu")
457 469 ENDIF()
458 470  
  471 +# Setup CURRENT_BUILD_EXAMPLE_NAME to use at message
  472 +IF(NOT BUILD_EXAMPLE_NAME)
  473 + SET(CURRENT_BUILD_EXAMPLE_NAME "ALL EXAMPLES")
  474 +ELSE()
  475 + SET(CURRENT_BUILD_EXAMPLE_NAME ${BUILD_EXAMPLE_NAME})
  476 +ENDIF()
  477 +
  478 +
459 479 MESSAGE( " Folder DEMO_IMAGE_DIR : [" ${DEMO_IMAGE_DIR} "]" )
460 480 MESSAGE( " Folder DEMO_STYLE_DIR : [" ${DEMO_STYLE_DIR} "]" )
461 481 MESSAGE( " Folder DEMO_SHADER_DIR : [" ${DEMO_SHADER_DIR} "]" )
... ... @@ -468,4 +488,5 @@ MESSAGE( " Folder DEMO_LOCALE_DIR : [" ${DEMO_LOCALE_DIR} "]" )
468 488 MESSAGE( " Folder DEMO_EXAMPLE_BIN : [" ${DEMO_EXAMPLE_BIN} "]" )
469 489 MESSAGE( " Folder DEMO_LANG : [" ${DEMO_LANG} "]" )
470 490 MESSAGE( " Current Build Platform : [" ${CURRENT_BUILD_PLATFORM} "]" )
471   -MESSAGE( " Scene3D Enabled : [" ${ENABLE_SCENE3D} "]" )
  491 +MESSAGE( " Build example name : [" ${CURRENT_BUILD_EXAMPLE_NAME} "]" )
  492 +MESSAGE( " Scene3D Enabled : [" ${ENABLE_SCENE3D} "]" )
... ...
build/tizen/examples/CMakeLists.txt
  View file @e2f6ca7
... ... @@ -25,7 +25,7 @@ IF( NOT SHADER_GENERATOR )
25 25 MESSAGE( FATAL_ERROR "dali-shader-generator not found!" )
26 26 ENDIF()
27 27  
28   -FOREACH(EXAMPLE ${SUBDIRS})
  28 +FUNCTION(INSTALL_EXAMPLES EXAMPLE)
29 29 SET(PARENT_CMAKE_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../")
30 30 FILE(GLOB SRCS "${EXAMPLES_SRC_DIR}/${EXAMPLE}/*.cpp")
31 31 SET(SRCS ${SRCS} "${ROOT_SRC_DIR}/shared/resources-location.cpp")
... ... @@ -42,10 +42,19 @@ FOREACH(EXAMPLE ${SUBDIRS})
42 42 ADD_CUSTOM_TARGET(${EXAMPLE}-generate-shaders
43 43 COMMAND ${SHADER_GENERATOR} --skip ${SHADER_SOURCE_DIR} ${SHADER_GENERATED_DIR})
44 44 SET_PROPERTY(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES
45   - "${SHADER_GENERATED_DIR}")
  45 + "${SHADER_GENERATED_DIR}")
46 46 ADD_DEPENDENCIES(${EXAMPLE}.example ${EXAMPLE}-generate-shaders)
47 47 ENDIF()
48 48  
49 49 TARGET_LINK_LIBRARIES(${EXAMPLE}.example ${REQUIRED_LIBS})
50 50 INSTALL(TARGETS ${EXAMPLE}.example DESTINATION ${BINDIR})
51   -ENDFOREACH(EXAMPLE)
  51 +ENDFUNCTION()
  52 +
  53 +IF( NOT BUILD_EXAMPLE_NAME )
  54 + FOREACH(EXAMPLE ${SUBDIRS})
  55 + INSTALL_EXAMPLES(${EXAMPLE})
  56 + ENDFOREACH(EXAMPLE)
  57 +ELSE()
  58 + INSTALL_EXAMPLES(${BUILD_EXAMPLE_NAME})
  59 +ENDIF()
  60 +
... ...
packaging/com.samsung.dali-demo.spec
  View file @e2f6ca7
... ... @@ -2,7 +2,7 @@
2 2  
3 3 Name: com.samsung.dali-demo
4 4 Summary: The OpenGLES Canvas Core Demo
5   -Version: 2.2.14
  5 +Version: 2.2.15
6 6 Release: 1
7 7 Group: System/Libraries
8 8 License: Apache-2.0
... ... @@ -96,6 +96,9 @@ cmake -DDALI_APP_DIR=%{dali_app_ro_dir}/bin \
96 96 -DLOCAL_STYLE_DIR=%{local_style_dir} \
97 97 -DINTERNATIONALIZATION:BOOL=OFF \
98 98 -DTIZEN:BOOL=ON \
  99 +%if "%{?build_example_name}" != ""
  100 + -DBUILD_EXAMPLE_NAME=%{?build_example_name} \
  101 +%endif
99 102 .
100 103  
101 104 make %{?jobs:-j%jobs}
... ... @@ -174,10 +177,12 @@ exit 0
174 177 %{dali_app_exe_dir}/dali-tests
175 178 %{dali_app_exe_dir}/*.example
176 179 %{dali_app_exe_dir}/dali-builder
  180 +%if "%{?build_example_name}" == ""
177 181 %{dali_app_res_dir}/images/*
178 182 %{dali_app_res_dir}/game/*
179 183 %{dali_app_res_dir}/videos/*
180 184 %{dali_app_res_dir}/models/*
  185 +%endif
181 186 %{dali_app_res_dir}/scripts/*
182 187 %{dali_app_res_dir}/shaders/*
183 188 %{dali_xml_file_dir}/%{name}.xml
... ...