Commit 6c2952c3e7ab77e9ad3f1e2befe8d5b015b3a107
Committed by
Gerrit Code Review
Gerrit Code Review
Merge "Cmake - Remove the CONFIGURE_FILE() step for json style files." into devel/master
Showing
30 changed files
with
0 additions
and
31 deletions
build/tizen/CMakeLists.txt
| @@ -115,23 +115,6 @@ ENDFOREACH(flag) | @@ -115,23 +115,6 @@ ENDFOREACH(flag) | ||
| 115 | #Create resources location file | 115 | #Create resources location file |
| 116 | CONFIGURE_FILE( resources-location.in ${DEMO_SHARED}/resources-location.cpp ) | 116 | CONFIGURE_FILE( resources-location.in ${DEMO_SHARED}/resources-location.cpp ) |
| 117 | 117 | ||
| 118 | -#Replace @DEMO_STYLE_IMAGE_DIR@ in following files | ||
| 119 | -CONFIGURE_FILE( ${LOCAL_STYLE_DIR}/base-theme.json.in ${LOCAL_STYLE_DIR}/base-theme.json ) | ||
| 120 | -CONFIGURE_FILE( ${LOCAL_STYLE_DIR}/demo-theme.json.in ${LOCAL_STYLE_DIR}/demo-theme.json ) | ||
| 121 | -CONFIGURE_FILE( ${LOCAL_STYLE_DIR}/examples-theme.json.in ${LOCAL_STYLE_DIR}/examples-theme.json ) | ||
| 122 | -CONFIGURE_FILE( ${LOCAL_STYLE_DIR}/tests-theme.json.in ${LOCAL_STYLE_DIR}/tests-theme.json ) | ||
| 123 | -CONFIGURE_FILE( ${LOCAL_STYLE_DIR}/animated-gradient-call-active-style.json.in ${LOCAL_STYLE_DIR}/animated-gradient-call-active-style.json ) | ||
| 124 | -CONFIGURE_FILE( ${LOCAL_STYLE_DIR}/contact-cards-example-theme.json.in ${LOCAL_STYLE_DIR}/contact-cards-example-theme.json ) | ||
| 125 | -CONFIGURE_FILE( ${LOCAL_STYLE_DIR}/progress-bar-example-theme.json.in ${LOCAL_STYLE_DIR}/progress-bar-example-theme.json ) | ||
| 126 | -CONFIGURE_FILE( ${LOCAL_STYLE_DIR}/simple-example-theme.json.in ${LOCAL_STYLE_DIR}/simple-example-theme.json ) | ||
| 127 | -CONFIGURE_FILE( ${LOCAL_STYLE_DIR}/style-example-theme-one.json.in ${LOCAL_STYLE_DIR}/style-example-theme-one.json ) | ||
| 128 | -CONFIGURE_FILE( ${LOCAL_STYLE_DIR}/style-example-theme-two.json.in ${LOCAL_STYLE_DIR}/style-example-theme-two.json ) | ||
| 129 | -CONFIGURE_FILE( ${LOCAL_STYLE_DIR}/style-example-theme-three.json.in ${LOCAL_STYLE_DIR}/style-example-theme-three.json ) | ||
| 130 | -CONFIGURE_FILE( ${LOCAL_STYLE_DIR}/tooltip-example-theme.json.in ${LOCAL_STYLE_DIR}/tooltip-example-theme.json ) | ||
| 131 | -CONFIGURE_FILE( ${LOCAL_STYLE_DIR}/basic-light-theme.json.in ${LOCAL_STYLE_DIR}/basic-light-theme.json ) | ||
| 132 | -CONFIGURE_FILE( ${LOCAL_STYLE_DIR}/text-editor-example-theme.json.in ${LOCAL_STYLE_DIR}/text-editor-example-theme.json ) | ||
| 133 | -MESSAGE("Configured ${LOCAL_STYLE_DIR}/style-example-theme<>.json files") | ||
| 134 | - | ||
| 135 | FILE(GLOB LOCAL_STYLES_LIST "${LOCAL_STYLE_DIR}/*.json") | 118 | FILE(GLOB LOCAL_STYLES_LIST "${LOCAL_STYLE_DIR}/*.json") |
| 136 | FOREACH(flag ${LOCAL_STYLES_LIST}) | 119 | FOREACH(flag ${LOCAL_STYLES_LIST}) |
| 137 | INSTALL(FILES ${flag} DESTINATION ${STYLE_DIR}) | 120 | INSTALL(FILES ${flag} DESTINATION ${STYLE_DIR}) |
resources/style/.gitignore deleted
| 1 | -base-theme.json | ||
| 2 | -demo-theme.json | ||
| 3 | -examples-theme.json | ||
| 4 | -tests-theme.json | ||
| 5 | -animated-gradient-call-active-style.json | ||
| 6 | -contact-cards-example-theme.json | ||
| 7 | -progress-bar-example-theme.json | ||
| 8 | -simple-example-theme.json | ||
| 9 | -style-example-theme-three.json | ||
| 10 | -style-example-theme-two.json | ||
| 11 | -style-example-theme-one.json | ||
| 12 | -tooltip-example-theme.json | ||
| 13 | -basic-light-theme.json | ||
| 14 | -text-editor-example-theme.json |
resources/style/animated-gradient-call-active-style.json.in renamed to resources/style/animated-gradient-call-active-style.json
resources/style/base-theme.json.in renamed to resources/style/base-theme.json
resources/style/basic-light-theme.json.in renamed to resources/style/basic-light-theme.json
resources/style/contact-cards-example-theme.json.in renamed to resources/style/contact-cards-example-theme.json
resources/style/demo-theme.json.in renamed to resources/style/demo-theme.json
resources/style/examples-theme.json.in renamed to resources/style/examples-theme.json
resources/style/mobile/animated-gradient-call-active-style.json.in renamed to resources/style/mobile/animated-gradient-call-active-style.json
resources/style/mobile/base-theme.json.in renamed to resources/style/mobile/base-theme.json
resources/style/mobile/basic-light-theme.json.in renamed to resources/style/mobile/basic-light-theme.json
resources/style/mobile/contact-cards-example-theme.json.in renamed to resources/style/mobile/contact-cards-example-theme.json
resources/style/mobile/demo-theme.json.in renamed to resources/style/mobile/demo-theme.json
resources/style/mobile/examples-theme.json.in renamed to resources/style/mobile/examples-theme.json
resources/style/mobile/progress-bar-example-theme.json.in renamed to resources/style/mobile/progress-bar-example-theme.json
resources/style/mobile/simple-example-theme.json.in renamed to resources/style/mobile/simple-example-theme.json
resources/style/mobile/style-example-theme-one.json.in renamed to resources/style/mobile/style-example-theme-one.json
resources/style/mobile/style-example-theme-three.json.in renamed to resources/style/mobile/style-example-theme-three.json
resources/style/mobile/style-example-theme-two.json.in renamed to resources/style/mobile/style-example-theme-two.json
resources/style/mobile/tests-theme.json.in renamed to resources/style/mobile/tests-theme.json
resources/style/mobile/text-editor-example-theme.json.in renamed to resources/style/mobile/text-editor-example-theme.json
resources/style/mobile/tooltip-example-theme.json.in renamed to resources/style/mobile/tooltip-example-theme.json
resources/style/progress-bar-example-theme.json.in renamed to resources/style/progress-bar-example-theme.json
resources/style/simple-example-theme.json.in renamed to resources/style/simple-example-theme.json
resources/style/style-example-theme-one.json.in renamed to resources/style/style-example-theme-one.json
resources/style/style-example-theme-three.json.in renamed to resources/style/style-example-theme-three.json
resources/style/style-example-theme-two.json.in renamed to resources/style/style-example-theme-two.json
resources/style/tests-theme.json.in renamed to resources/style/tests-theme.json
resources/style/text-editor-example-theme.json.in renamed to resources/style/text-editor-example-theme.json
resources/style/tooltip-example-theme.json.in renamed to resources/style/tooltip-example-theme.json