Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

GPII-48 Merging javi's stuff to bring us up to node-gyp, the

node build tool that will be supported in the future after
node-waf is deprecated.

Happy North American Thanksgiving Holiday! I am thankful for
having pull requests to merge!

~steve

Merge remote-tracking branch 'javihernandez/issue-gpii-48'
  • Loading branch information...
commit 2994d200585e63774f5b0bb80ce2219da4ee1133 2 parents b31482e + 174c1fd
@sgithens sgithens authored
View
2  build.sh
@@ -36,7 +36,7 @@ fi
# Compile the GSettings C++ Bridge
cd node_modules/gsettingsBridge/nodegsettings
-node-waf configure build
+node-gyp configure build
cd ../../..
# Create standard directory structure for GPII.
View
3  clean.sh
@@ -11,9 +11,8 @@
# https://github.com/gpii/universal/LICENSE.txt
cd node_modules/gsettingsBridge/nodegsettings
-node-waf clean
+node-gyp clean
rm -rf build
-rm .lock-wscript
cd ../../..
sudo rm -rf /usr/local/gpii
View
11 node_modules/gsettingsBridge/nodegsettings/binding.gyp
@@ -0,0 +1,11 @@
+{
+ "targets": [
+ {
+ "target_name": "nodegsettings",
+ "sources": ["nodegsettings.cc"],
+ "libraries": ["<!@(pkg-config --libs gio-2.0)"],
+ "cflags": ["<!@(pkg-config --cflags gio-2.0)"],
+ "ldflags": ["<!@(pkg-config --libs gio-2.0)"]
+ }
+ ]
+}
View
19 node_modules/gsettingsBridge/nodegsettings/wscript
@@ -1,19 +0,0 @@
-srcdir = '.'
-blddir = 'build'
-VERSION = '0.0.1'
-
-def set_options(opt):
- opt.tool_options('compiler_cxx')
-
-def configure(conf):
- conf.check_tool('compiler_cxx')
- conf.check_tool('node_addon')
- conf.check_cfg(package='gtk+-3.0', uselib_store='GTK', args='--cflags --libs')
- conf.check_cfg(package='gio-2.0', uselib_store='GIO', args='--cflags --libs')
- conf.check_cfg(package='glib-2.0', uselib_store='GLIB', args='--cflags --libs')
-
-def build(bld):
- obj = bld.new_task_gen('cxx', 'shlib', 'node_addon')
- obj.target = 'nodegsettings'
- obj.source = 'nodegsettings.cc'
- obj.uselib = "GLIB GTK GIO"
Please sign in to comment.
Something went wrong with that request. Please try again.