Move to libzim7

.editorconfig

@@ -15,3 +15,6 @@ indent_style = tab
 [*.{c,h,cpp,cpp,hpp}]
 indent_size = 4
 
+[*.{js,ts}]
+indent_size = 2
+

.env

@@ -1 +1 @@
-LIBZIM_VERSION=6.3.2
+LIBZIM_VERSION=8.0.0

.github/workflows/ci.yml

@@ -11,7 +11,7 @@ on:
 jobs:
 
   macOS:
-    runs-on: macos-latest
+    runs-on: macos-11
 
     strategy:
       matrix:
@@ -20,7 +20,7 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v1
+      uses: actions/setup-node@v3
 
     - name: Setup python 3.6
       uses: actions/setup-python@v1
@@ -39,9 +39,6 @@ jobs:
     - name: installing typescript
       run: npm i -g typescript
 
-    - name: running tsc
-      run: tsc
-
     - name: running test
       run: npm run test
 
@@ -55,7 +52,7 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v1
+      uses: actions/setup-node@v3
       with:
         node-version: ${{ matrix.node-version }}
 
@@ -71,9 +68,6 @@ jobs:
     - name: installing typescript
       run: npm i -g typescript
 
-    - name: running tsc
-      run: tsc
-
     - name: running test
       run: npm run test
 
@@ -87,7 +81,7 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v1
+      uses: actions/setup-node@v3
       with:
         node-version: ${{ matrix.node-version }}
 
@@ -106,9 +100,6 @@ jobs:
     - name: installing codecov
       run: npm i codecov
 
-    - name: running tsc
-      run: tsc
-
     - name: running test
       run: npm run test
 

CPPLINT.cfg

@@ -13,6 +13,9 @@ filter=-build/namespaces_literals
 filter=-build/include_subdir
 filter=-legal/copyright
 
+# Allow runtime references
+filter=-runtime/references
+
 # Ignore code that isn't ours.
 exclude_files=third_party
 

binding.gyp

@@ -24,7 +24,7 @@
                 "libraries": [
                   "-Wl,-rpath,'$$ORIGIN'",
                   "-L<(libzim_dir)/lib/x86_64-linux-gnu",
-                  "<(libzim_dir)/lib/x86_64-linux-gnu/libzim.so.6",
+                  "<(libzim_dir)/lib/x86_64-linux-gnu/libzim.so.7",
                 ],
               }],
               ["libzim_local!='true' and OS=='mac'", {
@@ -33,7 +33,8 @@
                   "xcode_settings": {
                       "GCC_SYMBOLS_PRIVATE_EXTERN": "YES",  # -fvisibility=hidden
                       "GCC_ENABLE_CPP_EXCEPTIONS": "YES",
-                      "LD_RUNPATH_SEARCH_PATHS": "@loader_path/"
+                      "LD_RUNPATH_SEARCH_PATHS": "@loader_path/",
+                      "OTHER_CFLAGS": [ "-std=c++17", "-fexceptions" ],
                   },
                   "libraries": ["-Wl,-rpath,@loader_path/", "-L<(libzim_dir)/lib", "-lzim"],
               }],
@@ -45,9 +46,6 @@
             "cflags_cc": [ "-std=c++17", "-fexceptions" ],
             "sources": [
                 "src/module.cc",
-                "src/article.cc",
-                "src/reader.cc",
-                "src/writer.cc",
             ],
             "include_dirs": [
                 "<!@(node -p \"require('node-addon-api').include\")",

bundle-libzim.js

@@ -13,14 +13,14 @@ if (!isMacOS && !isLinux) {
 }
 
 if (isLinux) {
-    console.info(`Copying libzim.so.6 to build folder`)
-    exec(`cp download/lib/x86_64-linux-gnu/libzim.so.6 build/Release/libzim.so.6`)
-    exec(`ln -sf build/Release/libzim.so.6 build/Release/libzim.so`)  // convienience only, not required
+    console.info(`Copying libzim.so.7 to build folder`)
+    exec(`cp download/lib/x86_64-linux-gnu/libzim.so.7 build/Release/libzim.so.7`)
+    exec(`ln -sf build/Release/libzim.so.7 build/Release/libzim.so`)  // convienience only, not required
 }
 if (isMacOS) {
-    console.info(`Copying libzim.6.dylib to build folder`);
-    exec(`cp download/lib/libzim.6.dylib build/Release/libzim.6.dylib`)
-    exec(`ln -sf build/Release/libzim.6.dylib build/Release/libzim.dylib`)   // convienience only, not required
+    console.info(`Copying libzim.7.dylib to build folder`);
+    exec(`cp download/lib/libzim.7.dylib build/Release/libzim.7.dylib`)
+    exec(`ln -sf build/Release/libzim.7.dylib build/Release/libzim.dylib`)   // convienience only, not required
     console.info(`Fixing rpath`)
-    exec(`install_name_tool -change libzim.6.dylib @loader_path/libzim.6.dylib build/Release/zim_binding.node`)
+    exec(`install_name_tool -change libzim.7.dylib @loader_path/libzim.7.dylib build/Release/zim_binding.node`)
 }

download-libzim.js

@@ -17,7 +17,7 @@ if (!isMacOS && !isLinux) {
 
 let osPrefix = (isMacOS) ? 'macos' : 'linux';
 const urls = [
-    `http://download.openzim.org/release/libzim/libzim_${osPrefix}-x86_64-${process.env.LIBZIM_VERSION}.tar.gz`,
+    `https://download.openzim.org/release/libzim/libzim_${osPrefix}-x86_64-${process.env.LIBZIM_VERSION}.tar.gz`,
 ].filter(a => a);
 
 for (let url of urls) {