From b07fa2a8d14f8892aa096987c448d63d732fd8fc Mon Sep 17 00:00:00 2001 From: Nanda gopal vs <65445810+Nandagopalvs25@users.noreply.github.com> Date: Thu, 11 Jul 2024 11:25:39 +0530 Subject: [PATCH 1/8] Update README.txt --- README.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.txt b/README.txt index 3d8e7d1..a58f90c 100644 --- a/README.txt +++ b/README.txt @@ -1,6 +1,7 @@ -Windows Installer: -================== +# 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: From a92bb2fee56efb740e67502e47145aa29d67de84 Mon Sep 17 00:00:00 2001 From: Nanda gopal vs <65445810+Nandagopalvs25@users.noreply.github.com> Date: Thu, 11 Jul 2024 11:26:59 +0530 Subject: [PATCH 2/8] Update README.txt --- README.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.txt b/README.txt index a58f90c..109c376 100644 --- a/README.txt +++ b/README.txt @@ -1,7 +1,7 @@ # 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') +The installer is made using [NSIS](https://nsis.sourceforge.io/Main_Page) System Requirements: From 2bf8217a8f5fe825a09b7a1e0cf6dcb6604c444f Mon Sep 17 00:00:00 2001 From: Nanda gopal vs <65445810+Nandagopalvs25@users.noreply.github.com> Date: Thu, 11 Jul 2024 11:29:38 +0530 Subject: [PATCH 3/8] Update README.txt --- README.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.txt b/README.txt index 109c376..ab54745 100644 --- a/README.txt +++ b/README.txt @@ -5,7 +5,7 @@ The installer is made using [NSIS](https://nsis.sourceforge.io/Main_Page) System Requirements: -==================== + a) Supported Windows Operating Systems: Windows Vista @@ -23,14 +23,14 @@ c) RAM and Storage Space: 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: -=================== + # If you have already installed the previous version of Osdag in your system then Unistall it first and just run the new downloaded Osdag_windows_setup.exe. @@ -56,7 +56,7 @@ Installation steps: Running Osdag: -============== + After the installation is complete, you may run Osdag by one of the following methods: i) Double-clicking on the Desktop shortcut or From 588c406a9da9b3cb1c542838edb7b32752310357 Mon Sep 17 00:00:00 2001 From: Nanda gopal vs <65445810+Nandagopalvs25@users.noreply.github.com> Date: Thu, 11 Jul 2024 11:30:17 +0530 Subject: [PATCH 4/8] Rename README.txt to README.md --- README.txt => README.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename README.txt => README.md (100%) diff --git a/README.txt b/README.md similarity index 100% rename from README.txt rename to README.md From ba5cbaf43b4b3de10cdf25f9341d67ed20849759 Mon Sep 17 00:00:00 2001 From: Nanda gopal vs <65445810+Nandagopalvs25@users.noreply.github.com> Date: Thu, 11 Jul 2024 11:47:04 +0530 Subject: [PATCH 5/8] Update README.md --- README.md | 46 ++++++++++++++++++++++------------------------ 1 file changed, 22 insertions(+), 24 deletions(-) diff --git a/README.md b/README.md index ab54745..b23316c 100644 --- a/README.md +++ b/README.md @@ -4,35 +4,33 @@ This installer installs Osdag (along with Miniconda, MiKTeX and other dependecie The installer is made using [NSIS](https://nsis.sourceforge.io/Main_Page) -System Requirements: - - -a) Supported Windows Operating Systems: - Windows Vista - Windows 7 - Windows 8 - Windows 8.1 - Windows 10 - -b) Supported Architecture(s): - 64-bit - -c) RAM and Storage Space: - Minimum RAM: 2GB - Minimum (recommended) Storage Space: 4GB +# 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 -Uninstalling Earlier Version of Osdag: +# 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: - +# Installation steps: -# If you have already installed the previous version of Osdag in your system then Unistall it first and just run the new downloaded Osdag_windows_setup.exe. Run Osdag_windows_setup.exe @@ -55,10 +53,10 @@ Installation steps: Osdag will be successfully installed! -Running Osdag: +# Running Osdag: After the installation is complete, you may run Osdag by one of the following methods: - i) Double-clicking on the Desktop shortcut or - ii) Press the Windows key and search Osdag - iii) Navigating to the installation-directory and double-clicking on the Osdag shortcut +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 From 627709fd78a8c8e28d73daee48451592becff9d2 Mon Sep 17 00:00:00 2001 From: Nandagopalvs25 Date: Mon, 15 Jul 2024 10:57:08 +0530 Subject: [PATCH 6/8] Fixes --- Files/dependencies/install_osdag_dependencies.bat | 8 +++++--- header files/EnvVarUpdate.nsh | 14 +++++++------- osdag.nsi | 14 +++++++------- 3 files changed, 19 insertions(+), 17 deletions(-) diff --git a/Files/dependencies/install_osdag_dependencies.bat b/Files/dependencies/install_osdag_dependencies.bat index da71880..68f034e 100644 --- a/Files/dependencies/install_osdag_dependencies.bat +++ b/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 diff --git a/header files/EnvVarUpdate.nsh b/header files/EnvVarUpdate.nsh index 3968200..b7b5c19 100644 --- a/header files/EnvVarUpdate.nsh +++ b/header files/EnvVarUpdate.nsh @@ -25,8 +25,8 @@ * http://nsis.sourceforge.net/Environmental_Variables:_append%2C_prepend%2C_and_remove_entries * */ - - + + !ifndef ENVVARUPDATE_FUNCTION !define ENVVARUPDATE_FUNCTION !verbose push @@ -34,7 +34,7 @@ !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 \ No newline at end of file diff --git a/osdag.nsi b/osdag.nsi index c5ad3ea..83ad129 100644 --- a/osdag.nsi +++ b/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\" From 9780fc5ea1f6235c4cc8baa8e3f8bf7cc1d3663e Mon Sep 17 00:00:00 2001 From: Nanda gopal vs <65445810+Nandagopalvs25@users.noreply.github.com> Date: Mon, 15 Jul 2024 11:18:40 +0530 Subject: [PATCH 7/8] Update README.md --- README.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/README.md b/README.md index b23316c..9419e79 100644 --- a/README.md +++ b/README.md @@ -60,3 +60,18 @@ After the installation is complete, you may run Osdag by one of the following me 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. From ad1b6ed49a1d105eeb33a0db898302393f317f8a Mon Sep 17 00:00:00 2001 From: Nanda gopal vs <65445810+Nandagopalvs25@users.noreply.github.com> Date: Sat, 5 Oct 2024 17:03:54 +0530 Subject: [PATCH 8/8] Update README.md --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 9419e79..f691b90 100644 --- a/README.md +++ b/README.md @@ -20,6 +20,10 @@ The installer is made using [NSIS](https://nsis.sourceforge.io/Main_Page) 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: