Merge pull request #106 from quintijn/installerdetails

Installerdetails
dictation-toolbox · May 20, 2022 · 426d71f · 426d71f
2 parents b70bc74 + 70c9aa1
commit 426d71f
Show file tree

Hide file tree

Showing 136 changed files with 13 additions and 44,670 deletions.
diff --git a/.gitignore b/.gitignore
@@ -89,5 +89,6 @@ MacroSystem/*_vcl.py
 /PyTest/readwritefiletest/*.txt
 /PyTest/readwritefiletest/*out.ini
 
-# documentation (sphinx)
-_build
+# documentation
+/documentation/_build
+/documentation/natlink_build
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,19 +1,19 @@
 cmake_minimum_required (VERSION 3.20)
 
 project (Natlink)
-set(NATLINK_VERSION 5.1.1)
-set(PYTHON_VERSION 3.10 CACHE STRING "3.X for X >= 8")
+set(NATLINK_VERSION 5.1.2)
+set(PYTHON_VERSION 3.9 CACHE STRING "3.X for X >= 9")
 set(MYAPP_NAME "Natlink")
 
 # Other supported version; use CMake cache editor
-set(PYTHON_VERSIONS 3.8 3.9 3.10)
+set(PYTHON_VERSIONS 3.9 3.10)
 set_property(CACHE PYTHON_VERSION PROPERTY STRINGS ${PYTHON_VERSIONS})
 
 #### where to find the 32-bit installer for $(PYTHON_VERSION)
 if(${PYTHON_VERSION} STREQUAL 3.10)
-    set(PYTHON_INSTALL_URL "https://www.python.org/ftp/python/3.10.3/python-3.10.3.exe")
+    set(PYTHON_INSTALL_URL "https://www.python.org/ftp/python/3.10.4/python-3.10.4.exe")
 elseif(${PYTHON_VERSION} STREQUAL 3.9)
-    set(PYTHON_INSTALL_URL "https://www.python.org/ftp/python/3.9.9/python-3.9.9.exe")
+    set(PYTHON_INSTALL_URL "https://www.python.org/ftp/python/3.9.12/python-3.9.12.exe")
 elseif(${PYTHON_VERSION} STREQUAL 3.8)
     set(PYTHON_INSTALL_URL "https://www.python.org/ftp/python/3.8.10/python-3.8.10.exe") 
 endif()
@@ -43,3 +43,7 @@ add_subdirectory ("NatlinkSource")
 add_subdirectory ("NatlinkModule") # build two
 # Now, using dependcy on the stamps, start the inno installation generator
 add_subdirectory ("InstallerSource")
+# include sample macros
+#add_subdirectory ("SampleMacros")
+# add config program
+#add_subdirectory ("NatlinkConfigure")
diff --git a/documentation/_build/doctrees/documentation.doctree b/documentation/_build/doctrees/documentation.doctree
diff --git a/documentation/_build/doctrees/environment.pickle b/documentation/_build/doctrees/environment.pickle
diff --git a/documentation/_build/doctrees/index.doctree b/documentation/_build/doctrees/index.doctree
diff --git a/documentation/_build/doctrees/installation.doctree b/documentation/_build/doctrees/installation.doctree
diff --git a/documentation/_build/doctrees/messagefunctions.doctree b/documentation/_build/doctrees/messagefunctions.doctree
diff --git a/documentation/_build/doctrees/modules.doctree b/documentation/_build/doctrees/modules.doctree
diff --git a/documentation/_build/doctrees/monitorfunctions.doctree b/documentation/_build/doctrees/monitorfunctions.doctree
diff --git a/documentation/_build/doctrees/natlinkclipboard.doctree b/documentation/_build/doctrees/natlinkclipboard.doctree
diff --git a/documentation/_build/doctrees/natlinkstatus.doctree b/documentation/_build/doctrees/natlinkstatus.doctree
diff --git a/documentation/_build/doctrees/project.doctree b/documentation/_build/doctrees/project.doctree
diff --git a/documentation/_build/doctrees/sendkeys.doctree b/documentation/_build/doctrees/sendkeys.doctree
diff --git a/documentation/_build/html/.buildinfo b/documentation/_build/html/.buildinfo
diff --git a/documentation/_build/html/_modules/index.html b/documentation/_build/html/_modules/index.html