1
=== modified file 'src/tool/main.cc'
2
--- src/tool/main.cc	2015-10-06 20:01:49 +0000
3
+++ src/tool/main.cc	2015-10-16 10:48:39 +0000
4
@@ -30,6 +30,38 @@
5
30
#include <boost/algorithm/string/predicate.hpp>
30
#include <boost/algorithm/string/predicate.hpp>
6
31
#include <boost/filesystem.hpp>
31
#include <boost/filesystem.hpp>
7
32
32
8
33
std::string get_arch() {
9
34
  std::string result = "";
10
35
11
36
  {
12
37
    FILE* pipe = popen("dpkg-architecture -qDEB_HOST_ARCH", "r");
13
38
    if (!pipe) throw std::runtime_error("'dpkg-architecture' command failed");
14
39
    char buffer[128];
15
40
    while (!feof(pipe)) {
16
41
      if (fgets(buffer, 128, pipe) != NULL)
17
42
        result += buffer;
18
43
    }
19
44
    result.pop_back();
20
45
    pclose(pipe);
21
46
  }
22
47
23
48
  result += "-";
24
49
25
50
  {
26
51
    FILE* pipe = popen("lsb_release -rs", "r");
27
52
    if (!pipe) throw std::runtime_error("'lsb_release' command failed");
28
53
    char buffer[128];
29
54
    while (!feof(pipe)) {
30
55
      if (fgets(buffer, 128, pipe) != NULL)
31
56
        result += buffer;
32
57
    }
33
58
    result.pop_back();
34
59
    pclose(pipe);
35
60
  }
36
61
37
62
  return result;
38
63
}
39
64
40
33
void usage() {
65
void usage() {
41
34
  std::cout << "Usage:"
66
  std::cout << "Usage:"
42
35
            << std::endl
67
            << std::endl
43
@@ -41,7 +73,6 @@
44
41
            << executable_name()
73
            << executable_name()
45
42
            << " [re]build "
74
            << " [re]build "
46
43
            << "<path/to/node_modules> "
75
            << "<path/to/node_modules> "
47
44
            << "[<target_arch>]"
48
45
            << std::endl;
76
            << std::endl;
49
46
}
77
}
50
47
78
51
@@ -198,10 +229,13 @@
52
198
    {
229
    {
53
199
      bool should_build = true;
230
      bool should_build = true;
54
200
      std::string current_arch = "default";
231
      std::string current_arch = "default";
59
201
232
      try
60
202
      if (argc > 3)
233
      {
61
203
      {
234
        current_arch = get_arch();
62
204
        current_arch = std::string(argv[3]);
235
      }
63
236
      catch (std::exception const& e)
64
237
      {
65
238
        std::cout << "Failed to detect target architecture (using 'default' instead): " << e.what() << " ..." << std::endl;
66
205
      }
239
      }
67
206
240
68
207
      // Check if we have built for this arch already, if so set should_build to false
241
      // Check if we have built for this arch already, if so set should_build to false
69
@@ -221,8 +255,8 @@
70
221
      {
255
      {
71
222
        std::vector<std::string> environment_updates;
256
        std::vector<std::string> environment_updates;
72
223
        
257
        
75
224
        std::cout << "Setting target arch to '" << current_arch << "' ..." << std::endl;
258
        std::cout << "Setting target architecture to '" << current_arch << "' ..." << std::endl;
76
225
        if (current_arch == "armhf")
259
        if (boost::algorithm::starts_with(current_arch, "armhf"))
77
226
        {
260
        {
78
227
          if (boost::filesystem::exists("/usr/bin/arm-linux-gnueabihf-gcc-5"))
261
          if (boost::filesystem::exists("/usr/bin/arm-linux-gnueabihf-gcc-5"))
79
228
          {
262
          {
Reviewer	Review Type	Date Requested	Status
Alexandre Abreu (community)		2015-10-14	Approve on 2015-10-19
PS Jenkins bot (community)	continuous-integration	2015-10-14	Needs Fixing on 2015-10-16
Review via email: mp+274371@code.launchpad.net