Fix Mac OS binary

mindreframer · Oct 14, 2021 · 76e01a0 · 76e01a0
1 parent 8a56bc7
commit 76e01a0
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 14 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -78,7 +78,7 @@ jobs:
           name: sqlite-sources
           path: src
       - name: Compile sources
-        run: bin/compile-mac.sh
+        run: bin/compile-macos.sh
       - name: Upload binaries to release
         uses: svenstaro/upload-release-action@v2
         with:

diff --git a/bin/compile-linux.sh b/bin/compile-linux.sh
@@ -28,8 +28,9 @@ gcc \
   -DSQLITE_INTROSPECTION_PRAGMAS=1 \
   -DSQLITE_LIKE_DOESNT_MATCH_BLOBS=1 \
   -DSQLITE_OMIT_DEPRECATED=1 \
-  -DSQLITE_THREADSAFE=1 \
+  -DSQLITE_THREADSAFE=0 \
   -DSQLITE_USE_URI=1 \
   src/shell.c src/sqlite3.c -o dist/sqlite3-ubuntu \
   -ldl -lz -lm -lreadline -lncurses
-chmod +x dist/sqlite3-ubuntu
+chmod +x dist/sqlite3-ubuntu
+ls -la dist/
diff --git a/bin/compile-mac.sh → bin/compile-macos.sh b/bin/compile-mac.sh → bin/compile-macos.sh
@@ -28,8 +28,9 @@ gcc \
   -DSQLITE_INTROSPECTION_PRAGMAS=1 \
   -DSQLITE_LIKE_DOESNT_MATCH_BLOBS=1 \
   -DSQLITE_OMIT_DEPRECATED=1 \
-  -DSQLITE_THREADSAFE=1 \
+  -DSQLITE_THREADSAFE=0 \
   -DSQLITE_USE_URI=1 \
-  src/shell.c src/sqlite3.c -o dist/sqlite3-mac \
+  src/shell.c src/sqlite3.c -o dist/sqlite3-macos \
   -ldl -lz -lm -lreadline -lncurses
-chmod +x dist/sqlite3-mac
+chmod +x dist/sqlite3-macos
+ls -la dist/
diff --git a/bin/compile-windows.sh b/bin/compile-windows.sh
@@ -28,6 +28,6 @@ gcc \
   -DSQLITE_INTROSPECTION_PRAGMAS=1 \
   -DSQLITE_LIKE_DOESNT_MATCH_BLOBS=1 \
   -DSQLITE_OMIT_DEPRECATED=1 \
-  -DSQLITE_THREADSAFE=1 \
+  -DSQLITE_THREADSAFE=0 \
   -DSQLITE_USE_URI=1 \
   -I. src/shell.c src/sqlite3.c -o dist/sqlite3.exe
diff --git a/gen/genBins.js b/gen/genBins.js
@@ -35,7 +35,7 @@ const flags = [
 class Generator extends GenBase {
   run() {
     this.genLinux();
-    this.genMac();
+    this.genMacos();
     this.genWindows();
   }
 
@@ -64,15 +64,15 @@ class Generator extends GenBase {
     this.push("ls -la dist/");
   }
 
-  genMac() {
-    let path = "bin/compile-mac.sh";
+  genMacos() {
+    let path = "bin/compile-macos.sh";
     this.lines = [];
-    this.macContent();
+    this.macosContent();
     fs.writeFileSync(path, this.content, "utf-8");
     fs.chmodSync(path, 0o755);
   }
 
-  macContent() {
+  macosContent() {
     this.push("#!/usr/bin/env bash");
     this.push("mkdir dist");
     this.push("gcc \\");
@@ -81,11 +81,11 @@ class Generator extends GenBase {
         this.push(`-${flag} \\`);
       });
 
-      this.push("src/shell.c src/sqlite3.c -o dist/sqlite3-mac \\");
+      this.push("src/shell.c src/sqlite3.c -o dist/sqlite3-macos \\");
       this.push("-ldl -lz -lm -lreadline -lncurses");
     });
 
-    this.push(`chmod +x dist/sqlite3-mac`);
+    this.push(`chmod +x dist/sqlite3-macos`);
     this.push("ls -la dist/");
   }