v10.17.8-2809 release

search5 · Jul 24, 2021 · 44d2bea · 44d2bea
2 parents 14e3a2b + 4f39686
commit 44d2bea
Show file tree

Hide file tree

Showing 93 changed files with 10,097 additions and 282 deletions.
diff --git a/build_helper/build_start.sh b/build_helper/build_start.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+./clucene_binding.py
+cp -r ../build-x64/app-unpacked/node_modules/clucene ../evernote_modules/
+./npm_registry_exists.py
+./copy_unique_modules.sh
+./nested_modules.sh
+./publishConfig_update.py http://localhost:4873
diff --git a/build_helper/clean_verdaccio.sh b/build_helper/clean_verdaccio.sh
@@ -1,2 +1,5 @@
 #!/bin/bash
 rm -rf /home/jiho/.local/share/verdaccio/storage/*
+rm -rf ../evernote.exe
+rm -rf ../build-x64
+rm -rf ../evernote_modules/*
diff --git a/build_helper/clucene_binding.py b/build_helper/clucene_binding.py
@@ -0,0 +1,56 @@
+#!/usr/bin/env python
+from lxml import etree
+
+import json
+
+result_binding = {
+    "targets": [{
+        "target_name": "clucene-binding",
+        "include_dirs": ["/usr/lib/x86_64-linux-gnu", "/usr/include/c++/8"],
+        "cflags!": ["-fno-exceptions", "-L/usr/lib/x86_64-linux-gnu/", "-I/usr/include/c++/8"],
+        "cflags_cc!": ["-fno-exceptions", "-L/usr/lib/x86_64-linux-gnu/", "-I/usr/include/c++/8"],
+        "sources": [],
+        "link_settings": {
+            "libraries": [
+                "-lclucene-core",
+                "-lclucene-shared",
+                "-luv",
+                "-lrt",
+                "-lpthread",
+                "-lnsl",
+                "-ldl",
+                "-lssl",
+                "-lcrypto"
+            ]
+        }
+    }]
+}
+
+parse_xml = etree.parse("../build-x64/app-unpacked/node_modules/clucene/build/clucene-binding.vcxproj")
+
+ns = {"Project": "http://schemas.microsoft.com/developer/msbuild/2003"}
+
+ElemAdditionalIncludeDirectories = parse_xml.xpath("//Project:AdditionalIncludeDirectories", namespaces=ns)[0].text
+AdditionalIncludeDirectories = ElemAdditionalIncludeDirectories.replace("\\", "/").split(";")
+
+
+for item in AdditionalIncludeDirectories:
+    if "clucene/dist" not in item:
+        continue
+
+    dist_start_pos = item.find("clucene/dist") + len("clucene/")
+    result_binding["targets"][0]["include_dirs"].append(item[dist_start_pos:])
+
+SourceList = parse_xml.xpath("//Project:ItemGroup/Project:ClCompile", namespaces=ns)
+for item in SourceList:
+    source_path_detail = item.get("Include").replace("\\", "/")
+
+    if "win_delay_load_hook" not in source_path_detail:
+        result_binding["targets"][0]["sources"].append(source_path_detail[len("../"):])
+    else:
+        node_gyp_start_pos = source_path_detail.find("node-gyp/")
+        win_delay_load_hook_pure_path = source_path_detail[node_gyp_start_pos:]
+
+        result_binding["targets"][0]["sources"].append(f"system_modules/{win_delay_load_hook_pure_path}")
+
+json.dump(result_binding, open("../build-x64/app-unpacked/node_modules/clucene/binding.gyp", "w"))
diff --git a/build_helper/copy_unique_modules.sh b/build_helper/copy_unique_modules.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+cp -r ../build-x64/app-unpacked/node_modules/* ../evernote_modules/
diff --git a/build_helper/evernote_nested_modules.txt b/build_helper/evernote_nested_modules.txt
@@ -0,0 +1,4 @@
+../evernote_modules/en-core-data-model/node_modules/en-data-model
+../evernote_modules/conduit-utils/node_modules/en-ts-utils
+../evernote_modules/en-calendar-data-model/node_modules/en-data-model
+../evernote_modules/en-graph-types/node_modules/en-data-model
diff --git a/build_helper/nested_modules.sh b/build_helper/nested_modules.sh
@@ -10,4 +10,4 @@ do
     find_modules+="|"
 done
 
-./unique_nested_module_filter.py $find_modules
+./unique_nested_module_filter.py $find_modules
diff --git a/build_helper/publishConfig_update.py b/build_helper/publishConfig_update.py
@@ -12,11 +12,7 @@ def main():
     # Node Modules Selection
     evernote_module_prefix = "../evernote_modules"
     npm_packages = glob.glob(f"{evernote_module_prefix}/*", recursive=False)
-    npm_packages.append(f"{evernote_module_prefix}/en-graph-types/node_modules/en-data-model")
-    npm_packages.append(f"{evernote_module_prefix}/en-tasks-data-model/node_modules/en-data-model")
-    npm_packages.append(f"{evernote_module_prefix}/en-core-data-model/node_modules/en-data-model")
-    npm_packages.append(f"{evernote_module_prefix}/conduit-utils/node_modules/en-ts-utils")
-    #print(npm_packages)
+    npm_packages.extend(open("evernote_nested_modules.txt").read().split("\n"))
 
     for idx, item in enumerate(npm_packages):
         if "/@" in item:
@@ -41,6 +37,5 @@ def main():
         os.system("npm publish")
         os.chdir(current_dir)
 
-
 if __name__ == "__main__":
     main()
diff --git a/build_helper/unique_nested_module_filter.py b/build_helper/unique_nested_module_filter.py
@@ -34,4 +34,4 @@
 
     unique_versions[f"{jr['name']}:{jr['version']}"] = item
 
-open("evernote_nested_modules.txt", "w").writelines('\n'.join(unique_versions.values()))
+open("evernote_nested_modules.txt", "w").writelines('\n'.join(unique_versions.values()))
diff --git a/build_pare.sh b/build_pare.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -e
 
-ELECTRON_VERSION=13.1.7
+ELECTRON_VERSION=11.3.0
 EVERNOTE_VERSION=10.17.8-win-ddl-ga-2809
 EVERNOTE_BINARY=evernote.exe
 BUILD_ARCH=${1:-x64}

diff --git a/evernote_modules/conduit-auth-shared/package.json b/evernote_modules/conduit-auth-shared/package.json
@@ -2,7 +2,7 @@
   "name": "conduit-auth-shared",
   "version": "1.37.10",
   "publishConfig": {
-    "registry": "http://localhost:4873"
+    "registry": "https://maven.vpn.etonreve.com/api/npm/npm"
   },
   "description": "Shared auth functions and types between worker and main process modules",
   "main": "dist/index",

diff --git a/evernote_modules/conduit-core/package.json b/evernote_modules/conduit-core/package.json
@@ -2,7 +2,7 @@
   "name": "conduit-core",
   "version": "1.37.10",
   "publishConfig": {
-    "registry": "http://localhost:4873"
+    "registry": "https://maven.vpn.etonreve.com/api/npm/npm"
   },
   "description": "Core Conduit module",
   "main": "dist/index",

diff --git a/evernote_modules/conduit-ipc-messages/package.json b/evernote_modules/conduit-ipc-messages/package.json
@@ -2,7 +2,7 @@
   "name": "conduit-ipc-messages",
   "version": "1.37.10",
   "publishConfig": {
-    "registry": "http://localhost:4873"
+    "registry": "https://maven.vpn.etonreve.com/api/npm/npm"
   },
   "description": "Common Conduit IPC messages",
   "main": "dist/index",

diff --git a/evernote_modules/conduit-nap/package.json b/evernote_modules/conduit-nap/package.json
@@ -2,7 +2,7 @@
   "name": "conduit-nap",
   "version": "1.37.10",
   "publishConfig": {
-    "registry": "http://localhost:4873"
+    "registry": "https://maven.vpn.etonreve.com/api/npm/npm"
   },
   "description": "NAP Auth Library",
   "main": "dist/index",

diff --git a/evernote_modules/conduit-storage-better-sqlite3/package.json b/evernote_modules/conduit-storage-better-sqlite3/package.json
@@ -2,7 +2,7 @@
   "name": "conduit-storage-better-sqlite3",
   "version": "1.37.10",
   "publishConfig": {
-    "registry": "http://localhost:4873"
+    "registry": "https://maven.vpn.etonreve.com/api/npm/npm"
   },
   "description": "Conduit better-sqlite3 wrapper",
   "main": "dist/index",

diff --git a/evernote_modules/conduit-storage/package.json b/evernote_modules/conduit-storage/package.json
@@ -2,7 +2,7 @@
   "name": "conduit-storage",
   "version": "1.37.10",
   "publishConfig": {
-    "registry": "http://localhost:4873"
+    "registry": "https://maven.vpn.etonreve.com/api/npm/npm"
   },
   "description": "Storage",
   "main": "dist/index",

diff --git a/evernote_modules/conduit-utils/node_modules/en-ts-utils/package.json b/evernote_modules/conduit-utils/node_modules/en-ts-utils/package.json
diff --git a/evernote_modules/conduit-utils/package.json b/evernote_modules/conduit-utils/package.json
@@ -2,7 +2,7 @@
   "name": "conduit-utils",
   "version": "1.37.10",
   "publishConfig": {
-    "registry": "http://localhost:4873"
+    "registry": "https://maven.vpn.etonreve.com/api/npm/npm"
   },
   "description": "Utils",
   "main": "dist/index",

diff --git a/evernote_modules/conduit-view-types/package.json b/evernote_modules/conduit-view-types/package.json
@@ -2,7 +2,7 @@
   "name": "conduit-view-types",
   "version": "1.37.10",
   "publishConfig": {
-    "registry": "http://localhost:4873"
+    "registry": "https://maven.vpn.etonreve.com/api/npm/npm"
   },
   "description": "Shared types between conduit-core and conduit-view",
   "main": "dist/index",

diff --git a/evernote_modules/conduit-view/package.json b/evernote_modules/conduit-view/package.json
@@ -2,7 +2,7 @@
   "name": "conduit-view",
   "version": "1.37.10",
   "publishConfig": {
-    "registry": "http://localhost:4873"
+    "registry": "https://maven.vpn.etonreve.com/api/npm/npm"
   },
   "description": "Render/View Layer for Conduit",
   "main": "dist/index",

diff --git a/evernote_modules/en-calendar-data-model/package.json b/evernote_modules/en-calendar-data-model/package.json
@@ -2,7 +2,7 @@
   "name": "en-calendar-data-model",
   "version": "3.6.0",
   "publishConfig": {
-    "registry": "http://localhost:4873"
+    "registry": "https://maven.vpn.etonreve.com/api/npm/npm"
   },
   "files": [
     "dist"

diff --git a/evernote_modules/en-conduit-electron-auth/package.json b/evernote_modules/en-conduit-electron-auth/package.json
@@ -2,7 +2,7 @@
   "name": "en-conduit-electron-auth",
   "version": "1.37.10",
   "publishConfig": {
-    "registry": "http://localhost:4873"
+    "registry": "https://maven.vpn.etonreve.com/api/npm/npm"
   },
   "description": "Conduit Auth Helpers for Electron",
   "main": "dist/index",

diff --git a/evernote_modules/en-conduit-electron-renderer/package.json b/evernote_modules/en-conduit-electron-renderer/package.json
@@ -2,7 +2,7 @@
   "name": "en-conduit-electron-renderer",
   "version": "1.37.10",
   "publishConfig": {
-    "registry": "http://localhost:4873"
+    "registry": "https://maven.vpn.etonreve.com/api/npm/npm"
   },
   "description": "Conduit integration for Electron Renderer process",
   "main": "dist/index",

diff --git a/evernote_modules/en-conduit-electron-shared/package.json b/evernote_modules/en-conduit-electron-shared/package.json
@@ -2,7 +2,7 @@
   "name": "en-conduit-electron-shared",
   "version": "1.37.10",
   "publishConfig": {
-    "registry": "http://localhost:4873"
+    "registry": "https://maven.vpn.etonreve.com/api/npm/npm"
   },
   "description": "Common code and types for Electron conduit Integration",
   "main": "dist/index",

diff --git a/evernote_modules/en-conduit-electron-worker/package.json b/evernote_modules/en-conduit-electron-worker/package.json
@@ -2,7 +2,7 @@
   "name": "en-conduit-electron-worker",
   "version": "1.37.10",
   "publishConfig": {
-    "registry": "http://localhost:4873"
+    "registry": "https://maven.vpn.etonreve.com/api/npm/npm"
   },
   "description": "Conduit Electron worker window",
   "main": "dist/index",

diff --git a/evernote_modules/en-conduit-electron/package.json b/evernote_modules/en-conduit-electron/package.json
@@ -2,7 +2,7 @@
   "name": "en-conduit-electron",
   "version": "1.37.10",
   "publishConfig": {
-    "registry": "http://localhost:4873"
+    "registry": "https://maven.vpn.etonreve.com/api/npm/npm"
   },
   "description": "Conduit main process bridge for Electron",
   "main": "dist/index",

diff --git a/evernote_modules/en-conduit-plugin-analytics-measurement-protocol/package.json b/evernote_modules/en-conduit-plugin-analytics-measurement-protocol/package.json
@@ -2,7 +2,7 @@
   "name": "en-conduit-plugin-analytics-measurement-protocol",
   "version": "1.37.10",
   "publishConfig": {
-    "registry": "http://localhost:4873"
+    "registry": "https://maven.vpn.etonreve.com/api/npm/npm"
   },
   "description": "Plugin for setting up a conduit-core TelemetryDestination for record events on Google Analytics through the Measurement Protocol API",
   "main": "dist/index",

diff --git a/evernote_modules/en-conduit-plugin-board/package.json b/evernote_modules/en-conduit-plugin-board/package.json
@@ -2,7 +2,7 @@
   "name": "en-conduit-plugin-board",
   "version": "1.37.10",
   "publishConfig": {
-    "registry": "http://localhost:4873"
+    "registry": "https://maven.vpn.etonreve.com/api/npm/npm"
   },
   "description": "Plugin for the evernote (Dash)Board service",
   "main": "dist/index",

diff --git a/evernote_modules/en-conduit-plugin-calendar-service/package.json b/evernote_modules/en-conduit-plugin-calendar-service/package.json
@@ -2,7 +2,7 @@
   "name": "en-conduit-plugin-calendar-service",
   "version": "1.37.10",
   "publishConfig": {
-    "registry": "http://localhost:4873"
+    "registry": "https://maven.vpn.etonreve.com/api/npm/npm"
   },
   "description": "Conduit plugin for mediating Calendar Service requests.",
   "main": "dist/index",

diff --git a/evernote_modules/en-conduit-plugin-common-queries/package.json b/evernote_modules/en-conduit-plugin-common-queries/package.json
@@ -2,7 +2,7 @@
   "name": "en-conduit-plugin-common-queries",
   "version": "1.37.10",
   "publishConfig": {
-    "registry": "http://localhost:4873"
+    "registry": "https://maven.vpn.etonreve.com/api/npm/npm"
   },
   "description": "Conduit plugin providing common custom queries",
   "main": "dist/index",

diff --git a/evernote_modules/en-conduit-plugin-communication-engine/package.json b/evernote_modules/en-conduit-plugin-communication-engine/package.json
@@ -2,7 +2,7 @@
   "name": "en-conduit-plugin-communication-engine",
   "version": "1.37.10",
   "publishConfig": {
-    "registry": "http://localhost:4873"
+    "registry": "https://maven.vpn.etonreve.com/api/npm/npm"
   },
   "description": "Plugin for the evernote communication engine",
   "main": "dist/index",

diff --git a/evernote_modules/en-conduit-plugin-cross-promotions/package.json b/evernote_modules/en-conduit-plugin-cross-promotions/package.json
@@ -3,7 +3,7 @@
   "version": "1.37.10",
   "description": "Plugin for cross promotions",
   "publishConfig": {
-    "registry": "http://localhost:4873"
+    "registry": "https://maven.vpn.etonreve.com/api/npm/npm"
   },
   "main": "dist/index",
   "files": [

diff --git a/evernote_modules/en-conduit-plugin-datadog-metrics/package.json b/evernote_modules/en-conduit-plugin-datadog-metrics/package.json
@@ -2,7 +2,7 @@
   "name": "en-conduit-plugin-datadog-metrics",
   "version": "1.37.10",
   "publishConfig": {
-    "registry": "http://localhost:4873"
+    "registry": "https://maven.vpn.etonreve.com/api/npm/npm"
   },
   "description": "Plugin for setting up a conduit-core TelemetryDestination for recording metrics on Datadog",
   "main": "dist/index",

diff --git a/evernote_modules/en-conduit-plugin-event-recording/package.json b/evernote_modules/en-conduit-plugin-event-recording/package.json
@@ -2,7 +2,7 @@
   "name": "en-conduit-plugin-event-recording",
   "version": "1.37.10",
   "publishConfig": {
-    "registry": "http://localhost:4873"
+    "registry": "https://maven.vpn.etonreve.com/api/npm/npm"
   },
   "description": "Plugin for collecting metrics via conduit",
   "main": "dist/index",

diff --git a/evernote_modules/en-conduit-plugin-features-rollout/package.json b/evernote_modules/en-conduit-plugin-features-rollout/package.json
@@ -2,7 +2,7 @@
   "name": "en-conduit-plugin-features-rollout",
   "version": "1.37.10",
   "publishConfig": {
-    "registry": "http://localhost:4873"
+    "registry": "https://maven.vpn.etonreve.com/api/npm/npm"
   },
   "description": "Conduit plugin for gradual feature rollout.",
   "main": "dist/index",

diff --git a/evernote_modules/en-conduit-plugin-google-services/package.json b/evernote_modules/en-conduit-plugin-google-services/package.json
@@ -2,7 +2,7 @@
   "name": "en-conduit-plugin-google-services",
   "version": "1.37.10",
   "publishConfig": {
-    "registry": "http://localhost:4873"
+    "registry": "https://maven.vpn.etonreve.com/api/npm/npm"
   },
   "description": "Conduit plugin for mediating Google Services requests.",
   "main": "dist/index",

diff --git a/evernote_modules/en-conduit-plugin-in-app-purchasing/package.json b/evernote_modules/en-conduit-plugin-in-app-purchasing/package.json
@@ -2,7 +2,7 @@
   "name": "en-conduit-plugin-in-app-purchasing",
   "version": "1.37.10",
   "publishConfig": {
-    "registry": "http://localhost:4873"
+    "registry": "https://maven.vpn.etonreve.com/api/npm/npm"
   },
   "description": "Plugin for purchasing through apple store and google play across EN clients",
   "main": "dist/index",

diff --git a/evernote_modules/en-conduit-plugin-maestro/package.json b/evernote_modules/en-conduit-plugin-maestro/package.json
@@ -2,7 +2,7 @@
   "name": "en-conduit-plugin-maestro",
   "version": "1.37.10",
   "publishConfig": {
-    "registry": "http://localhost:4873"
+    "registry": "https://maven.vpn.etonreve.com/api/npm/npm"
   },
   "description": "Plugin for the evernote maestro (AKA experiments) service",
   "main": "dist/index",

diff --git a/evernote_modules/en-conduit-plugin-monetization/package.json b/evernote_modules/en-conduit-plugin-monetization/package.json
@@ -2,7 +2,7 @@
   "name": "en-conduit-plugin-monetization",
   "version": "1.37.10",
   "publishConfig": {
-    "registry": "http://localhost:4873"
+    "registry": "https://maven.vpn.etonreve.com/api/npm/npm"
   },
   "description": "Plugin for the evernote monetization service",
   "main": "dist/index",

diff --git a/evernote_modules/en-conduit-plugin-note-import/package.json b/evernote_modules/en-conduit-plugin-note-import/package.json
@@ -2,7 +2,7 @@
   "name": "en-conduit-plugin-note-import",
   "version": "1.37.10",
   "publishConfig": {
-    "registry": "http://localhost:4873"
+    "registry": "https://maven.vpn.etonreve.com/api/npm/npm"
   },
   "description": "Conduit plugin providing noteImport, noteCopy, and noteMove",
   "main": "dist/index",