Apply tizen build option naming rule about profile

Change-Id: I759169f01510e6d00b132a5577e74735efe957ca
Signed-off-by: sangwan.kwon <sangwan.kwon@samsung.com>

diff --git a/packaging/cert-svc.spec b/packaging/cert-svc.spec
index 205784a..f121960 100644 (file)
--- a/packaging/cert-svc.spec
+++ b/packaging/cert-svc.spec
@@ -101,7 +101,11 @@ export FFLAGS="$FFLAGS -DTIZEN_EMULATOR_MODE"
          -DCERT_SVC_RO_PATH=%CERT_SVC_RO_PATH \
          -DCERT_SVC_DB=%CERT_SVC_DB \
          -DCERT_SVC_PKCS12=%CERT_SVC_PKCS12 \
-         -DPROFILE_TARGET=%{?profile} \
+%if "%{?profile}" == "mobile"
+         -DTIZEN_PROFILE_MOBILE:BOOL=ON \
+%else
+         -DTIZEN_PROFILE_MOBILE:BOOL=OFF \
+%endif
 %if 0%{?certsvc_test_build}
          -DCERTSVC_TEST_BUILD=1 \
          -DCERT_SVC_TESTS=%CERT_SVC_TESTS \

diff --git a/vcore/CMakeLists.txt b/vcore/CMakeLists.txt
index be66c1f..eeef0d6 100644 (file)
--- a/vcore/CMakeLists.txt
+++ b/vcore/CMakeLists.txt
@@ -1,7 +1,7 @@
-IF(${PROFILE_TARGET} STREQUAL "mobile")
-    ADD_DEFINITIONS("-DPROFILE_MOBILE=\"${PROFILE_TARGET}\"")
+IF(TIZEN_PROFILE_MOBILE)
+    ADD_DEFINITIONS("-DTIZEN_PROFILE_MOBILE")
     SET(LIB_CERT_CHECKER cert-checker)
-ENDIF(${PROFILE_TARGET} STREQUAL "mobile")
+ENDIF(TIZEN_PROFILE_MOBILE)
 
 PKG_CHECK_MODULES(VCORE_DEPS
     REQUIRED

diff --git a/vcore/vcore/SignatureValidator.cpp b/vcore/vcore/SignatureValidator.cpp
index 1934d53..8c60759 100644 (file)
--- a/vcore/vcore/SignatureValidator.cpp
+++ b/vcore/vcore/SignatureValidator.cpp
@@ -39,7 +39,7 @@
 
 #include <vcore/SignatureValidator.h>
 
-#ifdef PROFILE_MOBILE
+#ifdef TIZEN_PROFILE_MOBILE
 #include <cchecker/ocsp.h>
 #endif
 
@@ -410,12 +410,10 @@ VCerr SignatureValidator::Impl::baseCheck(
                return E_SIG_NONE;
        } catch (const Ocsp::Exception::Base &e) {
                LogInfo("Ocsp check throw exeption : " << e.DumpToString());
-#ifdef PROFILE_MOBILE
+#ifdef TIZEN_PROFILE_MOBILE
                LogInfo("Launch cert-checker.");
-
                if (cchecker_ocsp_request() != 0)
                        LogError("Load cert-checker failed.");
-
 #endif
        } catch (const std::exception &e) {
                LogError("std exception occured : " << e.what());
@@ -474,12 +472,10 @@ VCerr SignatureValidator::Impl::baseCheckList(
                return E_SIG_NONE;
        } catch (const Ocsp::Exception::Base &e) {
                LogInfo("Ocsp check throw exeption : " << e.DumpToString());
-#ifdef PROFILE_MOBILE
+#ifdef TIZEN_PROFILE_MOBILE
                LogInfo("Launch cert-checker.");
-
                if (cchecker_ocsp_request() != 0)
                        LogError("Load cert-checker failed.");
-
 #endif
        } catch (...) {
                LogError("Unknown exception in SignatureValidator::checkList");