fixup! Upgrade wrt for electron v1.6.7

Change-Id: I498bb82c1d24e9c8bd3bc24498ed892a766dbd6c
Signed-off-by: Youngsoo Choi <kenshin.choi@samsung.com>

diff --git a/wrt/src/main.js b/wrt/src/main.js
index 245cc37..9b96567 100644 (file)
--- a/wrt/src/main.js
+++ b/wrt/src/main.js
@@ -15,10 +15,22 @@ const commonModuleManager = require('./manager');
 const app = commonModuleManager.app;
 
 path_debug('__dirname :  ' + __dirname);
-var resourcePath = __dirname.split('app.asar')[0],
-    installPath = process.env.WAS_APPS_REPO || path.join(resourcePath, apps_repo),
-    installerPath = process.env.WAS_INSTALLER_PATH || path.join(resourcePath, 'wrt_support/installer'),
-    developPath = process.env.WAS_HOME || path.join(resourcePath, 'wrt_support'),
+
+var resourcePath = __dirname.split('app.asar')[0];
+
+process.env.WAS_APPS_REPO = process.env.WAS_APPS_REPO || path.join(resourcePath, apps_repo);
+process.env.WAS_INSTALLER_PATH = process.env.WAS_INSTALLER_PATH || path.join(resourcePath, 'wrt_support/installer');
+process.env.WAS_HOME = process.env.WAS_HOME || path.join(resourcePath, 'wrt_support');
+process.env.WRT_HOME = process.env.WRT_HOME || __dirname;
+
+path_debug('process.env.WAS_APPS_REPO      : ' + process.env.WAS_APPS_REPO);
+path_debug('process.env.WAS_INSTALLER_PATH : ' + process.env.WAS_INSTALLER_PATH);
+path_debug('process.env.WAS_HOME           : ' + process.env.WAS_HOME);
+path_debug('process.env.WRT_HOME           : ' + process.env.WRT_HOME);
+
+var installPath = process.env.WAS_APPS_REPO,
+    installerPath = process.env.WAS_INSTALLER_PATH,
+    developPath = process.env.WAS_HOME,
     parseCommandLine,
     makeArguments,
     start,

diff --git a/wrt/src/web_application.js b/wrt/src/web_application.js
index 0bb944c..240283d 100644 (file)
--- a/wrt/src/web_application.js
+++ b/wrt/src/web_application.js
@@ -116,7 +116,7 @@ class WebApplication {
             let resourcePath = __dirname.split('app.asar')[0];
             packagePath = path.join(this.installPath, packageName);
             packageContent = options.content ? options.content : this.packageIndexSuffix;
-            options.packageRealPath = this.packagePathPrefix + path.join(resourcePath, 'wrt_support/apps_repo', packageName, packageContent);
+            options.packageRealPath = this.packagePathPrefix + path.join(process.env.WAS_APPS_REPO, packageName, packageContent);
         }
         webapplication_debug('options.packageRealPath : ' + options.packageRealPath);
 

diff --git a/wrt/src/web_window_tag.js b/wrt/src/web_window_tag.js
index 63335fa..ae60995 100644 (file)
--- a/wrt/src/web_window_tag.js
+++ b/wrt/src/web_window_tag.js
@@ -37,28 +37,18 @@ class WebWindowTag {
         this.setUrl(this.canvas.html_path);
     }
     makeCanvas(type_hosted){
+        webwindow_debug('process.env.WRT_HOME : ' + process.env.WRT_HOME);
         var canvas_option = WebWindowTag.getBrowserWindowOption(),
-            resolved_path = process.env.WAS_HOME || path.join(__dirname, '..'),
+            resolved_path = path.join(process.env.WRT_HOME, '..'),
             packagePathPrefix = 'file://',
             canvas_html_path = path.join(packagePathPrefix, resolved_path, DEFAULT.CANVAS.PATH);
 
-        webwindow_debug('canvas_packageRealPath 111 : ' + packagePathPrefix);
-        webwindow_debug('canvas_packageRealPath: ' + canvas_html_path);
-        webwindow_debug('canvas_packageRealPath: ' + canvas_html_path);
-        webwindow_debug('canvas_packageRealPath: ' + canvas_html_path);
-        webwindow_debug('canvas_packageRealPath: ' + canvas_html_path);
         webwindow_debug('canvas_packageRealPath: ' + canvas_html_path);
         if (type_hosted === true) {
             canvas_html_path = path.join(packagePathPrefix, resolved_path, DEFAULT.CANVAS.PATH_HOSTED);
         }
 
         canvas_option.preload = path.join(ExtensionManager.getExtensionsPath(), ExtensionManager.getPreloadJsFile());
-        webwindow_debug('canvas_packageRealPath: ' + canvas_html_path);
-        webwindow_debug('canvas_packageRealPath: ' + canvas_html_path);
-        webwindow_debug('canvas_packageRealPath: ' + canvas_html_path);
-        webwindow_debug('canvas_packageRealPath: ' + canvas_html_path);
-        webwindow_debug('canvas_packageRealPath: ' + canvas_html_path);
-        webwindow_debug('canvas_packageRealPath: ' + canvas_html_path);
         return {
             mainWindow: new BrowserWindow(canvas_option),
             html_path: canvas_html_path

diff --git a/wrt/static/web_window.js b/wrt/static/web_window.js
index 8f7df58..4d4f2ae 100644 (file)
--- a/wrt/static/web_window.js
+++ b/wrt/static/web_window.js
@@ -5,6 +5,20 @@ $ = require('./bower_components/jquery/dist/jquery.min.js');
 const remote =  require('electron').remote;
 const CurrentBrowserWindow = remote.getCurrentWindow();
 const IPC_MESSAGE = remote.require('./ipc_message');
+const path = require('path');
+
+var resourcePath = __dirname.split('app.asar')[0];
+process.env.WAS_APPS_REPO = process.env.WAS_APPS_REPO || path.join(resourcePath, 'apps_repo');
+process.env.WAS_INSTALLER_PATH = process.env.WAS_INSTALLER_PATH || path.join(resourcePath, 'wrt_support', 'installer');
+process.env.WAS_HOME = process.env.WAS_HOME || path.join(resourcePath, 'wrt_support');
+process.env.WRT_HOME = process.env.WRT_HOME || __dirname;
+
+console.log('process.env.WAS_APPS_REPO      : ' + process.env.WAS_APPS_REPO);
+console.log('process.env.WAS_INSTALLER_PATH : ' + process.env.WAS_INSTALLER_PATH);
+console.log('process.env.WAS_HOME           : ' + process.env.WAS_HOME);
+console.log('process.env.WRT_HOME           : ' + process.env.WRT_HOME);
+console.log('__dirname                      : ' + __dirname);
+
 function setWasEventHandler() {
     window.addEventListener('keydown', function(e) {
         if (e.keyCode == 27) {