Remove Profile Build Dependency

xwalk-launcher does not used any more.

Change-Id: I503804bb16c2f974e90f312391e3dd60fa317d49
Signed-off-by: MyungJoo Ham <myungjoo.ham@samsung.com>
Signed-off-by: Sangyoon Jang <s89.jang@samsung.com>

diff --git a/packaging/wgt-backend.spec b/packaging/wgt-backend.spec
index 998fc24..1c6f78b 100644 (file)
--- a/packaging/wgt-backend.spec
+++ b/packaging/wgt-backend.spec
@@ -38,12 +38,7 @@ cp %{SOURCE1000} .
 cp %{SOURCE1001} .
 
 %build
 cp %{SOURCE1001} .
 
 %build

-#Variable for setting symlink to runtime
-runtime_path=%{_bindir}/xwalk-launcher
-%if "%{profile}" == "mobile" || "%{profile}" == "wearable" || "%{profile}" == "tv"
-runtime_path=%{_bindir}/wrt
-%endif
-%cmake . -DCMAKE_BUILD_TYPE=%{?build_type:%build_type} -DWRT_LAUNCHER=${runtime_path}
+%cmake . -DCMAKE_BUILD_TYPE=%{?build_type:%build_type}

 make %{?_smp_mflags}
 
 %install
 make %{?_smp_mflags}
 
 %install

diff --git a/src/wgt/CMakeLists.txt b/src/wgt/CMakeLists.txt
index 8334362..a9baf9b 100755 (executable)
--- a/src/wgt/CMakeLists.txt
+++ b/src/wgt/CMakeLists.txt
@@ -6,13 +6,6 @@ AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/step/filesystem WGT_STEP_FILESY
 AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/step/pkgmgr WGT_STEP_PKGMGR_SRCS)
 AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/step/security WGT_STEP_SECURITY_SRCS)
 
 AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/step/pkgmgr WGT_STEP_PKGMGR_SRCS)
 AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/step/security WGT_STEP_SECURITY_SRCS)
 

-IF(WRT_LAUNCHER)
-    ADD_DEFINITIONS("-DWRT_LAUNCHER=\"${WRT_LAUNCHER}\"")
-    MESSAGE( "WRT LAUNCHER binary path is  set to ${WRT_LAUNCHER}")
-ELSE(WRT_LAUNCHER)
-    MESSAGE(FATAL_ERROR, "WRT LAUNCHER binary path is not set")
-ENDIF(WRT_LAUNCHER)
-

 # Target - definition
 ADD_LIBRARY(${TARGET_LIBNAME_WGT} STATIC
   ${WGT_SRCS}
 # Target - definition
 ADD_LIBRARY(${TARGET_LIBNAME_WGT} STATIC
   ${WGT_SRCS}

diff --git a/src/wgt/step/filesystem/step_create_symbolic_link.cc b/src/wgt/step/filesystem/step_create_symbolic_link.cc
index a814f04..d54ab59 100644 (file)
--- a/src/wgt/step/filesystem/step_create_symbolic_link.cc
+++ b/src/wgt/step/filesystem/step_create_symbolic_link.cc
@@ -24,6 +24,7 @@ namespace {
 
 const char kWrtServiceBinaryPath[] = "/usr/bin/wrt-service";
 const char kWebWidgetRuntimeBinaryPath[] = "/usr/bin/web-widget-runtime";
 
 const char kWrtServiceBinaryPath[] = "/usr/bin/wrt-service";
 const char kWebWidgetRuntimeBinaryPath[] = "/usr/bin/web-widget-runtime";

+const char kWRTPath[] = "/usr/bin/wrt";

 
 }  // namespace
 
 
 }  // namespace
 


@@ -46,9 +47,9 @@ bool StepCreateSymbolicLink::CreateSymlinksForApps() {
       bf::remove_all(exec_path);
 
     if (strcmp(app->component_type, "uiapp") == 0) {
       bf::remove_all(exec_path);
 
     if (strcmp(app->component_type, "uiapp") == 0) {

-      bf::create_symlink(bf::path(WRT_LAUNCHER), exec_path, error);
+      bf::create_symlink(bf::path(kWRTPath), exec_path, error);

     } else if (strcmp(app->component_type, "watchapp") == 0) {
     } else if (strcmp(app->component_type, "watchapp") == 0) {

-      bf::create_symlink(bf::path(WRT_LAUNCHER), exec_path, error);
+      bf::create_symlink(bf::path(kWRTPath), exec_path, error);

     } else if (strcmp(app->component_type, "widgetapp") == 0) {
       bf::create_symlink(kWebWidgetRuntimeBinaryPath, exec_path, error);
     } else {
     } else if (strcmp(app->component_type, "widgetapp") == 0) {
       bf::create_symlink(kWebWidgetRuntimeBinaryPath, exec_path, error);
     } else {