Skip to content

Commit

Permalink
Updated node-ios-device to support Node.js 0.12.7, io.js 2.5, and io.…
Browse files Browse the repository at this point in the history
…js 3.0. Updated to nan 2.0.
  • Loading branch information
cb1kenobi committed Aug 7, 2015
1 parent caccc3d commit e4ea8af
Show file tree
Hide file tree
Showing 20 changed files with 371 additions and 104 deletions.
16 changes: 10 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ all: node iojs

node: node_v1 node_v11 node_v14

iojs: iojs_v42 iojs_v43 iojs_v44
iojs: iojs_v42 iojs_v43 iojs_v44 iojs_v45

build = stat node_modules/node-gyp > /dev/null 2>&1 || npm install; \
$(NODE_GYP) clean; \
echo "Building for $(1) v$(3)"; \
printf "%s\nBuilding for %s v%s\n%s\n" "`printf '*%.0s' {1..78}`" "$(1)" "$(3)" "`printf '*%.0s' {1..78}`"; \
stat ~/.node-gyp/$(3) || ( \
rm -f /tmp/$(1)-v$(3).tar.gz && \
curl -o /tmp/$(1)-v$(3).tar.gz https://$(2)/dist/v$(3)/$(1)-v$(3).tar.gz && \
Expand All @@ -24,11 +24,11 @@ node_v1:

# Node.js 0.10.x
node_v11:
$(call build,node,nodejs.org,0.10.38)
$(call build,node,nodejs.org,0.10.40)

# Node.js 0.12.x
node_v14:
$(call build,node,nodejs.org,0.12.3)
$(call build,node,nodejs.org,0.12.7)

# io.js 1.0.x
iojs_v42:
Expand All @@ -40,10 +40,14 @@ iojs_v43:

# io.js 2.x
iojs_v44:
$(call build,iojs,iojs.org,2.0.2)
$(call build,iojs,iojs.org,2.5.0)

# io.js 3.x
iojs_v45:
$(call build,iojs,iojs.org,3.0.0)

clean:
$(NODE_GYP) clean
rm -rf out

.PHONY: clean node_v1 node_v11 node_v14 iojs_v42 iojs_v43 iojs_v44
.PHONY: clean node_v1 node_v11 node_v14 iojs_v42 iojs_v43 iojs_v44 iojs_v45
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ node-ios-device is currently compatible with the following versions:
* 1.0.x (module API v42)
* \^1.1.0 (module API v43)
* 2.x (module API v44)
* 3.x (module API v45)

Only Mac OS X is supported.

Expand Down
8 changes: 6 additions & 2 deletions dist.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
#!/bin/sh

mkdir -p $2
cp $1 $2/node_ios_device_v`Release/node_module_version`.node
if [[ $# -lt 2 ]]; then
echo "Usage: dist.sh <built binary> <output dir>"
exit 1
fi

mkdir -p $2 && cp $1 $2/node_ios_device_v`Release/node_module_version`.node
1 change: 1 addition & 0 deletions ios-device.js
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ exports.trackDevices = lockAndLoad(function (callback) {
*/
exports.installApp = lockAndLoad(function (udid, appPath, callback) {
appPath = path.resolve(appPath);
console.log(appPath);
if (!fs.existsSync(appPath)) {

This comment has been minimized.

Copy link
@jhaynie

jhaynie Aug 12, 2015

do you mean to have console.log here?

This comment has been minimized.

Copy link
@cb1kenobi

cb1kenobi Aug 12, 2015

Author Contributor

Nope! I've been searching for that bad boy! Thank you!!!

return callback(new Error('Specified .app path does not exist'));
}
Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "node-ios-device",
"description": "iOS device library",
"version": "0.4.1",
"version": "0.5.0",
"author": {
"name": "Appcelerator, Inc.",
"email": "[email protected]"
Expand All @@ -26,10 +26,10 @@
"mobile"
],
"dependencies": {
"nan": "~1.8.4",
"node-gyp": "^2.0.1"
"nan": "~2.0.4",
"node-gyp": "^2.0.2"
},
"license": "Apache Public License v2",
"license": "Apache-2.0",
"gypfile": true,
"main": "./ios-device",
"engines": {
Expand Down
Loading

1 comment on commit e4ea8af

@19h
Copy link

@19h 19h commented on e4ea8af Aug 12, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks :-)

Please sign in to comment.