fixup! Upgrade wrt_support for electron v1.6.7

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

diff --git a/wrt/wrt_support/apps_repo/extensions_settings/main.js b/wrt/wrt_support/apps_repo/extensions_settings/main.js
index c596830..25a51ea 100644 (file)
--- a/wrt/wrt_support/apps_repo/extensions_settings/main.js
+++ b/wrt/wrt_support/apps_repo/extensions_settings/main.js
@@ -1,5 +1,5 @@
-var app = require('app');  // Module to control application life.
-var BrowserWindow = require('browser-window');  // Module to create native browser window.
+const {app} = require('electron');  // Module to control application life.
+const {BrowserWindow} = require('electron');  // Module to create native browser window.
 
 // Report crashes to our server.
 require('crash-reporter').start();

diff --git a/wrt/wrt_support/apps_repo/extensions_settings/src/extension_manager.js b/wrt/wrt_support/apps_repo/extensions_settings/src/extension_manager.js
index dca4291..1920e5c 100644 (file)
--- a/wrt/wrt_support/apps_repo/extensions_settings/src/extension_manager.js
+++ b/wrt/wrt_support/apps_repo/extensions_settings/src/extension_manager.js
@@ -11,7 +11,7 @@
   var util = require('util');
   var mkdirp = require('mkdirp');
 
-  var ipc = require('ipc');
+  var {ipcRenderer} = require('electron');
   var IPC_EXTENSIONS_INSTALLED = 'ipc:extensions:installed';
   var IPC_EXTENSIONS_UNINSTALLED = 'ipc:extensions:uninstalled';
   var IPC_EXTENSIONS_ACTIVATE = 'ipc:extensions:activate';
@@ -169,7 +169,7 @@
           }
           ext_manager.saveJsonDB();
 
-          ipc.send(IPC_EXTENSIONS_INSTALLED, extension.name);
+          ipcRenderer.send(IPC_EXTENSIONS_INSTALLED, extension.name);
         } else {
           console.log('InstallRepoItem - error : extension = ' + extension + ' extensions_list_=' + ext_manager.extensions_list_);
         }
@@ -190,7 +190,7 @@
       }
       this.saveJsonDB();
 
-      ipc.send(IPC_EXTENSIONS_UNINSTALLED, extension.name);
+      ipcRenderer.send(IPC_EXTENSIONS_UNINSTALLED, extension.name);
     }
 
     /* installer - get manifest info from path */
