Windows 11 updated

Files/dependencies/install_osdag_dependencies.bat

@@ -52,6 +52,7 @@ call conda install .\zlib-1.2.11-h2fa13f4_1006.tar.bz2
 call conda install .\zstd-1.4.4-h9f78265_3.tar.bz2
 call conda install .\gl2ps-1.3.8-hfa6e2cd_4.tar.bz2
 call conda install .\freeimageplus-3.18.0-h6538335_2.tar.bz2
+call python -m pip install .\pip-24.0.tar.gz
 call pip install .\PyQt5-5.14.2-5.14.2-cp35.cp36.cp37.cp38-none-win_amd64.whl
 call pip install .\pdfkit-0.6.1.tar.gz
 call pip install .\PyYAML-5.3.1.tar.gz
@@ -62,9 +63,10 @@ call pip install .\PyLaTeX-1.3.1.tar.gz
 call pip install .\pdflatex-0.1.3.tar.gz
 call pip install .\keyring-21.2.1.tar.gz
 call pip install .\PyGithub-1.51.tar.gz
-call pip install .\pandas-1.0.5.tar.bz2
-call conda install .\pythonocc-core-0.18.2-py37h24bf2e0_281.tar.bz2
-call conda install .\oce-0.18.3-vc14_3.tar.bz2
+call pip install .\pandas-1.0.5-cp37-cp37m-win_amd64.whl
+call pip install .\pynput-1.6.8-py2.py3-none-any.whl
+call conda install .\pythonocc-core-0.18.2-py37he980bc4_0.tar.bz2
+call conda install .\oce-0.18.3-vc14_3.win64.tar.bz2
 call conda install .\smesh-6.7.6-vc14_7.tar.bz2
 call conda install .\tbb-2019.9-he980bc4_0.tar.bz2
 exit

README.md

