Merge lp:~webapps/unity-js-scopes/fix-npm-build into lp:unity-js-scopes

[Marcus Tomlinson]

Detect current arch for unity-js-scopes-tool build.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:84
http://jenkins.qa.ubuntu.com/job/unity-js-scopes-ci/5/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-js-scopes-wily-amd64-ci/5
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-js-scopes-wily-armhf-ci/5
        deb: http://jenkins.qa.ubuntu.com/job/unity-js-scopes-wily-armhf-ci/5/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-js-scopes-wily-i386-ci/5

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-js-scopes-ci/5/rebuild

review: Approve (continuous-integration)

[lp:~webapps/unity-js-scopes/fix-npm-build]

85. By Marcus Tomlinson on 2015-10-14

Merged remove-factory-new-constructs

[Alexandre Abreu (abreu-alexandre)]

A small comment

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:85
http://jenkins.qa.ubuntu.com/job/unity-js-scopes-ci/6/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-js-scopes-wily-amd64-ci/6
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-js-scopes-wily-armhf-ci/6
        deb: http://jenkins.qa.ubuntu.com/job/unity-js-scopes-wily-armhf-ci/6/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-js-scopes-wily-i386-ci/6

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-js-scopes-ci/6/rebuild

review: Approve (continuous-integration)

[lp:~webapps/unity-js-scopes/fix-npm-build]

86. By Marcus Tomlinson on 2015-10-16

Added better error checking to get_arch() call

[Marcus Tomlinson (marcustomlinson)]

> A small comment

fixed

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:86
http://jenkins.qa.ubuntu.com/job/unity-js-scopes-ci/10/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-js-scopes-wily-amd64-ci/10/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-js-scopes-wily-armhf-ci/10
        deb: http://jenkins.qa.ubuntu.com/job/unity-js-scopes-wily-armhf-ci/10/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-js-scopes-wily-i386-ci/10

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-js-scopes-ci/10/rebuild

review: Needs Fixing (continuous-integration)

[lp:~webapps/unity-js-scopes/fix-npm-build]

87. By Marcus Tomlinson on 2015-10-16

Merged trunk

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:87
http://jenkins.qa.ubuntu.com/job/unity-js-scopes-ci/11/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-js-scopes-wily-amd64-ci/11/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-js-scopes-wily-armhf-ci/11
        deb: http://jenkins.qa.ubuntu.com/job/unity-js-scopes-wily-armhf-ci/11/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-js-scopes-wily-i386-ci/11

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-js-scopes-ci/11/rebuild

review: Needs Fixing (continuous-integration)

[Alexandre Abreu (abreu-alexandre)]

LGTM

review: Approve

=== modified file 'src/tool/main.cc'
--- src/tool/main.cc	2015-10-06 20:01:49 +0000
+++ src/tool/main.cc	2015-10-16 10:48:39 +0000
@@ -30,6 +30,38 @@
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/filesystem.hpp>
 
+std::string get_arch() {
+  std::string result = "";
+
+  {
+    FILE* pipe = popen("dpkg-architecture -qDEB_HOST_ARCH", "r");
+    if (!pipe) throw std::runtime_error("'dpkg-architecture' command failed");
+    char buffer[128];
+    while (!feof(pipe)) {
+      if (fgets(buffer, 128, pipe) != NULL)
+        result += buffer;
+    }
+    result.pop_back();
+    pclose(pipe);
+  }
+
+  result += "-";
+
+  {
+    FILE* pipe = popen("lsb_release -rs", "r");
+    if (!pipe) throw std::runtime_error("'lsb_release' command failed");
+    char buffer[128];
+    while (!feof(pipe)) {
+      if (fgets(buffer, 128, pipe) != NULL)
+        result += buffer;
+    }
+    result.pop_back();
+    pclose(pipe);
+  }
+
+  return result;
+}
+
 void usage() {
   std::cout << "Usage:"
             << std::endl
@@ -41,7 +73,6 @@
             << executable_name()
             << " [re]build "
             << "<path/to/node_modules> "
-            << "[<target_arch>]"
             << std::endl;
 }
 
@@ -198,10 +229,13 @@
     {
       bool should_build = true;
       std::string current_arch = "default";
-
-      if (argc > 3)
-      {
-        current_arch = std::string(argv[3]);
+      try
+      {
+        current_arch = get_arch();
+      }
+      catch (std::exception const& e)
+      {
+        std::cout << "Failed to detect target architecture (using 'default' instead): " << e.what() << " ..." << std::endl;
       }
 
       // Check if we have built for this arch already, if so set should_build to false
@@ -221,8 +255,8 @@
       {
         std::vector<std::string> environment_updates;
         
-        std::cout << "Setting target arch to '" << current_arch << "' ..." << std::endl;
-        if (current_arch == "armhf")
+        std::cout << "Setting target architecture to '" << current_arch << "' ..." << std::endl;
+        if (boost::algorithm::starts_with(current_arch, "armhf"))
         {
           if (boost::filesystem::exists("/usr/bin/arm-linux-gnueabihf-gcc-5"))
           {