Skip to content

Commit a8b1dfb

Browse files
nalgeonnalgeon
committed
build: remove win32 support and rename x86 to x64
1 parent 3995136 commit a8b1dfb

File tree

6 files changed

+51
-106
lines changed

6 files changed

+51
-106
lines changed

‎.github/workflows/publish.yml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
run: |
3838
sudo apt update
3939
sudo apt install -y gcc-aarch64-linux-gnu
40-
make compile-linux-x86
40+
make compile-linux-x64
4141
make compile-linux-arm64
4242
make pack-linux
4343
@@ -53,14 +53,13 @@ jobs:
5353
if: matrix.os == 'windows-latest'
5454
shell: bash
5555
run: |
56-
$RUNNER_TEMP/msys64/msys2_shell.cmd -defterm -no-start -mingw32 -lc "mingw32-make compile-windows-x86"
5756
make compile-windows
5857
make pack-windows
5958
6059
- name: Build for macOS
6160
if: matrix.os == 'macos-latest'
6261
run: |
63-
make compile-macos-x86
62+
make compile-macos-x64
6463
make compile-macos-arm64
6564
make pack-macos
6665

‎.github/workflows/win32.yml‎

Lines changed: 0 additions & 37 deletions
This file was deleted.

‎Makefile‎

Lines changed: 34 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ COMMON_CFLAGS := -Isrc -DSQLEAN_VERSION=$(SQLEAN_VERSION)
1515

1616
LINIX_FLAGS := $(CFLAGS) -z now -z relro -Wall -Wsign-compare -Wno-unknown-pragmas -fPIC -shared $(COMMON_CFLAGS)
1717
WINDO_FLAGS := $(CFLAGS) -shared $(COMMON_CFLAGS)
18-
WIN32_FLAGS := $(WINDO_FLAGS)
1918
MACOS_FLAGS := $(CFLAGS) -Wall -Wsign-compare -fPIC -dynamiclib $(COMMON_CFLAGS)
2019
CTEST_FLAGS := $(CFLAGS) -Wall -Wsign-compare -Wno-unknown-pragmas -Isrc
2120

