Merge lp:~marcustomlinson/unity-js-scopes/standalone-scope into lp:unity-js-scopes

[Marcus Tomlinson]

Added unity-js-scopes-tool to allow for easy packaging of the bindings into scope projects, and updated the simple-click example scope accordingly.

[Alexandre Abreu (abreu-alexandre)]

review: Approve

=== modified file 'debian/control'
--- debian/control	2015-08-25 13:47:20 +0000
+++ debian/control	2015-09-16 07:03:32 +0000
@@ -24,8 +24,8 @@
 Depends: ${misc:Depends},
          ${shlibs:Depends},
 Description: Javascript bindings to unity scopes library
- Provides a mean for developers to developer Ubuntu Scopes in Javascript
- by providing bindings to the unity scopes API.
+ Provides a means for developers to develop Ubuntu Scopes in Javascript
+ by providing bindings to the Unity Scopes API.
 
 Package: unity-js-scopes-launcher
 Architecture: any
@@ -34,4 +34,4 @@
          ${shlibs:Depends},
          unity-js-scopes-bindings (= ${binary:Version}),
 Description: Scope launcher for unity javascript scopes
- Provides a custom mean for developers to launch their Javascript Ubuntu Scopes.
+ Provides a custom means for developers to launch their Javascript Ubuntu Scopes.

