Changed to work with crates.io version of MathCAT

It now extracts the Rules dir from MathCAT.
The build should now be done using buld-addon.sh.

Author: NSoiffer

.cargo/config.toml

@@ -0,0 +1,6 @@
+# first run "rustup target add i686-pc-windows-msvc" to download needed files
+#
+# NVDA only runs on windows and only supports 32 bit builds (at this time)
+# Because of this, we force the target architecture.
+[build]
+target = "i686-pc-windows-msvc"

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "MathCatForPython"
-version = "0.1.1"
+version = "0.1.2"
 authors = ["Neil Soiffer <soiffer@alum.mit.edu>"]
 edition = "2018"
 
@@ -13,12 +13,16 @@ name = "libmathcat_py"
 crate-type = ["cdylib"]
 
 [dependencies]
-mathcat = "0.1.2"
+mathcat = "0.1.6"
 
 [dependencies.pyo3]
 version = "0.15.1"
 features = ["extension-module", "abi3"]
 
-# 32 bit target stable-i686-pc-windows-msvc
-# if changing to building 32 bit python version, change .cargo/config.toml
-#  along with changing env variable PYO3_PYTHON
+[build-dependencies]
+mathcat = "0.1.6"
+zip = "0.5.8"
+
+[profile.release]
+lto = true
+# opt-level = "z"  # Optimize for size.

NVDA-addon/addon/globalPlugins/MathCAT/python3.dll

@@ -0,0 +1,10 @@
+#!/bin/csh
+# RUN THIS FILE to build the NVDA addon
+
+cargo build --target i686-pc-windows-msvc --release
+
+cp target/i686-pc-windows-msvc/release/libmathcat_py.dll NVDA-addon/addon/globalPlugins/MathCAT/libmathcat.pyd
+cd NVDA-addon
+rm mathCAT-*.nvda-addon
+scons
+

NVDA-addon/build.sh

@@ -0,0 +1,23 @@
+//! The build.rs file is necessary to unzip the rules.
+//! rules.zip are needed so there is a way to get the rules dir into the build since you can't get it from the crate.
+//!
+//! Note: this only creates the Rules dir. Run build-addon.sh to actually build the addon.
+
+use std::path::PathBuf;
+use zip::ZipArchive;
+
+fn main() {
+    // first remove the Rules directory
+    std::fs::remove_dir_all("NVDA-addon/addon/globalPlugins/MathCAT/Rules")
+        .expect("Failed to remove directory 'NVDA-addon/addon/globalPlugins/MathCAT/Rules'");
+    let archive = libmathcat::ZIPPED_RULE_FILES;
+    let archive = std::io::Cursor::new(archive);
+    let location = PathBuf::from("NVDA-addon/addon/globalPlugins/MathCAT");
+
+    let mut zip_archive = ZipArchive::new(archive).unwrap();
+    zip_archive.extract(&location).expect("Zip extraction failed");
+
+    // the test dir 'zz' doesn't need to be part of the addon
+    std::fs::remove_dir_all("NVDA-addon/addon/globalPlugins/MathCAT/Rules/zz")
+        .expect("Failed to remove directory 'NVDA-addon/addon/globalPlugins/MathCAT/Rules/zz'");
+}

build-addon.sh

@@ -165,12 +165,12 @@ mod py_tests {
         // this isn't a real test
         pyo3::prepare_freethreaded_python();
         let mathml_str = "<math><mo>(</mo><mrow><mn>451</mn><mo>,</mo><mn>231</mn></mrow><mo>)</mo></math>";
-        match convert_error( libmathcat::interface::SetMathML(mathml_str.to_string()) ) {
+        match convert_error( libmathcat::interface::set_mathml(mathml_str.to_string()) ) {
             Ok(_mathml_with_ids) => println!("MathML is set w/o error"),
             Err(e) => println!("Error is {}", e.to_string()),
         }
         // still alive?
-        match convert_error( libmathcat::interface::SetMathML(mathml_str.to_string()) ) {
+        match convert_error( libmathcat::interface::set_mathml(mathml_str.to_string()) ) {
             Ok(_mathml_with_ids) => panic!("MathML is set 2nd time w/o error"),
             Err(e) => panic!("Error remains {}", e.to_string()),
         }