@@ -47,22 +46,22 @@ compile-linux:
4746
$(CC) -O3 $(LINIX_FLAGS) src/sqlite3-vsv.c src/vsv/*.c -o dist/vsv.so -lm
4847
$(CC) -O1 $(LINIX_FLAGS) -include src/regexp/constants.h src/sqlite3-sqlean.c src/crypto/*.c src/define/*.c src/fileio/*.c src/fuzzy/*.c src/ipaddr/*.c src/math/*.c src/regexp/*.c src/regexp/pcre2/*.c src/stats/*.c src/text/*.c src/text/*/*.c src/time/*.c src/unicode/*.c src/uuid/*.c src/vsv/*.c -o dist/sqlean.so -lm
4948

50-
compile-linux-x86:
51-
mkdir -p dist/x86
52-
$(CC) -O1 $(LINIX_FLAGS) src/sqlite3-crypto.c src/crypto/*.c -o dist/x86/crypto.so
53-
$(CC) -O3 $(LINIX_FLAGS) src/sqlite3-define.c src/define/*.c -o dist/x86/define.so
54-
$(CC) -O3 $(LINIX_FLAGS) src/sqlite3-fileio.c src/fileio/*.c -o dist/x86/fileio.so
55-
$(CC) -O1 $(LINIX_FLAGS) src/sqlite3-fuzzy.c src/fuzzy/*.c -o dist/x86/fuzzy.so
56-
$(CC) -O3 $(LINIX_FLAGS) src/sqlite3-ipaddr.c src/ipaddr/*.c -o dist/x86/ipaddr.so
57-
$(CC) -O3 $(LINIX_FLAGS) src/sqlite3-math.c src/math/*.c -o dist/x86/math.so -lm
58-
$(CC) -O3 $(LINIX_FLAGS) -include src/regexp/constants.h src/sqlite3-regexp.c src/regexp/*.c src/regexp/pcre2/*.c -o dist/x86/regexp.so
59-
$(CC) -O3 $(LINIX_FLAGS) src/sqlite3-stats.c src/stats/*.c -o dist/x86/stats.so -lm
60-
$(CC) -O3 $(LINIX_FLAGS) src/sqlite3-text.c src/text/*.c src/text/*/*.c -o dist/x86/text.so
61-
$(CC) -O3 $(LINIX_FLAGS) src/sqlite3-time.c src/time/*.c -o dist/x86/time.so
62-
$(CC) -O3 $(LINIX_FLAGS) src/sqlite3-unicode.c src/unicode/*.c -o dist/x86/unicode.so
63-
$(CC) -O3 $(LINIX_FLAGS) src/sqlite3-uuid.c src/uuid/*.c -o dist/x86/uuid.so
64-
$(CC) -O3 $(LINIX_FLAGS) src/sqlite3-vsv.c src/vsv/*.c -o dist/x86/vsv.so -lm
65-
$(CC) -O1 $(LINIX_FLAGS) -include src/regexp/constants.h src/sqlite3-sqlean.c src/crypto/*.c src/define/*.c src/fileio/*.c src/fuzzy/*.c src/ipaddr/*.c src/math/*.c src/regexp/*.c src/regexp/pcre2/*.c src/stats/*.c src/text/*.c src/text/*/*.c src/time/*.c src/unicode/*.c src/uuid/*.c src/vsv/*.c -o dist/x86/sqlean.so -lm
49+
compile-linux-x64:
50+
mkdir -p dist/x64
51+
$(CC) -O1 $(LINIX_FLAGS) src/sqlite3-crypto.c src/crypto/*.c -o dist/x64/crypto.so
52+
$(CC) -O3 $(LINIX_FLAGS) src/sqlite3-define.c src/define/*.c -o dist/x64/define.so
53+
$(CC) -O3 $(LINIX_FLAGS) src/sqlite3-fileio.c src/fileio/*.c -o dist/x64/fileio.so
54+
$(CC) -O1 $(LINIX_FLAGS) src/sqlite3-fuzzy.c src/fuzzy/*.c -o dist/x64/fuzzy.so
55+
$(CC) -O3 $(LINIX_FLAGS) src/sqlite3-ipaddr.c src/ipaddr/*.c -o dist/x64/ipaddr.so
56+
$(CC) -O3 $(LINIX_FLAGS) src/sqlite3-math.c src/math/*.c -o dist/x64/math.so -lm
57+
$(CC) -O3 $(LINIX_FLAGS) -include src/regexp/constants.h src/sqlite3-regexp.c src/regexp/*.c src/regexp/pcre2/*.c -o dist/x64/regexp.so
58+
$(CC) -O3 $(LINIX_FLAGS) src/sqlite3-stats.c src/stats/*.c -o dist/x64/stats.so -lm
59+
$(CC) -O3 $(LINIX_FLAGS) src/sqlite3-text.c src/text/*.c src/text/*/*.c -o dist/x64/text.so
60+
$(CC) -O3 $(LINIX_FLAGS) src/sqlite3-time.c src/time/*.c -o dist/x64/time.so
61+
$(CC) -O3 $(LINIX_FLAGS) src/sqlite3-unicode.c src/unicode/*.c -o dist/x64/unicode.so
62+
$(CC) -O3 $(LINIX_FLAGS) src/sqlite3-uuid.c src/uuid/*.c -o dist/x64/uuid.so
63+
$(CC) -O3 $(LINIX_FLAGS) src/sqlite3-vsv.c src/vsv/*.c -o dist/x64/vsv.so -lm
64+
$(CC) -O1 $(LINIX_FLAGS) -include src/regexp/constants.h src/sqlite3-sqlean.c src/crypto/*.c src/define/*.c src/fileio/*.c src/fuzzy/*.c src/ipaddr/*.c src/math/*.c src/regexp/*.c src/regexp/pcre2/*.c src/stats/*.c src/text/*.c src/text/*/*.c src/time/*.c src/unicode/*.c src/uuid/*.c src/vsv/*.c -o dist/x64/sqlean.so -lm
6665

6766
compile-linux-musl:
6867
mkdir -p dist/musl
@@ -99,7 +98,7 @@ compile-linux-arm64:
9998
aarch64-linux-gnu-gcc -O1 $(LINIX_FLAGS) -include src/regexp/constants.h src/sqlite3-sqlean.c src/crypto/*.c src/define/*.c src/fileio/*.c src/fuzzy/*.c src/ipaddr/*.c src/math/*.c src/regexp/*.c src/regexp/pcre2/*.c src/stats/*.c src/text/*.c src/text/*/*.c src/time/*.c src/unicode/*.c src/uuid/*.c src/vsv/*.c -o dist/arm64/sqlean.so -lm
10099

101100
pack-linux:
102-
zip -j dist/sqlean-linux-x86.zip dist/x86/*.so
101+
zip -j dist/sqlean-linux-x64.zip dist/x64/*.so
103102
zip -j dist/sqlean-linux-arm64.zip dist/arm64/*.so
104103

105104
compile-windows:
@@ -117,23 +116,7 @@ compile-windows:
117116
gcc -O3 $(WINDO_FLAGS) src/sqlite3-vsv.c src/vsv/*.c -o dist/vsv.dll -lm
118117
gcc -O1 $(WINDO_FLAGS) -include src/regexp/constants.h src/sqlite3-sqlean.c src/crypto/*.c src/define/*.c src/fileio/*.c src/fuzzy/*.c src/math/*.c src/regexp/*.c src/regexp/pcre2/*.c src/stats/*.c src/text/*.c src/text/*/*.c src/time/*.c src/unicode/*.c src/uuid/*.c src/vsv/*.c -o dist/sqlean.dll -lm
119118

120-
compile-windows-x86:
121-
mkdir -p dist/x86
122-
gcc -O1 $(WIN32_FLAGS) src/sqlite3-crypto.c src/crypto/*.c -o dist/x86/crypto.dll
123-
gcc -O3 $(WIN32_FLAGS) src/sqlite3-define.c src/define/*.c -o dist/x86/define.dll
124-
gcc -O3 $(WIN32_FLAGS) src/sqlite3-fileio.c src/fileio/*.c -o dist/x86/fileio.dll
125-
gcc -O1 $(WIN32_FLAGS) src/sqlite3-fuzzy.c src/fuzzy/*.c -o dist/x86/fuzzy.dll
126-
gcc -O3 $(WIN32_FLAGS) src/sqlite3-math.c src/math/*.c -o dist/x86/math.dll -lm
127-
gcc -O3 $(WIN32_FLAGS) src/sqlite3-regexp.c -include src/regexp/constants.h src/regexp/*.c src/regexp/pcre2/*.c -o dist/x86/regexp.dll
128-
gcc -O3 $(WIN32_FLAGS) src/sqlite3-stats.c src/stats/*.c -o dist/x86/stats.dll -lm
129-
gcc -O3 $(WIN32_FLAGS) src/sqlite3-text.c src/text/*.c src/text/*/*.c -o dist/x86/text.dll
130-
gcc -O3 $(WIN32_FLAGS) src/sqlite3-unicode.c src/unicode/*.c -o dist/x86/unicode.dll
131-
gcc -O3 $(WIN32_FLAGS) src/sqlite3-uuid.c src/uuid/*.c -o dist/x86/uuid.dll
132-
gcc -O3 $(WIN32_FLAGS) src/sqlite3-vsv.c src/vsv/*.c -o dist/x86/vsv.dll -lm
133-
gcc -O1 $(WIN32_FLAGS) -include src/regexp/constants.h src/sqlite3-sqlean.c src/crypto/*.c src/define/*.c src/fileio/*.c src/fuzzy/*.c src/math/*.c src/regexp/*.c src/regexp/pcre2/*.c src/stats/*.c src/text/*.c src/text/*/*.c src/unicode/*.c src/uuid/*.c src/vsv/*.c -o dist/x86/sqlean.dll -lm
134-
135119
pack-windows:
136-
7z a -tzip dist/sqlean-win-x86.zip ./dist/x86/*.dll
137120
7z a -tzip dist/sqlean-win-x64.zip ./dist/*.dll
138121

139122
compile-macos:
@@ -152,22 +135,22 @@ compile-macos:
152135
$(CC) -O3 $(MACOS_FLAGS) src/sqlite3-vsv.c src/vsv/*.c -o dist/vsv.dylib -lm
153136
$(CC) -O1 $(MACOS_FLAGS) -include src/regexp/constants.h src/sqlite3-sqlean.c src/crypto/*.c src/define/*.c src/fileio/*.c src/fuzzy/*.c src/ipaddr/*.c src/math/*.c src/regexp/*.c src/regexp/pcre2/*.c src/stats/*.c src/text/*.c src/text/*/*.c src/time/*.c src/unicode/*.c src/uuid/*.c src/vsv/*.c -o dist/sqlean.dylib -lm
154137

155-
compile-macos-x86:
156-
mkdir -p dist/x86
157-
$(CC) -O1 $(MACOS_FLAGS) src/sqlite3-crypto.c src/crypto/*.c -o dist/x86/crypto.dylib -target x86_64-apple-macos10.12
158-
$(CC) -O3 $(MACOS_FLAGS) src/sqlite3-define.c src/define/*.c -o dist/x86/define.dylib -target x86_64-apple-macos10.12
159-
$(CC) -O3 $(MACOS_FLAGS) src/sqlite3-fileio.c src/fileio/*.c -o dist/x86/fileio.dylib -target x86_64-apple-macos10.12
160-
$(CC) -O1 $(MACOS_FLAGS) src/sqlite3-fuzzy.c src/fuzzy/*.c -o dist/x86/fuzzy.dylib -target x86_64-apple-macos10.12
161-
$(CC) -O3 $(MACOS_FLAGS) src/sqlite3-ipaddr.c src/ipaddr/*.c -o dist/x86/ipaddr.dylib -target x86_64-apple-macos10.12
162-
$(CC) -O3 $(MACOS_FLAGS) src/sqlite3-math.c src/math/*.c -o dist/x86/math.dylib -target x86_64-apple-macos10.12 -lm
163-
$(CC) -O3 $(MACOS_FLAGS) -include src/regexp/constants.h src/sqlite3-regexp.c src/regexp/*.c src/regexp/pcre2/*.c -o dist/x86/regexp.dylib -target x86_64-apple-macos10.12
164-
$(CC) -O3 $(MACOS_FLAGS) src/sqlite3-stats.c src/stats/*.c -o dist/x86/stats.dylib -target x86_64-apple-macos10.12 -lm
165-
$(CC) -O3 $(MACOS_FLAGS) src/sqlite3-text.c src/text/*.c src/text/*/*.c -o dist/x86/text.dylib -target x86_64-apple-macos10.12
166-
$(CC) -O3 $(MACOS_FLAGS) src/sqlite3-time.c src/time/*.c -o dist/x86/time.dylib -target x86_64-apple-macos10.12
167-
$(CC) -O3 $(MACOS_FLAGS) src/sqlite3-unicode.c src/unicode/*.c -o dist/x86/unicode.dylib -target x86_64-apple-macos10.12
168-
$(CC) -O3 $(MACOS_FLAGS) src/sqlite3-uuid.c src/uuid/*.c -o dist/x86/uuid.dylib -target x86_64-apple-macos10.12
169-
$(CC) -O3 $(MACOS_FLAGS) src/sqlite3-vsv.c src/vsv/*.c -o dist/x86/vsv.dylib -target x86_64-apple-macos10.12 -lm
170-
$(CC) -O1 $(MACOS_FLAGS) -include src/regexp/constants.h src/sqlite3-sqlean.c src/crypto/*.c src/define/*.c src/fileio/*.c src/fuzzy/*.c src/ipaddr/*.c src/math/*.c src/regexp/*.c src/regexp/pcre2/*.c src/stats/*.c src/text/*.c src/text/*/*.c src/time/*.c src/unicode/*.c src/uuid/*.c src/vsv/*.c -o dist/x86/sqlean.dylib -target x86_64-apple-macos10.12 -lm
138+
compile-macos-x64:
139+
mkdir -p dist/x64
140+
$(CC) -O1 $(MACOS_FLAGS) src/sqlite3-crypto.c src/crypto/*.c -o dist/x64/crypto.dylib -target x86_64-apple-macos10.12
141+
$(CC) -O3 $(MACOS_FLAGS) src/sqlite3-define.c src/define/*.c -o dist/x64/define.dylib -target x86_64-apple-macos10.12
142+
$(CC) -O3 $(MACOS_FLAGS) src/sqlite3-fileio.c src/fileio/*.c -o dist/x64/fileio.dylib -target x86_64-apple-macos10.12
143+
$(CC) -O1 $(MACOS_FLAGS) src/sqlite3-fuzzy.c src/fuzzy/*.c -o dist/x64/fuzzy.dylib -target x86_64-apple-macos10.12
144+
$(CC) -O3 $(MACOS_FLAGS) src/sqlite3-ipaddr.c src/ipaddr/*.c -o dist/x64/ipaddr.dylib -target x86_64-apple-macos10.12
145+
$(CC) -O3 $(MACOS_FLAGS) src/sqlite3-math.c src/math/*.c -o dist/x64/math.dylib -target x86_64-apple-macos10.12 -lm
146+
$(CC) -O3 $(MACOS_FLAGS) -include src/regexp/constants.h src/sqlite3-regexp.c src/regexp/*.c src/regexp/pcre2/*.c -o dist/x64/regexp.dylib -target x86_64-apple-macos10.12
147+
$(CC) -O3 $(MACOS_FLAGS) src/sqlite3-stats.c src/stats/*.c -o dist/x64/stats.dylib -target x86_64-apple-macos10.12 -lm
148+
$(CC) -O3 $(MACOS_FLAGS) src/sqlite3-text.c src/text/*.c src/text/*/*.c -o dist/x64/text.dylib -target x86_64-apple-macos10.12
149+
$(CC) -O3 $(MACOS_FLAGS) src/sqlite3-time.c src/time/*.c -o dist/x64/time.dylib -target x86_64-apple-macos10.12
150+
$(CC) -O3 $(MACOS_FLAGS) src/sqlite3-unicode.c src/unicode/*.c -o dist/x64/unicode.dylib -target x86_64-apple-macos10.12
151+
$(CC) -O3 $(MACOS_FLAGS) src/sqlite3-uuid.c src/uuid/*.c -o dist/x64/uuid.dylib -target x86_64-apple-macos10.12
152+
$(CC) -O3 $(MACOS_FLAGS) src/sqlite3-vsv.c src/vsv/*.c -o dist/x64/vsv.dylib -target x86_64-apple-macos10.12 -lm
153+
$(CC) -O1 $(MACOS_FLAGS) -include src/regexp/constants.h src/sqlite3-sqlean.c src/crypto/*.c src/define/*.c src/fileio/*.c src/fuzzy/*.c src/ipaddr/*.c src/math/*.c src/regexp/*.c src/regexp/pcre2/*.c src/stats/*.c src/text/*.c src/text/*/*.c src/time/*.c src/unicode/*.c src/uuid/*.c src/vsv/*.c -o dist/x64/sqlean.dylib -target x86_64-apple-macos10.12 -lm
171154

172155
compile-macos-arm64:
173156
mkdir -p dist/arm64
@@ -187,7 +170,7 @@ compile-macos-arm64:
187170
$(CC) -O1 $(MACOS_FLAGS) -include src/regexp/constants.h src/sqlite3-sqlean.c src/crypto/*.c src/define/*.c src/fileio/*.c src/fuzzy/*.c src/ipaddr/*.c src/math/*.c src/regexp/*.c src/regexp/pcre2/*.c src/stats/*.c src/text/*.c src/text/*/*.c src/time/*.c src/unicode/*.c src/uuid/*.c src/vsv/*.c -o dist/arm64/sqlean.dylib -target arm64-apple-macos11 -lm
188171

189172
pack-macos:
190-
zip -j dist/sqlean-macos-x86.zip dist/x86/*.dylib
173+
zip -j dist/sqlean-macos-x64.zip dist/x64/*.dylib
191174
zip -j dist/sqlean-macos-arm64.zip dist/arm64/*.dylib
192175

193176
test-all:

‎README.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,11 @@ There are a lot of useful extensions that do not quite fit the scope for various
4646

4747
There are [precompiled binaries](https://github.com/nalgeon/sqlean/releases/latest) for every OS:
4848

49-
- `sqlean-win-x64.zip` - for Windows
50-
- `sqlean-linux-x86.zip` - for Linux (x86 CPU)
51-
- `sqlean-linux-arm64.zip` - for Linux (ARM CPU)
52-
- `sqlean-macos-x86.zip` - for Intel-based macOS
53-
- `sqlean-macos-arm64.zip` - for Apple silicon (ARM-based) macOS
49+
- `sqlean-win-x64.zip` - Windows (Intel/AMD x64 CPU)
50+
- `sqlean-linux-x64.zip` - Linux (Intel/AMD x64 CPU)
51+
- `sqlean-linux-arm64.zip` - Linux (ARM CPU)
52+
- `sqlean-macos-x64.zip` - Intel-based macOS
53+
- `sqlean-macos-arm64.zip` - Apple silicon (ARM-based) macOS
5454

5555
Binaries are 64-bit and require a 64-bit SQLite version. If you are using SQLite shell on Windows (`sqlite.exe`), its 64-bit version is available at https://github.com/nalgeon/sqlite.
5656

‎docs/install.md‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ Examples below use the `stats` extension; you can specify any other supported ex
1818

1919
There are [precompiled binaries](https://github.com/nalgeon/sqlean/releases/latest) for every OS:
2020

21-
- `sqlean-win-x64.zip` - for Windows
22-
- `sqlean-linux-x86.zip` - for Linux (x86 CPU)
23-
- `sqlean-linux-arm64.zip` - for Linux (ARM CPU)
24-
- `sqlean-macos-x86.zip` - for Intel-based macOS
25-
- `sqlean-macos-arm64.zip` - for Apple silicon (ARM-based) macOS
21+
- `sqlean-win-x64.zip` - Windows (Intel/AMD x64 CPU)
22+
- `sqlean-linux-x64.zip` - Linux (Intel/AMD x64 CPU)
23+
- `sqlean-linux-arm64.zip` - Linux (ARM CPU)
24+
- `sqlean-macos-x64.zip` - Intel-based macOS
25+
- `sqlean-macos-arm64.zip` - Apple silicon (ARM-based) macOS
2626

2727
Binaries are 64-bit and require a 64-bit SQLite version. If you are using SQLite shell on Windows (`sqlite.exe`), its 64-bit version is available at https://github.com/nalgeon/sqlite.
2828

@@ -103,10 +103,10 @@ select load_extension('/Users/anton/Downloads/stats');
103103

104104
## Install: rqlite
105105

106-
To load extensions in [rqlite](https://www.rqlite.io), first download a suitable release (x86 for Linux is demonstrated below):
106+
To load extensions in [rqlite](https://www.rqlite.io), first download a suitable release (x64 for Linux is demonstrated below):
107107

108108
```bash
109-
curl -L https://github.com/nalgeon/sqlean/releases/download/0.27.0/sqlean-linux-x86.zip -o sqlean.zip
109+
curl -L https://github.com/nalgeon/sqlean/releases/download/0.27.0/sqlean-linux-x64.zip -o sqlean.zip
110110
```
111111

112112
Then pass the zipfile to rqlite when you start the rqlite node:

‎sqlpkg.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"owner": "nalgeon",
33
"name": "sqlean",
4-
"version": "0.27.2",
4+
"version": "0.27.4",
55
"homepage": "https://github.com/nalgeon/sqlean",
66
"repository": "https://github.com/nalgeon/sqlean",
77
"authors": ["Anton Zhiyanov"],
@@ -10,9 +10,9 @@
1010
"keywords": ["sqlean"],
1111
"assets": {
1212
"files": {
13-
"darwin-amd64": "sqlean-macos-x86.zip",
13+
"darwin-amd64": "sqlean-macos-x64.zip",
1414
"darwin-arm64": "sqlean-macos-arm64.zip",
15-
"linux-amd64": "sqlean-linux-x86.zip",
15+
"linux-amd64": "sqlean-linux-x64.zip",
1616
"linux-arm64": "sqlean-linux-arm64.zip",
1717
"windows-amd64": "sqlean-win-x64.zip"
1818
}

0 commit comments

Comments
 (0)