=== modified file 'debian/unity-js-scopes-bindings.install'
--- debian/unity-js-scopes-bindings.install	2015-07-09 01:03:04 +0000
+++ debian/unity-js-scopes-bindings.install	2015-09-16 07:03:32 +0000
@@ -1,1 +1,1 @@
-node_modules/unity-js-scopes/*
\ No newline at end of file
+node_modules/unity-js-scopes/*

=== modified file 'debian/unity-js-scopes-launcher.install'
--- debian/unity-js-scopes-launcher.install	2015-07-09 01:03:04 +0000
+++ debian/unity-js-scopes-launcher.install	2015-09-16 07:03:32 +0000
@@ -1,1 +1,2 @@
-usr/bin/unity-js-scopes-launcher
\ No newline at end of file
+usr/bin/unity-js-scopes-launcher
+usr/bin/unity-js-scopes-tool

=== modified file 'examples/simple-click/CMakeLists.txt'
--- examples/simple-click/CMakeLists.txt	2015-08-06 09:37:35 +0000
+++ examples/simple-click/CMakeLists.txt	2015-09-16 07:03:32 +0000
@@ -1,7 +1,11 @@
 project(js-scope)
 cmake_minimum_required(VERSION 2.8.10)
 
-# Do not remove this line, its required for the correct functionality of the Ubuntu-SDK
+# Do not remove this, its required to ensure the correct node binaries are included in the project
+execute_process(COMMAND unity-js-scopes-tool install ${CMAKE_SOURCE_DIR}/src/node_modules)
+add_custom_target(install_modules ALL COMMAND unity-js-scopes-tool install ${CMAKE_SOURCE_DIR}/src/node_modules)
+
+# Do not remove this, its required for the correct functionality of the Ubuntu-SDK
 set(UBUNTU_MANIFEST_PATH "manifest.json.in" CACHE INTERNAL "Tells QtCreator location and name of the manifest file")
 set(UBUNTU_PROJECT_TYPE "Scope" CACHE INTERNAL "Tells QtCreator this is a Scope project")
 
@@ -21,16 +25,21 @@
 
 configure_file(manifest.json.in ${CMAKE_CURRENT_BINARY_DIR}/manifest.json)
 
-# Install the click manifest
+# Install the manifest and apparmor files
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/manifest.json DESTINATION "/")
 install(FILES "js-scope.apparmor" DESTINATION "/")
 
-# Make these files show up in QtCreator
+# Make manifest, apparmor, and js files show up in QtCreator
+file(GLOB_RECURSE
+  _JS_FILES
+  "*.js"
+)
 add_custom_target(hidden_files
   ALL
   SOURCES
     manifest.json.in
     js-scope.apparmor
+    ${_JS_FILES}
 )
 
 # Add our main directories

=== modified file 'examples/simple-click/js-scope.apparmor'
--- examples/simple-click/js-scope.apparmor	2015-08-06 09:37:35 +0000
+++ examples/simple-click/js-scope.apparmor	2015-09-16 07:03:32 +0000
@@ -1,5 +1,5 @@
 {
-    "template": "unconfined",
+    "template": "ubuntu-scope-network",
     "policy_groups": [],
     "policy_version": 1.3
 }

=== modified file 'examples/simple-click/src/CMakeLists.txt'
--- examples/simple-click/src/CMakeLists.txt	2015-08-19 12:25:48 +0000
+++ examples/simple-click/src/CMakeLists.txt	2015-09-16 07:03:32 +0000
@@ -8,7 +8,7 @@
 )
 
 configure_file(
-  "${CMAKE_CURRENT_SOURCE_DIR}/../data/${SCOPE_NAME}.ini.in"
+  "${CMAKE_CURRENT_SOURCE_DIR}/${SCOPE_NAME}.ini.in"
   "${CMAKE_CURRENT_BINARY_DIR}/${SCOPE_NAME}.ini"
   @ONLY
   COPYONLY
@@ -21,6 +21,13 @@
   COPYONLY
 )
 
+add_custom_target(
+  copy_modules ALL
+  COMMAND ${CMAKE_COMMAND} -E copy_directory
+    "${CMAKE_CURRENT_SOURCE_DIR}/node_modules"
+    "${CMAKE_CURRENT_BINARY_DIR}/node_modules"
+)
+
 # Install the scope ini and js files
 install(
   FILES
@@ -29,3 +36,11 @@
   DESTINATION
     ${SCOPE_INSTALL_DIR}
 )
+
+install(
+  DIRECTORY
+    "${CMAKE_CURRENT_SOURCE_DIR}/node_modules"
+  DESTINATION
+    ${SCOPE_INSTALL_DIR}
+  USE_SOURCE_PERMISSIONS
+)

=== renamed file 'examples/simple-click/data/js-scope.webapps_js-scope.ini.in' => 'examples/simple-click/src/js-scope.webapps_js-scope.ini.in'
--- examples/simple-click/data/js-scope.webapps_js-scope.ini.in	2015-09-01 10:31:12 +0000
+++ examples/simple-click/src/js-scope.webapps_js-scope.ini.in	2015-09-16 07:03:32 +0000
@@ -1,7 +1,5 @@
 [ScopeConfig]
-ScopeRunner=/usr/bin/unity-js-scopes-launcher %S %R
-#ScopeRunner=/usr/bin/gdbserver :10000 /usr/bin/unity-js-scopes-launcher %S %R
-#DebugMode = true
+ScopeRunner=./node_modules/unity-js-scopes/bin/unity-js-scopes-launcher %S %R
 DisplayName = Simple JS Scope
 Description = A simple JS scope
 Author = WebApps

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2015-06-19 20:38:02 +0000
+++ src/CMakeLists.txt	2015-09-16 07:03:32 +0000
@@ -18,3 +18,4 @@
 
 add_subdirectory(bindings)
 add_subdirectory(launcher)
+add_subdirectory(tool)

=== modified file 'src/launcher/main.cc'
--- src/launcher/main.cc	2015-08-05 07:31:51 +0000
+++ src/launcher/main.cc	2015-09-16 07:03:32 +0000
@@ -29,7 +29,8 @@
 #include <boost/filesystem.hpp>
 
 void usage() {
-  std::cout << executable_name()
+  std::cout << "Usage: "
+            << executable_name()
             << " "
             << "<path-to-scope-ini>"
             << " "

=== added directory 'src/tool'
=== added file 'src/tool/CMakeLists.txt'
--- src/tool/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ src/tool/CMakeLists.txt	2015-09-16 07:03:32 +0000
@@ -0,0 +1,22 @@
+# vim:expandtab:shiftwidth=2:tabstop=2:
+
+# Copyright (C) 2015 Canonical Ltd.
+
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+install(FILES unity-js-scopes-tool
+  DESTINATION /usr/bin
+  PERMISSIONS WORLD_READ WORLD_EXECUTE
+  )

=== added file 'src/tool/unity-js-scopes-tool'
--- src/tool/unity-js-scopes-tool	1970-01-01 00:00:00 +0000
+++ src/tool/unity-js-scopes-tool	2015-09-16 07:03:32 +0000
@@ -0,0 +1,48 @@
+#!/bin/bash
+
+# Check that there are 2 arguments
+if [ $# != 2 ] || [ $1 != "install" ]; then
+    echo "Usage: unity-js-scopes-tool install <path/to/node_modules>"
+    exit 1
+fi
+
+# Check that the target directory is named "node_modules"
+if [[ ! $2 == */node_modules ]] && [[ ! $2 == */node_modules/ ]]; then
+    echo "Target directory should be named 'node_modules'"
+    exit 1
+fi
+
+# Check that the argument is not already a file
+if [ -f $2 ]; then
+    echo "'$2' already exists as a file"
+    exit 1
+fi
+
+echo "Installation started."
+
+# Ensure that the target node_modules folder exists
+mkdir -p $2
+
+# Copy the unity-js-scopes bindings into the target node_modules folder
+echo "Removing '$2/unity-js-scopes' ..."
+rm -rf $2/unity-js-scopes
+echo "Copying '/node_modules/unity-js-scopes' to '$2' ..."
+cp -r /node_modules/unity-js-scopes $2
+echo "Copying '/usr/bin/unity-js-scopes-launcher' to '$2/unity-js-scopes/bin' ..."
+mkdir -p $2/unity-js-scopes/bin
+cp /usr/bin/unity-js-scopes-launcher $2/unity-js-scopes/bin
+
+# Rebuild any binary npm modules for the current targeted arch
+if [ ! -f /usr/bin/node ] && [ -f /usr/bin/nodejs ]; then
+    # If we are using the old node + npm:
+    echo "Rebuilding binary modules in '$2' (using old nodejs) ..."
+    ln -s /usr/bin/nodejs $2/node
+    PATH=$2:$PATH nodejs /usr/lib/nodejs/npm/lib/npm.js --prefix=$2/../ rebuild
+    rm $2/node
+elif [ -f /usr/bin/npm ]; then
+    # Else if we are using the new node + npm:
+    echo "Rebuilding binary modules in '$2' (using npm) ..."
+    npm --prefix=$2/../ rebuild
+fi
+
+echo "Installation complete."