Skip to content

Commit

Permalink
merge feat/v8-8.x branch
Browse files Browse the repository at this point in the history
  • Loading branch information
obiltschnig committed Jan 26, 2024
2 parents 71a4485 + 74d44c3 commit 179e370
Show file tree
Hide file tree
Showing 10,391 changed files with 1,361,222 additions and 828,844 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
5 changes: 1 addition & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,7 @@ jobs:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
- run: sudo apt update && sudo apt install libssl-dev python2
- run: sudo update-alternatives --install /usr/bin/python python /usr/bin/python2 1
- run: sudo update-alternatives --install /usr/bin/python python /usr/bin/python3 2
- run: sudo update-alternatives --set python /usr/bin/python2
- run: sudo apt update && sudo apt install libssl-dev
- run: make -s -j2 DEFAULT_TARGET=shared_release

ubuntu-1804-gcc-make:
Expand Down
13 changes: 11 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ For more information, including [documentation](https://macchina.io/docs), pleas
Build Status
------------

[![macchina.io-ci](https://github.com/macchina-io/macchina.io/actions/workflows/ci.yml/badge.svg?branch=develop)](https://github.com/macchina-io/macchina.io/actions/workflows/ci.yml)
[![macchina.io-ci](https://github.com/macchina-io/macchina.io/actions/workflows/ci.yml/badge.svg?branch=feature/v8-8.6)](https://github.com/macchina-io/macchina.io/actions/workflows/ci.yml)


Prerequisites
Expand All @@ -31,12 +31,21 @@ Prerequisites
- Linux: GNU C++ (g++) 5.0 or newer; alternatively Clang++ 3.4 or newer (C++14)
- macOS: Clang++ (Apple LLVM) 10.0 or newer
- OpenSSL headers and libraries (on macOS, via [Homebrew](http://brew.sh): `brew install openssl`)
- Python 2.7 (for building V8)
- Python 3.9 for building V8 (on macOS, via [Homebrew](http://brew.sh): `brew install [email protected]`)


Getting Started
---------------

NOTE: On macOS, the `python` command must run Python 3.9 in order to build V8.
If installed via Homebrew, create a symbolic link:

* Intel: `ln -s ../Cellar/[email protected]/3.9.15/bin/python3.9 /usr/local/bin/python`
* Apple Silicon: `ln -s ../Cellar/[email protected]/3.9.15/bin/python3.9 /opt/homebrew/bin/python`

And make sure that your `$PATH` includes `/usr/local/bin/` on Intel or
`/opt/homebrew/bin` on Apple Silicon.

For the impatient, using a Linux or macOS machine:

$ git clone https://github.com/macchina-io/macchina.io.git
Expand Down
2 changes: 1 addition & 1 deletion platform/JS/Bridge/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ objects = Serializer Deserializer Listener \
target = PocoJSBridge
target_version = 1
target_libs = PocoJSCore PocoRemotingNG PocoUtil PocoXML PocoFoundation
target_extlibs = v8 v8_libplatform v8_libbase
target_extlibs = v8

include $(POCO_BASE)/build/rules/lib
3 changes: 1 addition & 2 deletions platform/JS/Bridge/include/Poco/JS/Bridge/BridgeWrapper.h
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,7 @@ class JSBridge_API BridgeWrapper: public Poco::JS::Core::Wrapper
protected:
static void construct(const v8::FunctionCallbackInfo<v8::Value>& args);

static void getProperty(v8::Local<v8::String> property, const v8::PropertyCallbackInfo<v8::Value>& info);
static void setProperty(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<v8::Value>& info);
static void getProperty(v8::Local<v8::Name> property, const v8::PropertyCallbackInfo<v8::Value>& info);
static void bridgeFunction(const v8::FunctionCallbackInfo<v8::Value>& args);
static void on(const v8::FunctionCallbackInfo<v8::Value>& args);
static void toJSON(const v8::FunctionCallbackInfo<v8::Value>& args);
Expand Down
4 changes: 2 additions & 2 deletions platform/JS/Bridge/include/Poco/JS/Bridge/Deserializer.h
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ class JSBridge_API Deserializer: public Poco::RemotingNG::Deserializer
bool deserialize(const std::string& name, bool isMandatory, char& value);
bool deserialize(const std::string& name, bool isMandatory, std::string& value);
bool deserialize(const std::string& name, bool isMandatory, std::vector<char>& value);
v8::Local<v8::Value> deserializeValue(const std::string& name);
v8::Local<v8::Value> peekValue(const std::string& name);
v8::MaybeLocal<v8::Value> deserializeValue(const std::string& name);
v8::MaybeLocal<v8::Value> peekValue(const std::string& name);

protected:
void resetImpl();
Expand Down
Loading

0 comments on commit 179e370

Please sign in to comment.