Skip to content

Commit

Permalink
Update metacall version to v0.3.2 and remove dead code.
Browse files Browse the repository at this point in the history
  • Loading branch information
viferga committed Nov 4, 2020
1 parent cb391b7 commit 7d36e70
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 88 deletions.
12 changes: 1 addition & 11 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# limitations under the License.
#

.PHONY: all download base pull deps build test release help default
.PHONY: all download base pull deps build test help default

# Default target
default: all
Expand All @@ -42,7 +42,6 @@ help:
@echo ' make deps Build dependency images for caching the runtimes.'
@echo ' make build Build the tarball for all platforms and architectures.'
@echo ' make test Run integration tests for the already built tarballs.'
@echo ' make release Releases the tarball into GitHub.'
@echo ' make clear Clear all containers and images.'
@echo ' make help Show verbose help.'
@echo
Expand Down Expand Up @@ -131,15 +130,6 @@ test:
@docker build --build-arg CACHE_INVALIDATE=${CACHE_INVALIDATE} -t metacall/distributable_test:typescript -f tests/typescript/Dockerfile .
@echo "Done"

# Release tarballs
release:
# Check if .netrc exists
@test -f `pwd`/.netrc || (echo "File .netrc does not exist, aborting release." && exit 1)

# TODO

@echo "Done"

# Clear images and containers
clear:
# Clear the tarball
Expand Down
1 change: 1 addition & 0 deletions channels/channels.scm
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
(url "https://git.savannah.gnu.org/git/guix.git")
(branch "master")
(commit "1a9ebe3b0aa12584624dfa811c480c636a56e1b4"))

; TODO:
; (channel
; (name 'nonguix)
Expand Down
2 changes: 1 addition & 1 deletion scripts/deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@
export GUILE_WARN_DEPRECATED='detailed'

# Build dependencies
`# Build (Node Build System)` guix build cherow node-addon-api typescript -L /metacall/source \
`# Build (Node Build System)` guix build cherow typescript -L /metacall/source \
`# Build (GNU Build System)` && guix build dynruby `# netcore-runtime netcore-sdk` -L /metacall/source \
`# Exit` && exit 0 || exit 1
36 changes: 2 additions & 34 deletions source/metacall.scm
Original file line number Diff line number Diff line change
Expand Up @@ -113,34 +113,6 @@ self-hosted javascript parser with high focus on both performance and stability.
)
)

; NodeJS Port Dependencies
(define-public node-addon-api
(package
(name "node-addon-api")
(version "1.7.1")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/nodejs/node-addon-api/archive/" version ".tar.gz"))
(sha256 (base32 "0i3jc5ki4dlq8l2p1wn0rw1695kr47cjx1zlkzj6h4ymzyc0i1dk"))
)
)
(build-system node-build-system)
(arguments
`(
#:phases
(modify-phases %standard-phases
(delete 'check)
)
)
)
(home-page "https://github.com/nodejs/node-addon-api/")
(synopsis "Module for using N-API from C++")
(description "This module contains a header-only C++ wrapper classes ...")
(license license:expat)
)
)

; TypeScript Loader Dependencies
(define-public typescript
(package
Expand Down Expand Up @@ -383,12 +355,12 @@ a focus on simplicity and productivity.")
(define-public metacall
(package
(name "metacall")
(version "0.2.18")
(version "0.3.2")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/metacall/core/archive/v" version ".tar.gz"))
(sha256 (base32 "12cj9ks20dnadw3dqgay3646vdnvm7dw9nlpa07f3nqvaxd691ay"))
(sha256 (base32 "0pwn354hjyjm5fyg1cj1g31k449v9cgwjpzf5i5dl3zk4c2b5zd4"))
)
)
(build-system cmake-build-system)
Expand Down Expand Up @@ -480,9 +452,6 @@ a focus on simplicity and productivity.")
"-DOPTION_BUILD_LOADERS_JS=OFF" ; TODO: Implement V8 Loader
"-DOPTION_BUILD_LOADERS_COB=ON"

; NodeJS Addon API
(string-append "-DNODEJS_ADDON_API_INCLUDE_DIR=" (assoc-ref %build-inputs "node-addon-api") "/lib/node_modules/node-addon-api")

; TODO: Avoid harcoded versions of Ruby
(string-append "-DRUBY_EXECUTABLE=" (assoc-ref %build-inputs "dynruby") "/bin/ruby")
(string-append "-DRUBY_INCLUDE_DIR=" (assoc-ref %build-inputs "dynruby") "/include/ruby-2.3.0")
Expand Down Expand Up @@ -544,7 +513,6 @@ a focus on simplicity and productivity.")
`(
("rapidjson" ,rapidjson) ; RapidJSON Serial dependency
("python2-gyp" ,python2-gyp) ; For building NodeJS Port
("node-addon-api" ,node-addon-api) ; For building NodeJS Port
("swig" ,swig) ; For building ports
)
)
Expand Down
42 changes: 0 additions & 42 deletions tools/release.sh

This file was deleted.

0 comments on commit 7d36e70

Please sign in to comment.