Skip to content

Commit 44386d3

Browse files
committed
PR review: fixed the first round issues, comments
Signed-off-by: Hofi <hofione@gmail.com>
1 parent 07ed735 commit 44386d3

File tree

3 files changed

+29
-33
lines changed

3 files changed

+29
-33
lines changed

doc/_dev-guide/chapter_0/section_3.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,7 @@ this will give you detailed information of what {{ site.product.short_name }} do
6464

6565
First, check [[this|dev-platform-build-macos#dependencies]] if you have not got MacPorts installed and pre-configured yet.
6666

67-
Installation location of MacPorts will be referenced as `${MACPORTS_PREFIX}` in this document, as if you follow the installation instructions above it will be set already correctly independenty of your system.
68-
67+
The installation location of MacPorts will be referenced as `${MACPORTS_PREFIX}` in this document. If you follow the installation instructions above, it will already be set correctly, regardless of your system.
6968
**Hint**: you can use `export MACPORTS_PREFIX=/opt/local` in your scripts or shell environments to get and reference the actual location of your MacPorts installation
7069
{: .notice--info}
7170

@@ -114,7 +113,7 @@ this will give you detailed information of what {{ site.product.short_name }} do
114113

115114
> **Note:**
116115
>
117-
> Bellow examples use `YOUR_INSTALLATION_ROOT` which is depending on the package manager you used to install {{ site.product.short_name }}.
116+
> Below examples use `YOUR_INSTALLATION_ROOT` which is depending on the package manager you used to install {{ site.product.short_name }}.
118117
{: .notice}
119118

120119
You can start it manually as a backround daemon

doc/_dev-guide/chapter_4/section_2/README.md

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Like every project {{ site.product.short_name }} also uses different libraries a
2020

2121
### Dependencies
2222

23-
The above mentioned dependencies can be satisfied by compiling every-each libs and tools manually, but it might be preferred to do it the easy way. Homebrew and MacPorts are package managers for macOS which has great community and support. You can also use them to install the dependencies you need.
23+
The above mentioned dependencies can be satisfied by compiling every-each libs and tools manually, but it might be preferred to do it the easy way. Homebrew and MacPorts are package managers for macOS which have great communities and support. You can also use them to install the dependencies you need.
2424

2525
#### Using HomeBrew
2626

@@ -33,7 +33,7 @@ The above mentioned dependencies can be satisfied by compiling every-each libs a
3333
{: .notice}
3434

3535
2. Perform `brew update` if you have not done it yet.
36-
3. The following packages should be installed for {{ site.product.short_name }}ng
36+
3. The following packages should be installed for {{ site.product.short_name }}
3737
* autoconf
3838
* autoconf-archive
3939
* automake
@@ -53,8 +53,8 @@ The above mentioned dependencies can be satisfied by compiling every-each libs a
5353
* gracle
5454
* grpc
5555
* hiredis
56-
* ~~libdbi~~ - See [bellow](#packages-note)!
57-
* ~~libesmtp~~ - See [bellow](#packages-note)!
56+
* ~~libdbi~~ - See [below](#packages-note)!
57+
* ~~libesmtp~~ - See [below](#packages-note)!
5858
* libmaxminddb
5959
* libnet
6060
* libpaho-mqtt
@@ -65,7 +65,7 @@ The above mentioned dependencies can be satisfied by compiling every-each libs a
6565
* riemann-client
6666
6. Extra development tools you might require
6767
* criterion
68-
* ~~gcc@14~~ - See [bellow](#packages-note)!
68+
* ~~gcc@14~~ - See [below](#packages-note)!
6969

7070
**Hint:** If you have [[{{ site.product.short_name }} installed via brew|dev-inst-macos#installation]], as a reference, you can check the dependencies of the brew built version using `brew deps syslog-ng`
7171
{: .notice--info}
@@ -100,7 +100,7 @@ brew install \
100100
gradle \
101101
grpc \
102102
hiredis \
103-
# Do not use the homebrew provided one, see !
103+
# Do not use the homebrew provided one, see below!
104104
# libdbi
105105
# Homebrew does not have this lib yet
106106
# libesmtp
@@ -149,7 +149,7 @@ brew install \
149149
* gradle
150150
* grpc
151151
* hiredis
152-
* ~~libdbi~~ - See [bellow](#packages-note)!
152+
* ~~libdbi~~ - See [below](#packages-note)!
153153
* libesmtp
154154
* libmaxminddb
155155
* libnet
@@ -158,10 +158,10 @@ brew install \
158158
* paho.mqtt.c
159159
* python3
160160
* rabbitmq-c
161-
* ~~riemann-client~~ - See [bellow](#packages-note)!
161+
* ~~riemann-client~~ - See [below](#packages-note)!
162162
7. Extra development tools you might require
163163
* criterion
164-
* ~~gcc@14~~ - See [bellow](#packages-note)!
164+
* ~~gcc@14~~ - See [below](#packages-note)!
165165

166166
**Hint:** If you have [[{{ site.product.short_name }} installed via MacPorts|dev-inst-macos#installation-via-macports]], as a reference, you can check the dependencies of the MacPorts built version using `port deps syslog-ng`
167167
{: .notice--info}
@@ -170,9 +170,9 @@ This is how it might look like if you start from the ground:
170170

171171
```shell
172172
# DO NOT FORGET! Install the MacPorts package first which has a GUI installer. https://www.macports.org/install.php
173-
# But, you can install it from the comamnd line as well, like
173+
# But, you can install it from the command line as well, like
174174

175-
# WARNING! SET the bellow url and package name according to your needs and OS version !!!
175+
# WARNING! SET the below url and package name according to your needs and OS version !!!
176176
export MACPORTS_PKG_NAME=MacPorts-2.10.1-Sonoma.pkg
177177
export MACPORTS_URL=https://github.com/macports/macports-base/releases/download/v2.10.1/${MACPORTS_PKG_NAME}
178178

@@ -203,7 +203,7 @@ sudo port install \
203203
gradle \
204204
grpc \
205205
hiredis \
206-
# Do not use the homebrew provided one, see !
206+
# Do not use the homebrew provided one, see below!
207207
# libdbi
208208
libesmtp \
209209
libmaxminddb \
@@ -312,7 +312,7 @@ sudo port install \
312312
export LDFLAGS="-L${MACPORTS_PREFIX}/lib ${LDFLAGS}"
313313
```
314314

315-
**Note:** It could also happen that you must provide here further library inlcude and lib paths, e.g. for openssl 1.1.x, etc.
315+
**Note:** Providing further library paths might be necessary. (e.g. for openssl 1.1.x, etc.)
316316
{: .notice}
317317

318318
### Getting the source
@@ -365,7 +365,7 @@ export CXX=g++ # More precisly, the full path of your installed g++ compiler
365365
mkdir build; cd build
366366

367367
# Finally, you can start the configuration with enabling or disabling the various modules e.g. like this
368-
# NOTE: you might want to use the --prefix /full_path_of_your/installdir/ parameters as well, see bellow Warning!
368+
# NOTE: you might want to use the --prefix /full_path_of_your/installdir/ parameters as well, see below Warning!
369369
../configure --with-ivykis=system --with-systemd-journal=no --disable-java --disable-java-modules
370370
```
371371

@@ -460,11 +460,11 @@ For trying force enable a given module you can use e.g. `--enable-kafka` that wi
460460
If you have all the above mentioned dependencies installed, for the full (currently supported) feature set you can simply use
461461

462462
```shell
463-
# NOTE: you might want to use the --install-prefix /full_path_of_your/installdir/ parameters as well, see bellow Warning!
463+
# NOTE: you might want to use the --install-prefix /full_path_of_your/installdir/ parameters as well, see below Warning!
464464
cmake --install-prefix /full_path_of_your/installdir -B build . -Wno-dev -DIVYKIS_SOURCE=system --fresh
465465
```
466466

467-
**Warning:** By a good chance, you might want to install the self built instance first to a custom location to prevent overwriting a possibly already existing installed version. In that case pass `---install-prefix /full_path_of_your/installdir/` parameter to the `cmake` command like you see in the above steps.
467+
**Warning:** You may want to install the self-built instance to a custom location first to avoid overwriting an existing installed version. In that case, pass the `--install-prefix /full_path_of_your/installdir/` parameter to the `cmake` command, as shown in the steps above.
468468
{: .notice--danger}
469469

470470
At the end of the configure step you should see the module list will be used during the compilation and installation steps, it should look similar to this

doc/_dev-guide/chapter_4/section_3/README.md

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,14 @@ The above mentioned dependencies can be satisfied by compiling every-each libs a
3434
* gperf
3535
* glib
3636
* gmake
37-
* ivykis - See [bellow](#packages-note)!
37+
* ivykis - See [below](#packages-note)!
3838
* json-c
3939
* libtool
4040
* pcre2
4141
* pkg-config
4242
1. The extra modules would require the following
4343
* gradle
44-
* grpc - See [bellow](#packages-note)!
44+
* grpc - See [below](#packages-note)!
4545
* hiredis
4646
* libdbi
4747
* libdbi-drivers
@@ -57,10 +57,7 @@ The above mentioned dependencies can be satisfied by compiling every-each libs a
5757
* riemann-c-client
5858
1. Extra development tools you might require
5959
* criterion
60-
* gcc14 - See [bellow](#packages-note)!
61-
62-
**Hint:** If you have [[{{ site.product.short_name }} installed already via FreeBSD Ports, as a reference, you can check the dependencies of the installed version using `brew deps syslog-ng`
63-
{: .notice--info}
60+
* gcc14 - See [below](#packages-note)!
6461

6562
This is how it might look like if you start from the ground:
6663

@@ -101,7 +98,7 @@ sudo pkg install \
10198
riemann-c-client \
10299
# Optional, needed for unit testing
103100
criterion \
104-
# Optional, clang now should compile all modules nicely and it is the oficially supported compiler on FreeBSD
101+
# Optional, clang now should compile all modules nicely and it is the officially supported compiler on FreeBSD
105102
gcc14
106103
```
107104

@@ -140,7 +137,7 @@ export CXXFLAGS="${CFLAGS} ${CXXFLAGS}"
140137
export LDFLAGS="-L${BSDPORTS_PREFIX}/lib ${LDFLAGS}"
141138
```
142139

143-
**Note:** It could also happen that you must provide here further library inlcude and lib paths
140+
**Note:** Providing further library paths might be necessary.
144141
{: .notice}
145142

146143
### Getting the source
@@ -155,7 +152,7 @@ git clone https://github.com/syslog-ng/syslog-ng .
155152
### Select the compiler
156153

157154
Latest version of {{ site.product.short_name }} [has dropped support of gcc](https://github.com/syslog-ng/syslog-ng/pull/4897), so now the platform default llvm/clang must be used to complie the source.\
158-
`gcc` still might compile {{ site.product.short_name }} and most of its modules, but there is no guarantie and support of it anymore.
155+
`gcc` still might compile {{ site.product.short_name }} and most of its modules, but there is no guarantee and support of it anymore.
159156

160157
**Hint:** You can always turn off any problematic module via its feature switch.
161158
{: .notice--info}
@@ -186,21 +183,21 @@ export CXX=g++ # More precisly, the full path of ypur installed g++ compiler
186183
#### Using autotool
187184

188185
```shell
189-
# you should use `gmake` instead of `make` on FreeBSD to configure and build syslog-ng with autotools.
186+
# You should use `gmake` instead of `make` on FreeBSD to configure and build syslog-ng with autotools.
190187
export MAKE=gmake
191188

192189
./autogen.sh
193190

194-
# it is always a good idea keeping as clean the source folder as pissible, so
191+
# It is always a good idea to keep the source folder as clean as possible, so
195192
# use a dedicated build folder for easier cleanup
196193
mkdir build; cd build
197194

198195
# Finally, you can start the configuration with enabling or disabling the various modules e.g. like this
199-
# NOTE: you might want to use the --prefix /full_path_of_your/installdir/ parameters as well, see bellow Warning!
196+
# NOTE: you might want to use the --prefix /full_path_of_your/installdir/ parameters as well, see below Warning!
200197
../configure --enable-extra-warnings --with-ivykis=system --with-systemd-journal=no --disable-java --disable-java-modules
201198
```
202199

203-
**Warning:** By a good chance, you might want to install the self built instance first to a custom location to prevent overwriting a possibly already existing installed version. In that case pass `--prefix /full_path_of_your/installdir/` to the `configure` script in the above steps.
200+
**Warning:** You may want to install the self-built instance to a custom location first to avoid overwriting an existing installed version. In that case, pass the `--prefix /full_path_of_your/installdir/` parameter to the `configue` command, as shown in the steps above.
204201
{: .notice--danger}
205202

206203
If you have all the above mentioned dependencies installed, for the full feature set you can simply use for example (excluded the not yet supported modules on FreeBSD)
@@ -388,7 +385,7 @@ gmake install
388385
cmake --build build/. --target install -j4
389386
```
390387

391-
After a succesful build you can check the built and supported modules via
388+
After a successful build you can check the built and the supported modules via
392389

393390
```shell
394391
`/full_path_of_your/installdir`/syslog-ng -V

0 commit comments

Comments
 (0)