@@ -0,0 +1,81 @@
+# Introduction
+
+This installer installs Osdag (along with Miniconda, MiKTeX and other dependecies required to run Osdag).
+The installer is made using [NSIS](https://nsis.sourceforge.io/Main_Page)
+
+
+# System Requirements:
+
+1. Supported Windows Operating Systems:
+	- Windows Vista
+	- Windows 7
+	- Windows 8
+	- Windows 8.1
+	- Windows 10
+        - Windows 11
+
+2. Supported Architecture(s):
+	 - 64-bit
+
+3. RAM and Storage Space:
+	- Minimum RAM: 2GB 
+	- Minimum (recommended) Storage Space: 4GB
+
+ 4. Microsoft Build tools
+      - Install [MS Build Tools](https://visualstudio.microsoft.com/visual-cpp-build-tools/) and add it to PATH.
+
+
+
+# Uninstalling Earlier Version of Osdag:
+
+If you have a previous version of Osdag installed then it is mandatory to uninstall the same.
+
+1) Go to the location where Osdag was installed and run "Uninstall.exe".
+
+
+# Installation steps:
+
+
+  Run Osdag_windows_setup.exe
+
+    # Follow on-screen instructions AND select the following options in the Setup:
+	i) Double click on the osdag_windows_installer.exe to start the start the installation process. 
+	ii) Click Next, then Install.
+	iii) Read the License and click 'I Agree' to proceed.
+	iv) Select the installation directory and click Next.
+	v) Click Install.
+	vi) Wait for the installation process to get over (this might take several minutes).
+	vii) Accept the MiKTeX license and click Next.
+	Viii) Choose the MiKTeX installation scope and click Next.
+	ix) Select the installation directory and click Next.
+	x) Keep the MiKTeX setting to default and click Next.
+	xi) Click start to install MiKTeX.
+	xii) Click Next.
+	Xiii) (optional) You can check for MiKTeX package updates.
+	xiv) After the process ends, click the Finish button.
+
+	Osdag will be successfully installed!
+
+
+# Running Osdag:
+
+
+After the installation is complete, you may run Osdag by one of the following methods:
+1. Double-clicking on the Desktop shortcut or
+2. Press the Windows key and search Osdag 
+3. Navigating to the installation-directory and double-clicking on the Osdag shortcut
+
+# Creating Windows Installer Exe
+
+1. Clone or download this repository.
+2. Download Miniconda3-py37_23.1.0-1 and copy it to the Files folder, name it as 'Miniconda3-latest-Windows-x86_64.exe'
+3. Download all required python dependencies (as listed in install_osdag_dependencies.bat file in dependencies folder) and copy them into the dependencies folder.
+4. Download and move miktex-x64.exe into Files/latex folder.
+5. Make exe of latex_package_installer.py and miktek_installer.py using [pyinstaller](https://pypi.org/project/pyinstaller/) and move the created .exe files (they will be created in dist folder) into latex folder.
+6. Copy the [Osdag folder](https://github.com/osdag-admin/Osdag) into the 'Files' folder
+7. Install NSIS Software and move the header files (environment files) to 'include' folder inside the Nsis installed Directory.
+8. Compile the osdag.nsi using NSIS, the installer will be created in the same location as the osdag.nsi file.
+
+# Fixes
+- Modified NSIS script to install miniconda and add it to the path correctly.
+- Fixed Pyqt5 installation Error. 

header files/EnvVarUpdate.nsh

@@ -25,16 +25,16 @@
  *  http://nsis.sourceforge.net/Environmental_Variables:_append%2C_prepend%2C_and_remove_entries
  *
  */
-
-
+ 
+ 
 !ifndef ENVVARUPDATE_FUNCTION
 !define ENVVARUPDATE_FUNCTION
 !verbose push
 !verbose 3
 !include "LogicLib.nsh"
 !include "WinMessages.NSH"
 !include "StrFunc.nsh"
-
+ 
 ; ---- Fix for conflict if StrFunc.nsh is already includes in main file -----------------------
 !macro _IncludeStrFunction StrFuncName
   !ifndef ${StrFuncName}_INCLUDED
@@ -43,13 +43,13 @@
   !ifndef Un${StrFuncName}_INCLUDED
     ${Un${StrFuncName}}
   !endif
-  !define un.${StrFuncName} "${Un${StrFuncName}}"
+  !define un.${StrFuncName} '${Un${StrFuncName}}'
 !macroend
-
+ 
 !insertmacro _IncludeStrFunction StrTok
 !insertmacro _IncludeStrFunction StrStr
 !insertmacro _IncludeStrFunction StrRep
-
+ 
 ; ---------------------------------- Macro Definitions ----------------------------------------
 !macro _EnvVarUpdateConstructor ResultVar EnvVarName Action Regloc PathString
   Push "${EnvVarName}"
@@ -324,4 +324,4 @@ FunctionEnd
 ;----------------------------------- EnvVarUpdate end----------------------------------------
 
 !verbose pop
-!endif
+!endif

osdag.nsi

@@ -109,9 +109,9 @@ Function update_path_miniconda
 
 	;This function adds the paths required by Miniconda3 to the Path variable
 
-	${EnvVarUpdate} $0 "PATH" "P" "HKLM" "$PROGRAMFILES32\miniconda3\Library\bin"
-	${EnvVarUpdate} $0 "PATH" "P" "HKLM" "$PROGRAMFILES32\miniconda3\Scripts"
-	${EnvVarUpdate} $0 "PATH" "P" "HKLM" "$PROGRAMFILES32\miniconda3"
+	${EnvVarUpdate} $0 "PATH" "P" "HKLM" "$INSTDIR\miniconda3\Library\bin"
+	${EnvVarUpdate} $0 "PATH" "P" "HKLM" "$INSTDIR\miniconda3\Scripts"
+	${EnvVarUpdate} $0 "PATH" "P" "HKLM" "$INSTDIR\miniconda3"
 	${EnvVarUpdate}	$0 "PATH" "P" "HKLM" "$INSTDIR"
 FunctionEnd
 
@@ -156,7 +156,7 @@ Section "OSDAG" SEC01
 		File "Files\Miniconda3-latest-Windows-x86_64.exe"
 
 		;This command silently installs Miniconda3
-		ExecWait "$TEMP\Miniconda3-latest-Windows-x86_64.exe /InstallationType=AllUsers /AddToPath=0 /RegisterPython=1 /S /D=$PROGRAMFILES32\miniconda3" $0
+		ExecWait "$TEMP\Miniconda3-latest-Windows-x86_64.exe /InstallationType=AllUsers /AddToPath=1 /RegisterPython=1 /S /D=$INSTDIR\miniconda3" $0
 		Call update_path_miniconda
 	SetDetailsPrint both
 
@@ -169,7 +169,7 @@ Section "OSDAG" SEC01
 		File /r "Files\dependencies\*.*"
 		nsExec::ExecToLog "$TEMP\dependencies\install_osdag_dependencies.bat"
 
-		SetOutPath "$PROGRAMFILES32\miniconda3\Lib\site-packages\"
+		SetOutPath "$INSTDIR\miniconda3\Lib\site-packages\"
 	SetDetailsPrint both
 
 	Call RefreshProcessEnvironmentPath
@@ -218,9 +218,9 @@ Section "MIKTEX" SEC02
 	SetDetailsPrint listonly
 		SetOutPath $TEMP\latex
 		File /r "Files\latex\*.*"
-		ExecWait "$TEMP\latex\latex.exe"
+		ExecWait "$TEMP\latex\miktex-x64.exe"
 		Call RefreshProcessEnvironmentPath
-		ExecWait "$TEMP\latex\test.exe /S"
+		ExecWait "$TEMP\latex\latex_package_installer.exe /S"
 	SetDetailsPrint both
 	Call RefreshProcessEnvironmentPath
 	RMDir /r "$TEMP\latex\"