From 1ed49c328c6ac8d96e0e99c88d191fdd3abc2c3c Mon Sep 17 00:00:00 2001
From: Everton Fraga <ev@ethereum.org>
Date: Thu, 26 Jul 2018 23:20:23 -0300
Subject: [PATCH] Decoupling interface build for appveyor workaround

---
 .gitignore            |  1 +
 appveyor.yml          | 10 ++++++----
 gulpTasks/building.js | 13 ++++++++++---
 gulpfile.js           |  3 ++-
 package.json          |  2 +-
 5 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6d085a589..22eb3453f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,7 @@ interface/.meteor/dev_bundle
 interface/.meteor/public/
 dist_wallet/
 dist_mist/
+.interface/
 nodes/geth/
 config.json
 mist.log
diff --git a/appveyor.yml b/appveyor.yml
index 917264fe6..ad525fa93 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -32,11 +32,13 @@ install:
   - yarn install
 
 test_script:
-  - yarn build:mist --win --skipTasks=bundling-interface
-  - yarn gulp --wallet --win --skipTasks=bundling-interface
+  - cd interface && meteor-build-client ../build/interface -p ""
+
+  - yarn build:mist --win --skipTasks=build-interface
+  - yarn gulp --wallet --win --skipTasks=build-interface
   - yarn test:unit:once
-  - yarn task upload-queue --mist
-  - yarn task upload-queue --wallet
+  - yarn dist:mist
+  - yarn dist:wallet
 
 build: off
 
diff --git a/gulpTasks/building.js b/gulpTasks/building.js
index 8b8fa02c6..0c348efcd 100644
--- a/gulpTasks/building.js
+++ b/gulpTasks/building.js
@@ -87,6 +87,7 @@ gulp.task('pack-wallet', cb => {
     cb();
   });
 });
+
 // Currently, Mist and Ethereum Wallet expects ./wallet/ to be in different paths. This task aims to fulfill this requirement.
 gulp.task('move-wallet', cb => {
   if (type === 'wallet') {
@@ -99,10 +100,10 @@ gulp.task('move-wallet', cb => {
   cb();
 });
 
-gulp.task('bundling-interface', cb => {
-  const buildPath = path.join('..', `dist_${type}`, 'app', 'interface');
+gulp.task('build-interface', cb => {
+  const interfaceBuildPath = path.resolve('.interface');
   exec(
-    `meteor-build-client ${buildPath} -p ""`,
+    `meteor-build-client ${interfaceBuildPath} -p ""`,
     { cwd: 'interface' },
     (err, stdout) => {
       console.log(stdout);
@@ -111,6 +112,12 @@ gulp.task('bundling-interface', cb => {
   );
 });
 
+gulp.task('copy-interface', () => {
+  const interfaceBuildPath = path.resolve('.interface');
+  const interfaceDistPath = path.resolve(`dist_${type}`, 'app', 'interface');
+  return gulp.src([interfaceBuildPath]).pipe(gulp.dest(interfaceDistPath));
+});
+
 gulp.task('copy-i18n', () => {
   return gulp
     .src(['./interface/i18n/*.*', './interface/project-tap.i18n'], {
diff --git a/gulpfile.js b/gulpfile.js
index c3842ac98..efa549288 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -77,7 +77,8 @@ const tasks = [
   'transpile-modules',
   'copy-build-folder-files',
   'switch-production',
-  'bundling-interface',
+  'build-interface',
+  'copy-interface',
   'move-wallet',
   'copy-i18n',
   'build-dist',
diff --git a/package.json b/package.json
index b18e78e8f..5080a2209 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
     "test:e2e": "gulp test",
     "build:wallet": "gulp --wallet",
     "build:mist": "gulp --mist",
-    "build:interface": "meteor-build-client",
+    "build:interface": "cd interface && meteor-build-client ../.interface -p ''",
     "dist:mist": "gulp upload-queue --mist",
     "dist:wallet": "gulp upload-queue --wallet",
     "task": "gulp"