Merged and fixed conflicts from master

Author: amatas

.gitignore

@@ -1,8 +1,6 @@
-node_modules/gsettingsBridge/nodegsettings/.lock-wscript
-node_modules/gsettingsBridge/nodegsettings/build
-gpii/node_modules/alsa/nodealsa/build
-gpii/node_modules/gsettingsBridge/nodegsettings/build
-gpii/node_modules/packagekit/nodepackagekit/build
-gpii/node_modules/xrandr/nodexrandr/build
-node_modules
 .vagrant
+gpii/node_modules/alsa/nodealsa/build/
+gpii/node_modules/gsettingsBridge/nodegsettings/build/
+gpii/node_modules/packagekit/nodepackagekit/build/
+gpii/node_modules/xrandr/nodexrandr/build/
+/node_modules/

Gruntfile.js

@@ -53,7 +53,7 @@ module.exports = function (grunt) {
             }
         },
         jsonlint: {
-            src: ["gpii/**/*.json", "tests/**/*.json"]
+            src: ["gpii/**/*.json"]
         },
         appFileName: "gpii-linux",
         buildDir: "build",
@@ -144,18 +144,26 @@ module.exports = function (grunt) {
 
     grunt.registerTask("build", "Build the entire GPII", function () {
         grunt.task.run("gpii-universal");
+        grunt.task.run("build-addons");
+        grunt.task.run("shell:installUsbLib");
+    });
+
+    grunt.registerTask("build-addons", "Build the native addons", function () {
         grunt.task.run("shell:compileGSettings");
         grunt.task.run("shell:compileAlsaBridge");
         grunt.task.run("shell:compileXrandrBridge");
         grunt.task.run("shell:compilePackageKitBridge");
-        grunt.task.run("shell:installUsbLib");
     });
 
-    grunt.registerTask("clean", "Clean the GPII binaries and uninstall", function () {
+    grunt.registerTask("clean-addons", "Clean the native addons", function () {
         grunt.task.run("shell:cleanGSettings");
         grunt.task.run("shell:cleanAlsaBridge");
         grunt.task.run("shell:cleanXrandrBridge");
         grunt.task.run("shell:cleanPackageKitBridge");
+    });
+
+    grunt.registerTask("clean", "Clean the GPII binaries and uninstall", function () {
+        grunt.task.run("clean-addons");
         grunt.task.run("shell:uninstallUsbLib");
     });
 

Vagrantfile

@@ -24,7 +24,7 @@ ram = ENV["VM_RAM"] || 2048
 
 Vagrant.configure(2) do |config|
 
-  config.vm.box = "inclusivedesign/fedora22"
+  config.vm.box = "inclusivedesign/fedora23"
 
   # Your working directory will be synced to /home/vagrant/sync in the VM.
   config.vm.synced_folder ".", "#{app_directory}"