Skip to content
Browse files

Minor tidying, directory restructuring, and licensing.

  • Loading branch information...
1 parent 47b8f68 commit f81464bb59a906d2904e81d5da225b918c304ad9 @colinbdclark colinbdclark committed Mar 31, 2012
View
2 .gitignore
@@ -0,0 +1,2 @@
+node_modules/gsettingsBridge/nodegsettings/.lock-wscript
+node_modules/gsettingsBridge/nodegsettings/build
View
26 LICENSE.txt
@@ -0,0 +1,26 @@
+Copyright (c) 2012, OCAD University
+Copyright (c) 2012, Steven Githens
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+ * Neither the name of OCAD University nor the names of its contributors may
+ be used to endorse or promote products derived from this software without
+ specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
View
26 build.sh
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+node_modules="../node_modules"
+universal="../node_modules/universal"
+repoURL="git://github.com/GPII/universal.git"
+
+# Clone the necessary GPII framework dependencies from Git.
+
+if [ -d $node_modules ]; then
+ echo "$node_modules already exists"
+else
+ echo "$node_modules does not exist"
+ echo "creating $node_modules"
+ mkdir -p "$node_modules"
+fi
+if [ -d $universal ]; then
+ echo "$universal already exists"
+else
+ echo "$universal does not exist"
+ echo "cloning universal"
+ git clone "$repoURL" "$universal"
+fi
+
+# Compile the GSettings C++ Bridge
+cd node_modules/gsettingsBridge/nodegsettings
+node-waf configure build
View
21 node_modules/gsettingsBridge/README.md
@@ -1,8 +1,21 @@
-To compile the node extension:
+GPII Node.jS GSettings Bridge
+-----------------------------
-cd nodegsettings
-node-waf configure build
-node nodegsettings_tests.js # Run the tests
+The GPII gsettingsBridge is a Node.js bridge to GNOME's native GSettings API, written in C++.
+
+To compile the module:
+
+* Run build.sh at the top of this repository
+
+Or, by hand:
+
+* cd nodegsettings
+* node-waf configure build
+* node nodegsettings_tests.js # Run the tests
+
+
+Notes
+-----
gsettings_bridge for Fluid
View
12 node_modules/gsettingsBridge/gsettings_bridge.js
@@ -1,3 +1,15 @@
+/*!
+GPII Node.js GSettings Bridge
+
+Copyright 2012 Steven Githens
+
+Licensed under the New BSD license. You may not use this file except in
+compliance with this License.
+
+You may obtain a copy of the License at
+https://github.com/gpii/universal/LICENSE.txt
+*/
+
(function () {
"use strict";
View
12 node_modules/gsettingsBridge/index.js
@@ -1,3 +1,15 @@
+/*!
+GPII Node.js GSettings Bridge
+
+Copyright 2012 Steven Githens
+
+Licensed under the New BSD license. You may not use this file except in
+compliance with this License.
+
+You may obtain a copy of the License at
+https://github.com/gpii/universal/LICENSE.txt
+*/
+
var fluid = require("universal");
var loader = fluid.getLoader(__dirname);
View
12 node_modules/gsettingsBridge/nodegsettings/nodegsettings.cc
@@ -1,3 +1,15 @@
+/*
+GPII Node.js GSettings Bridge
+
+Copyright 2012 Steven Githens
+
+Licensed under the New BSD license. You may not use this file except in
+compliance with this License.
+
+You may obtain a copy of the License at
+https://github.com/gpii/universal/LICENSE.txt
+*/
+
#include <node.h>
#include <v8.h>
View
12 node_modules/gsettingsBridge/nodegsettings/nodegsettings_tests.js
@@ -1,3 +1,15 @@
+/*!
+GPII Node.js GSettings Bridge
+
+Copyright 2012 Steven Githens
+
+Licensed under the New BSD license. You may not use this file except in
+compliance with this License.
+
+You may obtain a copy of the License at
+https://github.com/gpii/universal/LICENSE.txt
+*/
+
var util = require('util');
var assert = require('assert');
var exec = require('child_process').exec;
View
6 node_modules/gsettingsBridge/package.json
@@ -1,8 +1,8 @@
{
"name": "gsettingsBridge",
- "description": "gsettingsBridge handles gsettings settings and launchers.",
+ "description": "The GPII gsettingsBridge is a Node.js bridge to GNOME's native GSettings API.",
"version": "0.1",
- "author": "GPII",
+ "author": "Steve Githens",
"bugs": "http://wiki.gpii.net/index.php/Main_Page",
"homepage": "http://gpii.net/",
"dependencies": {},
@@ -12,7 +12,7 @@
"url": "http://www.opensource.org/licenses/BSD-3-Clause"
}
],
- "keywords": ["gpii", "accessibility", "settings", "fluid", "IoC", "Inversion of Control", "configuration", "evented"],
+ "keywords": ["gpii", "accessibility", "settings", "fluid"],
"repository": "git://github.com:GPII/linux.git",
"main": "./index.js",
"engines": { "node" : ">=0.1.9" }
View
0 node_modules/gsettingsBridge/gmag-orig.json → ...gsettingsBridge/tests/data/gmag-orig.json
File renamed without changes.
View
0 node_modules/gsettingsBridge/gmag-test1.json → ...settingsBridge/tests/data/gmag-test1.json
File renamed without changes.
View
6 node_modules/gsettingsBridge/tests.js → node_modules/gsettingsBridge/tests/tests.js
@@ -3,14 +3,14 @@ var util = require("util");
var fs = require('fs');
var test1 = function() {
- fs.readFile('gmag-orig.json', function(error,data) {
+ fs.readFile('data/gmag-orig.json', function(error,data) {
var settings = JSON.parse(data);
util.puts(JSON.stringify(gsettings.setSettings(settings)));
});
};
var test2 = function() {
- fs.readFile('gmag-test1.json', function(error,data) {
+ fs.readFile('data/gmag-test1.json', function(error,data) {
var settings = JSON.parse(data);
util.puts(JSON.stringify(gsettings.getSettings(settings)));
});
@@ -20,4 +20,4 @@ util.puts("Ok testing...");
util.puts(JSON.stringify(gsettings));
//test1();
test2();
-util.puts("DOne");
+util.puts("Done");
View
20 start.sh
@@ -1,23 +1,9 @@
#!/bin/sh
-node_modules="../node_modules"
-universal="../node_modules/universal"
-repoURL="git://github.com/GPII/universal.git"
fileName="gpii.js"
-if [ -d $node_modules ]; then
- echo "$node_modules already exists"
-else
- echo "$node_modules does not exist"
- echo "creating $node_modules"
- mkdir -p "$node_modules"
-fi
-if [ -d $universal ]; then
- echo "$universal already exists"
-else
- echo "$universal does not exist"
- echo "cloning universal"
- git clone "$repoURL" "$universal"
-fi
+# Install required dependencies if necessary.
+./install.sh
+# Start the Flow Manager
node "$fileName"

0 comments on commit f81464b

Please sign in to comment.
Something went wrong with that request. Please try again.