Merge lp:~webapps/unity-js-scopes/build-in-silo into lp:unity-js-scopes

[Marcus Tomlinson]

Various fixes to get unity-js-scopes building in CI:
* Added missing .bzr-builddeb/default.conf file.
* Added missing dependancies to debian/control.
* Limit build to i386, amd64 and armhf as io.js not compiling on ppc.
* Branch io.js from our own import as git is seemly not allowed in CI.
* Branch v8-cpp anonymously to avoid ssh issues.
* Removed unnecessary libicu dependencies.
* Split build.sh / build-debug.sh scripts to match unity-js-scopes release / debug builds
* Allow the optional runtime ini launcher argument to be an empty string.

[Robert Bruce Park (robru)]

Marcus, you are not allowed to bzr branch in io.js in your packaging, please check your email for more details about this. And stop trying to build it.

review: Disapprove

[Robert Bruce Park (robru)]

Nevermind, sorry. You can build but you can't land.

review: Abstain

[lp:~webapps/unity-js-scopes/build-in-silo]

47. By Marcus Tomlinson on 2015-08-06

Fix link order

[Alexandre Abreu (abreu-alexandre)]

review: Approve

[lp:~webapps/unity-js-scopes/build-in-silo]

48. By Marcus Tomlinson on 2015-08-06

io.js v3 now supports ppc

49. By Marcus Tomlinson on 2015-08-11

Added CategorisedResult::set_art() method

=== added directory '.bzr-builddeb'
=== added file '.bzr-builddeb/default.conf'
--- .bzr-builddeb/default.conf	1970-01-01 00:00:00 +0000
+++ .bzr-builddeb/default.conf	2015-08-12 10:30:31 +0000
@@ -0,0 +1,2 @@
+[BUILDDEB]
+split = True

=== modified file 'debian/control'
--- debian/control	2015-07-09 01:02:19 +0000
+++ debian/control	2015-08-12 10:30:31 +0000
@@ -1,11 +1,14 @@
 Source: unity-js-scopes
-Section: x11
+Section: libs
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
-Build-Depends: cmake (>= 2.8.9),
+Build-Depends: bzr,
+               cmake (>= 2.8.9),
                debhelper (>= 9),
+               pkg-config,
                g++,
                libboost-filesystem-dev,
+               libnet-cpp-dev,
                libunity-scopes-dev,
 Standards-Version: 3.9.5
 Homepage: https://launchpad.net/unity-js-scopes

=== added file 'deps/build-debug.sh'
--- deps/build-debug.sh	1970-01-01 00:00:00 +0000
+++ deps/build-debug.sh	2015-08-12 10:30:31 +0000
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+DIR=$(readlink -f $(dirname ${BASH_SOURCE[0]}))
+
+# io.js
+
+cd $DIR
+
+cd io.js
+./configure --enable-static --debug
+make -j3

=== modified file 'deps/build.sh'
--- deps/build.sh	2015-07-29 05:47:39 +0000
+++ deps/build.sh	2015-08-12 10:30:31 +0000
@@ -7,5 +7,5 @@
 cd $DIR
 
 cd io.js
-./configure --enable-static --debug
+./configure --enable-static
 make -j3

=== modified file 'deps/get.sh'
--- deps/get.sh	2015-07-09 18:30:28 +0000
+++ deps/get.sh	2015-08-12 10:30:31 +0000
@@ -6,9 +6,9 @@
 # io.js
 
 if [ -d "io.js" ]; then
-    cd io.js; git pull; cd ..
+    cd io.js; cd ..
 else
-    git clone --depth 1 https://github.com/nodejs/io.js.git
+    bzr branch http://bazaar.launchpad.net/~webapps/unity-js-scopes/io.js io.js
 fi
 
 # v8cpp
@@ -16,5 +16,5 @@
 if [ -d "v8-cpp" ]; then
     cd v8-cpp; cd ..
 else
-    bzr branch lp:v8-cpp
+    bzr branch http://bazaar.launchpad.net/~unity-team/v8-cpp/trunk v8-cpp
 fi

=== modified file 'src/bindings/CMakeLists.txt'
--- src/bindings/CMakeLists.txt	2015-07-16 10:10:39 +0000
+++ src/bindings/CMakeLists.txt	2015-08-12 10:30:31 +0000
@@ -73,10 +73,6 @@
 
   ${SCOPE_LIBRARIES}
 