@@ -380,11 +380,11 @@
     };
 
     ExtensionManager.prototype.activate = function(name) {
-      ipc.send(IPC_EXTENSIONS_ACTIVATE, name);
+      ipcRenderer.send(IPC_EXTENSIONS_ACTIVATE, name);
     };
 
     ExtensionManager.prototype.deactivate = function(name) {
-      ipc.send(IPC_EXTENSIONS_DEACTIVATE, name);
+      ipcRenderer.send(IPC_EXTENSIONS_DEACTIVATE, name);
     };
 
     ExtensionManager.getManifestFile = function() {

diff --git a/wrt/wrt_support/apps_repo/installer/js/installer.js b/wrt/wrt_support/apps_repo/installer/js/installer.js
index 6fa2bec..c8ec974 100644 (file)
--- a/wrt/wrt_support/apps_repo/installer/js/installer.js
+++ b/wrt/wrt_support/apps_repo/installer/js/installer.js
@@ -1,9 +1,10 @@
 (function () {
     var fs = require('fs'),
         path = require('path'),
-        InstallManager = require(path.join('..', '..', 'installer', 'manager.js')),
+        InstallManager = require(path.join(__dirname, '..', '..', 'installer', 'manager.js')),
         installedAppList = null,
-        WAS_EXTENSIONS_PATH = path.join('..', '..', 'extensions');
+        WAS_EXTENSIONS_PATH = path.join(__dirname, '..', '..', 'extensions');
+    console.log('WAS_EXTENSIONS_PATH : ' + WAS_EXTENSIONS_PATH);
 
     var restServer = require('./js/restServer.js');
 
@@ -64,17 +65,20 @@
 
     if (process.env.WAS_INSTALLER_PATH) {
         InstallManager = require(path.join(process.env.WAS_INSTALLER_PATH, 'manager.js'));
+        console.log('WAS_INSTALLER_PATH : ' + process.env.WAS_INSTALLER_PATH);
     }
     if (process.env.WAS_EXTENSIONS_PATH) {
         WAS_EXTENSIONS_PATH = process.env.WAS_EXTENSIONS_PATH;
+        console.log('WAS_EXTENSIONS_PATH : ' + WAS_EXTENSIONS_PATH);
     }
 
     var installManager = new InstallManager();
 
-    fs.readdir(path.join('sample', 'wgt'), function (err, files) {
+    fs.readdir(path.join(__dirname, '..', '..', 'sample', 'wgt'), function (err, files) {
         var extname,
             title = null,
             firstFlag = false;
+        console.log('files : ' + files);
 
         installedAppList = getInstalledAppList();
 
@@ -119,6 +123,7 @@
         addClass(icon, 'icon');
         var icon_src;
         if (WAS_SAMPLE_PATH) {
+            console.log('WAS_SAMPLE_PATH : ' + WAS_SAMPLE_PATH);
             icon_src = path.join(WAS_SAMPLE_PATH, 'wgt', 'icon', options.icon);
         } else {
             icon_src = path.join('..', '..', 'sample', 'wgt', 'icon', options.icon);

diff --git a/wrt/wrt_support/extensions/extensions_db.json b/wrt/wrt_support/extensions/extensions_db.json
new file mode 100644 (file)
index 0000000..fe51488
--- /dev/null
+++ b/wrt/wrt_support/extensions/extensions_db.json
@@ -0,0 +1 @@
+[]

diff --git a/wrt/wrt_support/extensions_repo/banner_slide/banner_slide.js b/wrt/wrt_support/extensions_repo/banner_slide/banner_slide.js
index 23aa99f..de7716e 100644 (file)
--- a/wrt/wrt_support/extensions_repo/banner_slide/banner_slide.js
+++ b/wrt/wrt_support/extensions_repo/banner_slide/banner_slide.js
@@ -1,7 +1,7 @@
 (function() {
-  var path = require('path');
-  var BrowserWindow = require('browser-window');
-  var TRIGGER_EVENT = 'was:webcontents:did-finish-load';
+  const path = require('path');
+  const {BrowserWindow} = require('electron');
+  const TRIGGER_EVENT = 'ipc:webcontents:did-finish-load';
 
   BannerSlide = (function() {
     function BannerSlide(window_id) {

diff --git a/wrt/wrt_support/extensions_repo/iframe_banner_ads/iframe_banner_ads.js b/wrt/wrt_support/extensions_repo/iframe_banner_ads/iframe_banner_ads.js
index 03d02ef..6f43850 100644 (file)
--- a/wrt/wrt_support/extensions_repo/iframe_banner_ads/iframe_banner_ads.js
+++ b/wrt/wrt_support/extensions_repo/iframe_banner_ads/iframe_banner_ads.js
@@ -1,7 +1,7 @@
 (function() {
-  var path = require('path');
-  var BrowserWindow = require('browser-window');
-  var TRIGGER_EVENT = 'was:webcontents:did-finish-load';
+  const path = require('path');
+  const {BrowserWindow} = require('electron');
+  const TRIGGER_EVENT = 'ipc:webcontents:did-finish-load';
 
   IFrameBannerAds = (function() {
     function IFrameBannerAds(window_id) {

diff --git a/wrt/wrt_support/extensions_repo/launcher_new/launcher_new.js b/wrt/wrt_support/extensions_repo/launcher_new/launcher_new.js
index 90c614b..e7011be 100644 (file)
--- a/wrt/wrt_support/extensions_repo/launcher_new/launcher_new.js
+++ b/wrt/wrt_support/extensions_repo/launcher_new/launcher_new.js
@@ -1,6 +1,6 @@
 (function() {
-  var BrowserWindow = require('browser-window');
-  var TRIGGER_EVENT = 'was:webcontents:did-finish-load';
+  const {BrowserWindow} = require('electron');
+  const TRIGGER_EVENT = 'ipc:webcontents:did-finish-load';
 
   LauncherNew = (function() {
     function LauncherNew(window_id) {

diff --git a/wrt/wrt_support/extensions_repo/ticker_test/ticker_test.js b/wrt/wrt_support/extensions_repo/ticker_test/ticker_test.js
index 41b8d68..d1f8a63 100644 (file)
--- a/wrt/wrt_support/extensions_repo/ticker_test/ticker_test.js
+++ b/wrt/wrt_support/extensions_repo/ticker_test/ticker_test.js
@@ -1,6 +1,6 @@
 (function() {
-  var BrowserWindow = require('browser-window');
-  var TRIGGER_EVENT = 'was:webcontents:did-finish-load';
+  const {BrowserWindow} = require('electron');
+  const TRIGGER_EVENT = 'ipc:webcontents:did-finish-load';
 
   TickerTest = (function() {
     function TickerTest(window_id) {

diff --git a/wrt/wrt_support/extensions_settings/main.js b/wrt/wrt_support/extensions_settings/main.js
index c596830..25a51ea 100644 (file)
--- a/wrt/wrt_support/extensions_settings/main.js
+++ b/wrt/wrt_support/extensions_settings/main.js
@@ -1,5 +1,5 @@
-var app = require('app');  // Module to control application life.
-var BrowserWindow = require('browser-window');  // Module to create native browser window.
+const {app} = require('electron');  // Module to control application life.
+const {BrowserWindow} = require('electron');  // Module to create native browser window.
 
 // Report crashes to our server.
 require('crash-reporter').start();

diff --git a/wrt/wrt_support/installer/js/database.js b/wrt/wrt_support/installer/js/database.js
index 56fc68d..d278776 100755 (executable)
--- a/wrt/wrt_support/installer/js/database.js
+++ b/wrt/wrt_support/installer/js/database.js
@@ -4,6 +4,7 @@ var fs = require('fs'),
 
 module.exports = {
     update: function (installPath, data) {
+        console.log('update');
         if (fs.statSync(installPath).isDirectory()) {
             diskdb.connect(installPath, ['database']);
 
@@ -24,6 +25,7 @@ module.exports = {
     },
 
     getList: function (installPath) {
+        console.log('getList');
         var databaseFile = path.join(installPath, 'database.json');
         if (fs.statSync(databaseFile).isFile()) {
             diskdb.connect(installPath, ['database']);
@@ -46,6 +48,7 @@ module.exports = {
     },
 
     getData: function (installPath, key) {
+        console.log('getData');
         var databaseFile = path.join(installPath, 'database.json');
         if (fs.statSync(databaseFile).isFile()) {
             diskdb.connect(installPath, ['database']);
@@ -63,4 +66,4 @@ module.exports = {
             }
         }
     }
-};
\ No newline at end of file
+};

diff --git a/wrt/wrt_support/installer/manager.js b/wrt/wrt_support/installer/manager.js
index bc5223b..ef49e5b 100755 (executable)
--- a/wrt/wrt_support/installer/manager.js
+++ b/wrt/wrt_support/installer/manager.js
@@ -13,6 +13,16 @@ var InstallManager = require("./js/installManager.js"),
     PackageManager = require("./js/packageManager.js"),
     database = require("./js/database.js");
 
+var wrt_support = path.join(__dirname, '..');
+
+process.env.WAS_APPS_REPO = process.env.WAS_APPS_REPO || path.join(wrt_support, 'apps_repo');
+process.env.WAS_INSTALLER_PATH = process.env.WAS_INSTALLER_PATH || path.join(wrt_support, 'installer');
+process.env.WAS_HOME = process.env.WAS_HOME || path.join(wrt_support);
+
+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);
+
 class Manager {
     constructor() {
         this.config = {};
@@ -50,15 +60,15 @@ class Manager {
 
     installPackage(packagePath) {
         var self = this;
+        self.config.Path.package = path.join(process.env.WAS_HOME, packagePath);
 
-        fs.stat(packagePath, function (err, stats) {
+        fs.stat(self.config.Path.package, function (err, stats) {
             if (err) {
               throw new Error("Package file is not exists.");
             }
 
             if (stats.isFile()){
-                self.config.Path.package = packagePath;
-                self.config.format = self.getExtension(packagePath);
+                self.config.format = self.getExtension(self.config.Path.package);
 
                 var installManager = new InstallManager(self.config);
                 installManager.runInstall();
@@ -70,6 +80,7 @@ class Manager {
     }
 
     getList() {
+        console.log('getList');
         console.log(database.getList(this.config.Path.install));
         return database.getList(this.config.Path.install);
     }
@@ -83,6 +94,7 @@ class Manager {
     }
 
     removePackage(packageName) {
+        console.log('removePackage');
         var self = this;
 
         if (database.getList(this.config.Path.install).indexOf(packageName) > -1){
@@ -122,4 +134,4 @@ class Manager {
 var manager = new Manager();
 manager.control(command);
 
-module.exports = Manager;
\ No newline at end of file
+module.exports = Manager;

diff --git a/wrt/wrt_support/sample/wgt/roundball.wgt b/wrt/wrt_support/sample/wgt/roundball.wgt
new file mode 100644 (file)
index 0000000..6c0a471
Binary files /dev/null and b/wrt/wrt_support/sample/wgt/roundball.wgt differ