From 7981b73f9601f9550090e6e714fb2e0a2f1c6ec3 Mon Sep 17 00:00:00 2001
From: Michael Wallner
Date: Mon, 7 Feb 2022 14:18:35 +0100
Subject: [PATCH] docs: simplify install instructions
---
README.md | 33 +++++++++++----------------------
docs/Makefile | 2 +-
docs/v0.1/ion.html | 19 ++++++++-----------
3 files changed, 20 insertions(+), 34 deletions(-)
diff --git a/README.md b/README.md
index dc46f31..ff435ff 100644
--- a/README.md
+++ b/README.md
@@ -10,27 +10,6 @@ see [spdx.org](https://spdx.org/licenses/BSD-2-Clause.html).
## Installation:
-### PECL
-
- pecl install ion
-
-
-### PHARext
-
-Watch out for [PECL replicates](https://replicator.pharext.org?ion)
-and pharext packages attached to [releases](./releases).
-
-### Checkout
-
- git clone github.com:awesomized/ext-ion
-
- cd ext-ion
-
- /path/to/phpize
- ./configure --with-php-config=/path/to/php-config
- make
- sudo make install
-
### Dependencies:
#### Required:
* PHP-8.1
@@ -42,10 +21,20 @@ and pharext packages attached to [releases](./releases).
### Trinity:
```shell
phpize
-./configure
+./configure # --with-php-config=
make # -j$(nproc)
sudo make install # INSTALL=install
```
+
+### PECL
+
+ pecl install ion
+
+### PHARext
+
+Watch out for [PECL replicates](https://replicator.pharext.org?ion)
+and pharext packages attached to [releases](./releases).
+
### Try with Docker:
```shell
docker build -t php-ion
diff --git a/docs/Makefile b/docs/Makefile
index adc1b33..19ab235 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -1,6 +1,6 @@
PHP ?= php
COMPOSER ?= composer
-TAG := $(shell (git describe --tags --exact-match --match=v[0-9]* 2>/dev/null || echo v0.0) | cut -d. -f-2)
+TAG := $(shell (git describe --tags --match=v[0-9]* 2>/dev/null || git tag --sort=authordate | egrep ^v[0-9] | tail -n1) | cut -d. -f-2)
# ---
diff --git a/docs/v0.1/ion.html b/docs/v0.1/ion.html
index 42e3138..3f4341f 100644
--- a/docs/v0.1/ion.html
+++ b/docs/v0.1/ion.html
@@ -265,15 +265,7 @@
See the Amazon ION specification.
License:#
BSD-2-Clause;
see spdx.org.
Installation:#
-
PECL#
-
-pecl install ion
-
PHARext#
-
Watch out for PECL replicates
-and pharext packages attached to releases.
Checkout#
-
-git clone github.com:awesomized/ext-ion
cd ext-ion
/path/to/phpize
./configure --with-php-config=/path/to/php-config
make
sudo make install
-
Dependencies:#
+Dependencies:#
Required:#
- PHP-8.1
@@ -288,8 +280,13 @@ git clone github.com:awesomized/ext-ion
cd ext-ion
/path/to/php
amzn/ion-c (bundled as git submodule)
Trinity:#
-phpize
./configure
make # -j$(nproc)
sudo make install # INSTALL=install
-
Try with Docker:#
+phpize
./configure # --with-php-config=<path/to/php-config>
make # -j$(nproc)
sudo make install # INSTALL=install
+PECL#
+
+pecl install ion
+
PHARext#
+
Watch out for PECL replicates
+and pharext packages attached to releases.
Try with Docker:#
docker build -t php-ion
docker run --rm php-ion -r 'echo ion\serialize(ion\Symbol\PHP::asTable());'
Editor Stub:#
--
2.30.2