Try #71:

Author: bors[bot]

.circleci/config.yml

@@ -32,26 +32,17 @@ jobs:
             php -r "unlink('composer-setup.php');"
             mv composer.phar composer
 
-      # Compile the Rust part of the extension.
-      - run:
-          name: Compile the Rust part of the PHP extension
-          command: |
-            export PATH="$HOME/.cargo/bin:$PATH"
-            just rust
-
       # Compile and install the PHP extension.
-      # `just php` isn't used because there is no some issue with
+      # `just build` isn't used because there is no some issue with
       # `--with-pic` I don't understand…
       - run:
           name: Compile and install the PHP extension
           command: |
             export PATH="$HOME/.cargo/bin:$PATH"
             sudo apt-get install gcc
             export CXX="gcc"
-            EXTENSION="$HOME/project/extension"
+            EXTENSION="$HOME/project/src
             cd $EXTENSION
-            test -f libwasmer_runtime_c_api.a && rm libwasmer_runtime_c_api.a
-            ln -s ../target/release/deps/libwasmer_runtime_c_api-*.a libwasmer_runtime_c_api.a
             PHP_PREFIX=$(php-config --prefix)
             PHP_PREFIX_BIN=$PHP_PREFIX/bin
             $PHP_PREFIX_BIN/phpize --clean

.gitignore

@@ -1,5 +1,4 @@
 /composer.lock
 /doc
-/extension/libwasmer_runtime_c_api.a
 /target/
 /vendor/

README.md

@@ -156,8 +156,7 @@ See the [API documentations with examples](https://wasmerio.github.io/php-ext-wa
 To compile the entire project, run the following commands:
 
 ```sh
-$ just rust
-$ just php
+$ just build
 $ php -d extension=wasm examples/simple.php
 ```
 

justfile

@@ -8,17 +8,11 @@ compile-wasm FILE='examples/simple':
 	mv {{FILE}}.opt.wasm {{FILE}}.wasm
 	rm {{FILE}}.raw.wasm
 
-# Compile the Rust part.
-rust:
-	cargo build --release
-
-# Compile the PHP part.
-php:
+# Compile the PHP extension.
+build:
 	#!/usr/bin/env bash
 	set -euo pipefail
-	cd extension
-	test -f libwasmer_runtime_c_api.a && rm libwasmer_runtime_c_api.a
-	ln -s ../target/release/deps/libwasmer_runtime_c_api-*.a libwasmer_runtime_c_api.a
+	cd src
 	PHP_PREFIX_BIN=$(php-config --prefix)/bin
 	$PHP_PREFIX_BIN/phpize --clean
 	$PHP_PREFIX_BIN/phpize

extension/.gitignore renamed to src/.gitignore

@@ -151,6 +151,9 @@ static void php_wasm_module_clean_up_persistent_resources();
 const char* wasm_instance_resource_name;
 int wasm_instance_resource_number;
 
+/**
+ * Represents an exported function.
+ */
 typedef struct {
     // The internal opaque exported function pointer.
     const wasmer_export_func_t *exported_function;

extension/CREDITS renamed to src/CREDITS

@@ -57,7 +57,7 @@ function () use ($filePath) {
                 ->isInstanceOf(RuntimeException::class)
                 ->hasMessage(
                     "An error happened while compiling or instantiating the module `$filePath`:\n" .
-                    "    error instantiating"
+                    "    compile error: Validation error \"Invalid type\""
                 );
     }
 
@@ -76,7 +76,7 @@ function () use ($filePath) {
                 ->isInstanceOf(RuntimeException::class)
                 ->hasMessage(
                     "An error happened while compiling or instantiating the module `$filePath`:\n" .
-                    "    error instantiating"
+                    "    compile error: Validation error \"Unexpected EOF\""
                 );
     }