From 9e8ddbcfae1182b9cb66592c32d5a33019d0ce49 Mon Sep 17 00:00:00 2001 From: Victor Cebollada Date: Thu, 16 Jan 2020 07:58:23 +0000 Subject: [PATCH] Cmake - Remove the CONFIGURE_FILE() step for json style files. * Replace the DEMO_STYLE_IMAGE_DIR var is not needed as is not used in any style file. Change-Id: I9f003f4bdfa9260774d2d0696d6816b2b9a1d255 Signed-off-by: Victor Cebollada --- build/tizen/CMakeLists.txt | 17 ----------------- resources/style/.gitignore | 14 -------------- ...json.in => animated-gradient-call-active-style.json} | 0 resources/style/{base-theme.json.in => base-theme.json} | 0 ...basic-light-theme.json.in => basic-light-theme.json} | 0 ...e-theme.json.in => contact-cards-example-theme.json} | 0 resources/style/{demo-theme.json.in => demo-theme.json} | 0 .../{examples-theme.json.in => examples-theme.json} | 0 .../animated-gradient-call-active-style.json} | 0 .../mobile/{base-theme.json.in => base-theme.json} | 0 .../basic-light-theme.json} | 0 ...e-theme.json.in => contact-cards-example-theme.json} | 0 .../mobile/{demo-theme.json.in => demo-theme.json} | 0 .../{examples-theme.json.in => examples-theme.json} | 0 ...le-theme.json.in => progress-bar-example-theme.json} | 0 .../simple-example-theme.json} | 0 ...e-theme-one.json.in => style-example-theme-one.json} | 0 .../style-example-theme-three.json} | 0 ...e-theme-two.json.in => style-example-theme-two.json} | 0 .../mobile/{tests-theme.json.in => tests-theme.json} | 0 .../text-editor-example-theme.json} | 0 .../tooltip-example-theme.json} | 0 ...le-theme.json.in => progress-bar-example-theme.json} | 0 ...-example-theme.json.in => simple-example-theme.json} | 0 ...e-theme-one.json.in => style-example-theme-one.json} | 0 ...eme-three.json.in => style-example-theme-three.json} | 0 ...e-theme-two.json.in => style-example-theme-two.json} | 0 .../style/{tests-theme.json.in => tests-theme.json} | 0 ...ple-theme.json.in => text-editor-example-theme.json} | 0 ...example-theme.json.in => tooltip-example-theme.json} | 0 30 files changed, 31 deletions(-) delete mode 100644 resources/style/.gitignore rename resources/style/{mobile/animated-gradient-call-active-style.json.in => animated-gradient-call-active-style.json} (100%) rename resources/style/{base-theme.json.in => base-theme.json} (100%) rename resources/style/{mobile/basic-light-theme.json.in => basic-light-theme.json} (100%) rename resources/style/{contact-cards-example-theme.json.in => contact-cards-example-theme.json} (100%) rename resources/style/{demo-theme.json.in => demo-theme.json} (100%) rename resources/style/{examples-theme.json.in => examples-theme.json} (100%) rename resources/style/{animated-gradient-call-active-style.json.in => mobile/animated-gradient-call-active-style.json} (100%) rename resources/style/mobile/{base-theme.json.in => base-theme.json} (100%) rename resources/style/{basic-light-theme.json.in => mobile/basic-light-theme.json} (100%) rename resources/style/mobile/{contact-cards-example-theme.json.in => contact-cards-example-theme.json} (100%) rename resources/style/mobile/{demo-theme.json.in => demo-theme.json} (100%) rename resources/style/mobile/{examples-theme.json.in => examples-theme.json} (100%) rename resources/style/mobile/{progress-bar-example-theme.json.in => progress-bar-example-theme.json} (100%) rename resources/style/{simple-example-theme.json.in => mobile/simple-example-theme.json} (100%) rename resources/style/mobile/{style-example-theme-one.json.in => style-example-theme-one.json} (100%) rename resources/style/{style-example-theme-three.json.in => mobile/style-example-theme-three.json} (100%) rename resources/style/mobile/{style-example-theme-two.json.in => style-example-theme-two.json} (100%) rename resources/style/mobile/{tests-theme.json.in => tests-theme.json} (100%) rename resources/style/{text-editor-example-theme.json.in => mobile/text-editor-example-theme.json} (100%) rename resources/style/{tooltip-example-theme.json.in => mobile/tooltip-example-theme.json} (100%) rename resources/style/{progress-bar-example-theme.json.in => progress-bar-example-theme.json} (100%) rename resources/style/{mobile/simple-example-theme.json.in => simple-example-theme.json} (100%) rename resources/style/{style-example-theme-one.json.in => style-example-theme-one.json} (100%) rename resources/style/{mobile/style-example-theme-three.json.in => style-example-theme-three.json} (100%) rename resources/style/{style-example-theme-two.json.in => style-example-theme-two.json} (100%) rename resources/style/{tests-theme.json.in => tests-theme.json} (100%) rename resources/style/{mobile/text-editor-example-theme.json.in => text-editor-example-theme.json} (100%) rename resources/style/{mobile/tooltip-example-theme.json.in => tooltip-example-theme.json} (100%) diff --git a/build/tizen/CMakeLists.txt b/build/tizen/CMakeLists.txt index e06014f..a0b8322 100644 --- a/build/tizen/CMakeLists.txt +++ b/build/tizen/CMakeLists.txt @@ -115,23 +115,6 @@ ENDFOREACH(flag) #Create resources location file CONFIGURE_FILE( resources-location.in ${DEMO_SHARED}/resources-location.cpp ) -#Replace @DEMO_STYLE_IMAGE_DIR@ in following files -CONFIGURE_FILE( ${LOCAL_STYLE_DIR}/base-theme.json.in ${LOCAL_STYLE_DIR}/base-theme.json ) -CONFIGURE_FILE( ${LOCAL_STYLE_DIR}/demo-theme.json.in ${LOCAL_STYLE_DIR}/demo-theme.json ) -CONFIGURE_FILE( ${LOCAL_STYLE_DIR}/examples-theme.json.in ${LOCAL_STYLE_DIR}/examples-theme.json ) -CONFIGURE_FILE( ${LOCAL_STYLE_DIR}/tests-theme.json.in ${LOCAL_STYLE_DIR}/tests-theme.json ) -CONFIGURE_FILE( ${LOCAL_STYLE_DIR}/animated-gradient-call-active-style.json.in ${LOCAL_STYLE_DIR}/animated-gradient-call-active-style.json ) -CONFIGURE_FILE( ${LOCAL_STYLE_DIR}/contact-cards-example-theme.json.in ${LOCAL_STYLE_DIR}/contact-cards-example-theme.json ) -CONFIGURE_FILE( ${LOCAL_STYLE_DIR}/progress-bar-example-theme.json.in ${LOCAL_STYLE_DIR}/progress-bar-example-theme.json ) -CONFIGURE_FILE( ${LOCAL_STYLE_DIR}/simple-example-theme.json.in ${LOCAL_STYLE_DIR}/simple-example-theme.json ) -CONFIGURE_FILE( ${LOCAL_STYLE_DIR}/style-example-theme-one.json.in ${LOCAL_STYLE_DIR}/style-example-theme-one.json ) -CONFIGURE_FILE( ${LOCAL_STYLE_DIR}/style-example-theme-two.json.in ${LOCAL_STYLE_DIR}/style-example-theme-two.json ) -CONFIGURE_FILE( ${LOCAL_STYLE_DIR}/style-example-theme-three.json.in ${LOCAL_STYLE_DIR}/style-example-theme-three.json ) -CONFIGURE_FILE( ${LOCAL_STYLE_DIR}/tooltip-example-theme.json.in ${LOCAL_STYLE_DIR}/tooltip-example-theme.json ) -CONFIGURE_FILE( ${LOCAL_STYLE_DIR}/basic-light-theme.json.in ${LOCAL_STYLE_DIR}/basic-light-theme.json ) -CONFIGURE_FILE( ${LOCAL_STYLE_DIR}/text-editor-example-theme.json.in ${LOCAL_STYLE_DIR}/text-editor-example-theme.json ) -MESSAGE("Configured ${LOCAL_STYLE_DIR}/style-example-theme<>.json files") - FILE(GLOB LOCAL_STYLES_LIST "${LOCAL_STYLE_DIR}/*.json") FOREACH(flag ${LOCAL_STYLES_LIST}) INSTALL(FILES ${flag} DESTINATION ${STYLE_DIR}) diff --git a/resources/style/.gitignore b/resources/style/.gitignore deleted file mode 100644 index 5582fe8..0000000 --- a/resources/style/.gitignore +++ /dev/null @@ -1,14 +0,0 @@ -base-theme.json -demo-theme.json -examples-theme.json -tests-theme.json -animated-gradient-call-active-style.json -contact-cards-example-theme.json -progress-bar-example-theme.json -simple-example-theme.json -style-example-theme-three.json -style-example-theme-two.json -style-example-theme-one.json -tooltip-example-theme.json -basic-light-theme.json -text-editor-example-theme.json diff --git a/resources/style/mobile/animated-gradient-call-active-style.json.in b/resources/style/animated-gradient-call-active-style.json similarity index 100% rename from resources/style/mobile/animated-gradient-call-active-style.json.in rename to resources/style/animated-gradient-call-active-style.json diff --git a/resources/style/base-theme.json.in b/resources/style/base-theme.json similarity index 100% rename from resources/style/base-theme.json.in rename to resources/style/base-theme.json diff --git a/resources/style/mobile/basic-light-theme.json.in b/resources/style/basic-light-theme.json similarity index 100% rename from resources/style/mobile/basic-light-theme.json.in rename to resources/style/basic-light-theme.json diff --git a/resources/style/contact-cards-example-theme.json.in b/resources/style/contact-cards-example-theme.json similarity index 100% rename from resources/style/contact-cards-example-theme.json.in rename to resources/style/contact-cards-example-theme.json diff --git a/resources/style/demo-theme.json.in b/resources/style/demo-theme.json similarity index 100% rename from resources/style/demo-theme.json.in rename to resources/style/demo-theme.json diff --git a/resources/style/examples-theme.json.in b/resources/style/examples-theme.json similarity index 100% rename from resources/style/examples-theme.json.in rename to resources/style/examples-theme.json diff --git a/resources/style/animated-gradient-call-active-style.json.in b/resources/style/mobile/animated-gradient-call-active-style.json similarity index 100% rename from resources/style/animated-gradient-call-active-style.json.in rename to resources/style/mobile/animated-gradient-call-active-style.json diff --git a/resources/style/mobile/base-theme.json.in b/resources/style/mobile/base-theme.json similarity index 100% rename from resources/style/mobile/base-theme.json.in rename to resources/style/mobile/base-theme.json diff --git a/resources/style/basic-light-theme.json.in b/resources/style/mobile/basic-light-theme.json similarity index 100% rename from resources/style/basic-light-theme.json.in rename to resources/style/mobile/basic-light-theme.json diff --git a/resources/style/mobile/contact-cards-example-theme.json.in b/resources/style/mobile/contact-cards-example-theme.json similarity index 100% rename from resources/style/mobile/contact-cards-example-theme.json.in rename to resources/style/mobile/contact-cards-example-theme.json diff --git a/resources/style/mobile/demo-theme.json.in b/resources/style/mobile/demo-theme.json similarity index 100% rename from resources/style/mobile/demo-theme.json.in rename to resources/style/mobile/demo-theme.json diff --git a/resources/style/mobile/examples-theme.json.in b/resources/style/mobile/examples-theme.json similarity index 100% rename from resources/style/mobile/examples-theme.json.in rename to resources/style/mobile/examples-theme.json diff --git a/resources/style/mobile/progress-bar-example-theme.json.in b/resources/style/mobile/progress-bar-example-theme.json similarity index 100% rename from resources/style/mobile/progress-bar-example-theme.json.in rename to resources/style/mobile/progress-bar-example-theme.json diff --git a/resources/style/simple-example-theme.json.in b/resources/style/mobile/simple-example-theme.json similarity index 100% rename from resources/style/simple-example-theme.json.in rename to resources/style/mobile/simple-example-theme.json diff --git a/resources/style/mobile/style-example-theme-one.json.in b/resources/style/mobile/style-example-theme-one.json similarity index 100% rename from resources/style/mobile/style-example-theme-one.json.in rename to resources/style/mobile/style-example-theme-one.json diff --git a/resources/style/style-example-theme-three.json.in b/resources/style/mobile/style-example-theme-three.json similarity index 100% rename from resources/style/style-example-theme-three.json.in rename to resources/style/mobile/style-example-theme-three.json diff --git a/resources/style/mobile/style-example-theme-two.json.in b/resources/style/mobile/style-example-theme-two.json similarity index 100% rename from resources/style/mobile/style-example-theme-two.json.in rename to resources/style/mobile/style-example-theme-two.json diff --git a/resources/style/mobile/tests-theme.json.in b/resources/style/mobile/tests-theme.json similarity index 100% rename from resources/style/mobile/tests-theme.json.in rename to resources/style/mobile/tests-theme.json diff --git a/resources/style/text-editor-example-theme.json.in b/resources/style/mobile/text-editor-example-theme.json similarity index 100% rename from resources/style/text-editor-example-theme.json.in rename to resources/style/mobile/text-editor-example-theme.json diff --git a/resources/style/tooltip-example-theme.json.in b/resources/style/mobile/tooltip-example-theme.json similarity index 100% rename from resources/style/tooltip-example-theme.json.in rename to resources/style/mobile/tooltip-example-theme.json diff --git a/resources/style/progress-bar-example-theme.json.in b/resources/style/progress-bar-example-theme.json similarity index 100% rename from resources/style/progress-bar-example-theme.json.in rename to resources/style/progress-bar-example-theme.json diff --git a/resources/style/mobile/simple-example-theme.json.in b/resources/style/simple-example-theme.json similarity index 100% rename from resources/style/mobile/simple-example-theme.json.in rename to resources/style/simple-example-theme.json diff --git a/resources/style/style-example-theme-one.json.in b/resources/style/style-example-theme-one.json similarity index 100% rename from resources/style/style-example-theme-one.json.in rename to resources/style/style-example-theme-one.json diff --git a/resources/style/mobile/style-example-theme-three.json.in b/resources/style/style-example-theme-three.json similarity index 100% rename from resources/style/mobile/style-example-theme-three.json.in rename to resources/style/style-example-theme-three.json diff --git a/resources/style/style-example-theme-two.json.in b/resources/style/style-example-theme-two.json similarity index 100% rename from resources/style/style-example-theme-two.json.in rename to resources/style/style-example-theme-two.json diff --git a/resources/style/tests-theme.json.in b/resources/style/tests-theme.json similarity index 100% rename from resources/style/tests-theme.json.in rename to resources/style/tests-theme.json diff --git a/resources/style/mobile/text-editor-example-theme.json.in b/resources/style/text-editor-example-theme.json similarity index 100% rename from resources/style/mobile/text-editor-example-theme.json.in rename to resources/style/text-editor-example-theme.json diff --git a/resources/style/mobile/tooltip-example-theme.json.in b/resources/style/tooltip-example-theme.json similarity index 100% rename from resources/style/mobile/tooltip-example-theme.json.in rename to resources/style/tooltip-example-theme.json -- 2.7.4