-  icui18n
-  icuuc
-  icudata
-
   pthread
   dl
   )

=== modified file 'src/bindings/src/addon.cc'
--- src/bindings/src/addon.cc	2015-07-29 10:49:49 +0000
+++ src/bindings/src/addon.cc	2015-08-12 10:30:31 +0000
@@ -224,7 +224,8 @@
     v8cpp::Class<CategorisedResult> categorised_result(isolate);
     categorised_result
       .add_method("set_uri", &CategorisedResult::set_uri)
-      .add_method("set_title", &CategorisedResult::set_title);
+      .add_method("set_title", &CategorisedResult::set_title)
+      .add_method("set_art", &CategorisedResult::set_art);
 
     v8cpp::Class<CannedQuery> canned_query(isolate);
     canned_query

=== modified file 'src/bindings/src/categorised-result.cc'
--- src/bindings/src/categorised-result.cc	2015-06-18 16:39:04 +0000
+++ src/bindings/src/categorised-result.cc	2015-08-12 10:30:31 +0000
@@ -55,3 +55,18 @@
 
   unity::scopes::CategorisedResult::set_title(*(v8::String::Utf8Value(args[0]->ToString())));
 }
+
+void CategorisedResult::set_art(
+      v8::FunctionCallbackInfo<v8::Value> const& args) {
+  if (args.Length() != 1) {
+    // TODO fix
+    return;
+  }
+
+  if (!args[0]->IsString()) {
+    // TODO fix
+    return;
+  }
+
+  unity::scopes::CategorisedResult::set_art(*(v8::String::Utf8Value(args[0]->ToString())));
+}

=== modified file 'src/bindings/src/categorised-result.h'
--- src/bindings/src/categorised-result.h	2015-06-18 16:39:04 +0000
+++ src/bindings/src/categorised-result.h	2015-08-12 10:30:31 +0000
@@ -34,6 +34,7 @@
   // v8 binding
   void set_uri(v8::FunctionCallbackInfo<v8::Value> const& args);
   void set_title(v8::FunctionCallbackInfo<v8::Value> const& args);
+  void set_art(v8::FunctionCallbackInfo<v8::Value> const& args);
 
  private:
 

=== modified file 'src/launcher/CMakeLists.txt'
--- src/launcher/CMakeLists.txt	2015-07-29 05:47:39 +0000
+++ src/launcher/CMakeLists.txt	2015-08-12 10:30:31 +0000
@@ -72,25 +72,28 @@
   zlib
   http_parser
 
+  v8_libplatform
   v8_base
   v8_libbase
-  v8_libplatform
   v8_nosnapshot
 
   ${Boost_LIBRARIES}
 
-  icui18n
-  icuuc
-  icudata
-  
   pthread
   dl
   )
 
-add_custom_command(
-  TARGET ${LAUNCHER_EXECUTABLE_NAME} PRE_LINK
-  COMMAND ${CMAKE_SOURCE_DIR}/deps/build.sh
-)
+if(cmake_build_type_tolower STREQUAL "debug")
+  add_custom_command(
+    TARGET ${LAUNCHER_EXECUTABLE_NAME} PRE_LINK
+    COMMAND ${CMAKE_SOURCE_DIR}/deps/build-debug.sh
+  )
+else()
+  add_custom_command(
+    TARGET ${LAUNCHER_EXECUTABLE_NAME} PRE_LINK
+    COMMAND ${CMAKE_SOURCE_DIR}/deps/build.sh
+  )
+endif()
 
 install(TARGETS ${LAUNCHER_EXECUTABLE_NAME}
         RUNTIME DESTINATION /usr/bin)

=== modified file 'src/launcher/main.cc'
--- src/launcher/main.cc	2015-07-29 08:31:17 +0000
+++ src/launcher/main.cc	2015-08-12 10:30:31 +0000
@@ -65,12 +65,11 @@
          p.string().c_str(),
          true);
 
-  if (argc == 3) {
+  if (argc == 3 && !std::string(argv[2]).empty()) {
       std::string runtime_filename = argv[2];
 
-      if (runtime_filename.empty()
-          || !boost::filesystem::exists(runtime_filename)) {
-        std::cout << "Invalid or non existant runtime ini file name: "
+      if (!boost::filesystem::exists(runtime_filename)) {
+        std::cout << "Non-existant runtime ini file: "
                   << runtime_filename << std::endl;
         usage();
         return EXIT_FAILURE;