update to new directory structure

Author: NSoiffer

build-nvda-addon.sh

@@ -4,11 +4,10 @@
 rm -rf addon/globalPlugins/MathCAT/Rules
 # NVDA is currently uses 32 bit python 3.7
 # We need to tell PYO3 that
-set PYO3_PYTHON_64=c:/Users/neils/AppData/Local/Programs/Python/Python39/python.exe
-set PYO3_PYTHON_32=c:/Users/neils/AppData/Local/Programs/Python/Python37-32/python.exe
-env PYO3_PYTHON=$PYO3_PYTHON_32 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
+set PYO3_PYTHON_64=c:/Users/neils/AppData/Local/Programs/Python/Python39
+set PYO3_PYTHON_32=c:/Users/neils/AppData/Local/Programs/Python/Python37-32
+env PYO3_PYTHON=$PYO3_PYTHON_32/python.exe cargo build --target i686-pc-windows-msvc --release
+cp target/i686-pc-windows-msvc/release/libmathcat_py.dll addon/globalPlugins/MathCAT/libmathcat.pyd
 sed 's/^import wx\.xrc/# import wx.xrc/' --in-place "addon/globalPlugins/MathCAT/MathCATgui.py"
 rm MathCAT-*.nvda-addon
-scons
+$PYO3_PYTHON_32/Scripts/scons

build.rs

@@ -9,7 +9,7 @@ use zip::ZipArchive;
 fn main() {
     let archive = libmathcat::ZIPPED_RULE_FILES;
     let archive = std::io::Cursor::new(archive);
-    let location = PathBuf::from("NVDA-addon/addon/globalPlugins/MathCAT");
+    let location = PathBuf::from("addon/globalPlugins/MathCAT");
 
     let mut zip_archive = ZipArchive::new(archive).unwrap();
     zip_archive.extract(&location).expect("Zip extraction failed");