From 27dd0446334de2cd4d7cedde4db02ec9c289e65c Mon Sep 17 00:00:00 2001 From: Bladen Martin Date: Thu, 16 Jul 2020 22:48:15 +0530 Subject: Create Windows --- Windows | 1 + 1 file changed, 1 insertion(+) create mode 100644 Windows (limited to 'Windows') diff --git a/Windows b/Windows new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/Windows @@ -0,0 +1 @@ + -- cgit From d23b921cc098e1ebe625d5a7da146529a5bd6c4d Mon Sep 17 00:00:00 2001 From: Bladen Martin Date: Thu, 16 Jul 2020 22:48:34 +0530 Subject: Delete Windows --- Windows | 1 - 1 file changed, 1 deletion(-) delete mode 100644 Windows (limited to 'Windows') diff --git a/Windows b/Windows deleted file mode 100644 index 8b13789..0000000 --- a/Windows +++ /dev/null @@ -1 +0,0 @@ - -- cgit From 060b27b4427c604861d66da8fb565c1aff0585c7 Mon Sep 17 00:00:00 2001 From: Bladen Martin Date: Thu, 16 Jul 2020 22:54:37 +0530 Subject: include in esim-setup-script.nsi --- Windows/installnghdl.nsi | 190 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 190 insertions(+) create mode 100644 Windows/installnghdl.nsi (limited to 'Windows') diff --git a/Windows/installnghdl.nsi b/Windows/installnghdl.nsi new file mode 100644 index 0000000..0ab7da4 --- /dev/null +++ b/Windows/installnghdl.nsi @@ -0,0 +1,190 @@ +!include "CPUFeatures.nsh" +!include "zipdll.nsh" + +;----------------------------------------------------------------------------------------- +; String replacement function +!define StrRep "!insertmacro StrRep" +!macro StrRep output string old new + Push `${string}` + Push `${old}` + Push `${new}` + !ifdef __UNINSTALL__ + Call un.StrRep + !else + Call StrRep + !endif + Pop ${output} +!macroend + +!macro Func_StrRep un + Function ${un}StrRep + Exch $R2 ;new + Exch 1 + Exch $R1 ;old + Exch 2 + Exch $R0 ;string + Push $R3 + Push $R4 + Push $R5 + Push $R6 + Push $R7 + Push $R8 + Push $R9 + + StrCpy $R3 0 + StrLen $R4 $R1 + StrLen $R6 $R0 + StrLen $R9 $R2 + loop: + StrCpy $R5 $R0 $R4 $R3 + StrCmp $R5 $R1 found + StrCmp $R3 $R6 done + IntOp $R3 $R3 + 1 ;move offset by 1 to check the next character + Goto loop + found: + StrCpy $R5 $R0 $R3 + IntOp $R8 $R3 + $R4 + StrCpy $R7 $R0 "" $R8 + StrCpy $R0 $R5$R2$R7 + StrLen $R6 $R0 + IntOp $R3 $R3 + $R9 ;move offset by length of the replacement string + Goto loop + done: + + Pop $R9 + Pop $R8 + Pop $R7 + Pop $R6 + Pop $R5 + Pop $R4 + Pop $R3 + Push $R0 + Push $R1 + Pop $R0 + Pop $R1 + Pop $R0 + Pop $R2 + Exch $R1 + FunctionEnd +!macroend +!insertmacro Func_StrRep "" +!insertmacro Func_StrRep "un." +;----------------------------------------------------------------------------------------- + +;----------------------------------------------------------------------------------------- +; NGHDL installation macro +Section "nghdl-loadsource" + SetOutPath $EXEDIR + + File "ghdl.zip" + File "mingw.7z" + File "MSYS.zip" + File "nghdl-src.zip" + File "ngspice-nghdl.zip" +SectionEnd + +Section "nghdl-src" + SetOutPath $INSTDIR + ZipDLL::extractall "$EXEDIR\nghdl-src.zip" "$INSTDIR\" + EnVar::SetHKLM + DetailPrint "EnVar::SetHKLM" + EnVar::AddValue "Path" "$INSTDIR\eSim\nghdl\src" + Pop $0 + DetailPrint "EnVar::AddValue returned=|$0|" + Delete "$EXEDIR\nghdl-src.zip" +SectionEnd + +Section "nghdl-mingw" + SetOutPath $INSTDIR + Nsis7z::ExtractWithDetails "$EXEDIR\mingw.7z" "Extracting MinGW %s..." + EnVar::SetHKLM + EnVar::AddValue "Path" "$INSTDIR\mingw64\bin" + Pop $0 + DetailPrint "EnVar::AddValue returned=|$0|" + Delete "$EXEDIR\mingw.7z" +SectionEnd + +Section "nghdl-msys" + SetOutPath $INSTDIR\mingw64 + ZipDLL::extractall "$EXEDIR\MSYS.zip" "$INSTDIR\mingw64\" + EnVar::SetHKLM + EnVar::AddValue "Path" "$INSTDIR\mingw64\msys\bin" + Pop $0 + DetailPrint "EnVar::AddValue returned=|$0|" + Delete "$EXEDIR\MSYS.zip" +SectionEnd + +Section "nghdl-GHDL" + SetOutPath $INSTDIR\mingw64 + ZipDLL::extractall "$EXEDIR\ghdl.zip" "$INSTDIR\mingw64\" + EnVar::SetHKLM + EnVar::AddValue "Path" "$INSTDIR\mingw64\GHDL\bin" + Pop $0 + DetailPrint "EnVar::AddValue returned=|$0|" + Delete "$EXEDIR\ghdl.zip" +SectionEnd + +Section "envar-refresh" + ReadEnvStr $R0 "PATH" + StrCpy $R0 "$R0;$INSTDIR\eSim\nghdl\src;$INSTDIR\mingw64\bin;$INSTDIR\mingw64\msys\bin;$INSTDIR\mingw64\GHDL\bin;" + System::Call 'Kernel32::SetEnvironmentVariable(t, t) i("PATH", R0).r0' +SectionEnd + + +Section "nghdl-installNgspice" + SetOutPath $INSTDIR + ZipDLL::extractall "$EXEDIR\ngspice-nghdl.zip" "$INSTDIR\" + + CopyFiles $INSTDIR\eSim\nghdl\src\outitf.c $INSTDIR\ngspice-nghdl\src\frontend + + CopyFiles $INSTDIR\mingw64\x86_64-w64-mingw32\lib\libws2_32.a $INSTDIR\eSim\nghdl\src\ghdlserver + + SetOutPath $INSTDIR\ngspice-nghdl + CreateDirectory $INSTDIR\ngspice-nghdl\release + SetOutPath $INSTDIR\ngspice-nghdl\release + + Var /GLOBAL shellpath + Var /GLOBAL shellpath1 + Var /GLOBAL cpucores + + ${CPUFeatures.GetCount} $cpucores + + StrCpy $shellpath $INSTDIR + + ${StrRep} '$shellpath1' '$shellpath' '\' '/' + + FileOpen $0 "$INSTDIR\ngspice-nghdl\release\installngspice.sh" w + FileWrite $0 `../configure --with-wingui --enable-xspice --disable-debug --prefix=$shellpath1/ngspice-nghdl/install_dir --exec-prefix=$shellpath1/ngspice-nghdl/install_dir &&$\n` + FileWrite $0 `make -j$cpucores &&$\n` + FileWrite $0 `make install$\n` + FileClose $0 + + nsExec::ExecToLog "$INSTDIR\mingw64\msys\bin\bash.exe installngspice.sh" + Delete "$EXEDIR\ngspice-nghdl.zip" + Delete $INSTDIR\ngspice-nghdl\release\installngspice.sh + + SetOutPath $INSTDIR + + EnVar::SetHKLM + EnVar::AddValue "Path" "$INSTDIR\ngspice-nghdl\install_dir\bin" + Pop $0 + DetailPrint "EnVar::AddValue returned=|$0|" + +SectionEnd + +Section "nghdl-config.ini" + CreateDirectory $PROFILE\.nghdl + FileOpen $0 "$PROFILE\.nghdl\config.ini" w + FileWrite $0 `[NGSPICE]$\n` + FileWrite $0 `NGSPICE_HOME = $INSTDIR\ngspice-nghdl$\n` + FileWrite $0 `DIGITAL_MODEL = %(NGSPICE_HOME)s\src\xspice\icm\ghdl$\n` + FileWrite $0 `RELEASE = %(NGSPICE_HOME)s\release$\n` + FileWrite $0 `[SRC]$\n` + FileWrite $0 `SRC_HOME = $INSTDIR\eSim\nghdl$\n` + FileWrite $0 `LICENSE = %(SRC_HOME)s\LICENSE$\n` + FileWrite $0 `[COMPILER]$\n` + FileWrite $0 `MSYS_HOME = $INSTDIR\mingw64\msys\bin$\n` + FileClose $0 +SectionEnd + +;------------------------------------------------------------------------------------- -- cgit From 27776b92439b26de41df324b4f2cabb73913e661 Mon Sep 17 00:00:00 2001 From: Bladen Martin Date: Thu, 16 Jul 2020 22:55:25 +0530 Subject: create nghdl.exe and packaging nghdl --- Windows/readme.md | 102 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 102 insertions(+) create mode 100644 Windows/readme.md (limited to 'Windows') diff --git a/Windows/readme.md b/Windows/readme.md new file mode 100644 index 0000000..10c73f2 --- /dev/null +++ b/Windows/readme.md @@ -0,0 +1,102 @@ +NGHDL Installer (Windows OS) +==== + + +It contains all the documenation for making NGHDL executable (using PyInstaller) and packging for eSim Installation Script on Windows 7 and above. + + +## NGHDL Executable: + +1. Download and install "Python-3.7.7", "Git For Windows". Use "Git Bash" for all following shell commands. + + Reference - https://gitforwindows.org/ + +2. Add alias to python.exe in Git shell: + + $ alias python='winpty python.exe' #Need to be done for each new shell created + +3. Download `virtualenv` package as: + + $ pip install virtualenv + +4. Create a virtual environment as: + + $ python -m virtualenv nghdl + +5. Activate the virtual environment as: + + $ source nghdl/Scripts/activate + +6. Install all Python dependencies for NGHDL within the virtual environment as: + + - Install PyInstaller, tornado, SetupTools through pip : + + $ pip install pyinstaller + $ pip install tornado + $ pip install --upgrade 'setuptools<45.0.0' + + - Install PyQt4 through pip (Reference - https://stackoverflow.com/questions/22640640/how-to-install-pyqt4-on-windows-using-pip) : + + $ pip install --upgrade 'sip<5.0.0' + $ pip install + + Download PyQt4 Wheel from - [https://www.lfd.uci.edu/~gohlke/pythonlibs/#pyqt4] + Where cp37 represents the Python version i.e. 3.7.7 + + > Note : + - If there are any issues regarding loading of DLL files, refer : https://stackoverflow.com/questions/2738879/cannot-import-pyqt4-qtgui + - If above step works, then goto step 7. + +7. Test whether only eSim dependencies are available or not: + + $ pip freeze + +> Note : Following dependencies should be available - +> - PyQt4 +> - numpy +> - dateutil +> - pyparsing +> - six +> - cycler.py + + +8. Create spec file as: + + $ pyi-makespec --onefile -n eSim /src/ngspice_ghdl.py + +9. Create onefile executable using pyinstaller as: + + $ pyinstaller -F --clean nghdl.spec + +10. Verify whether all eSim `src` files (`*.py`) have been included in `Analysis-00.toc` file under the build folder generated by PyInstaller. +11. nghdl.exe is generated at the dist folder. + + + +## How to package NGHDL? + +1. Place the nghdl.exe generated from the above process at the location /nghdl/src/ + +2. Delete all python files (files ending in .py) at /nghdl/src/ + +3. Remove the following files at /nghdl/ + - .gitignore + - GHDLside.md + - Readme.md + - Workflow.md + +4. Place nghdl folder containing `src folder`, `Examples folder`&`LICENSE`under folder named eSim/ + +5. Compress `eSim` folder in zip format (Make sure that there is folder named `eSim` inside this compressed file) and name it as `nghdl-src.zip`. + +6. Place the following zip files at the installer folder for eSim. +(these can be obtained under *sources/* folder in the repository ) +- nghdl-src.zip +- ghdl.zip +- MSYS.zip +- ngspice-nghdl.zip +- mingw.7z + +7. Place the script `installnghdl.nsi` at the eSim installer location. + +8. Follow the rest of the instructions for packging eSim [https://github.com/FOSSEE/eSim/tree/installers/Windows] and compile the NSI script (`esim-setup-script` file). Now only use the generated installer for distribution. \ No newline at end of file -- cgit From 4c8c9e1448b138c8636a04e31374a385b8960657 Mon Sep 17 00:00:00 2001 From: Bladen Martin Date: Thu, 16 Jul 2020 22:58:10 +0530 Subject: Update readme.md --- Windows/readme.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Windows') diff --git a/Windows/readme.md b/Windows/readme.md index 10c73f2..7da8684 100644 --- a/Windows/readme.md +++ b/Windows/readme.md @@ -47,7 +47,7 @@ It contains all the documenation for making NGHDL executable (using PyInstaller) - If there are any issues regarding loading of DLL files, refer : https://stackoverflow.com/questions/2738879/cannot-import-pyqt4-qtgui - If above step works, then goto step 7. -7. Test whether only eSim dependencies are available or not: +7. Test whether only NGHDL dependencies are available or not: $ pip freeze @@ -62,13 +62,13 @@ It contains all the documenation for making NGHDL executable (using PyInstaller) 8. Create spec file as: - $ pyi-makespec --onefile -n eSim /src/ngspice_ghdl.py + $ pyi-makespec --onefile -n nghdl /src/ngspice_ghdl.py 9. Create onefile executable using pyinstaller as: $ pyinstaller -F --clean nghdl.spec -10. Verify whether all eSim `src` files (`*.py`) have been included in `Analysis-00.toc` file under the build folder generated by PyInstaller. +10. Verify whether all NGHDL `src` files (`*.py`) have been included in `Analysis-00.toc` file under the build folder generated by PyInstaller. 11. nghdl.exe is generated at the dist folder. @@ -99,4 +99,4 @@ It contains all the documenation for making NGHDL executable (using PyInstaller) 7. Place the script `installnghdl.nsi` at the eSim installer location. -8. Follow the rest of the instructions for packging eSim [https://github.com/FOSSEE/eSim/tree/installers/Windows] and compile the NSI script (`esim-setup-script` file). Now only use the generated installer for distribution. \ No newline at end of file +8. Follow the rest of the instructions for packging eSim [https://github.com/FOSSEE/eSim/tree/installers/Windows] and compile the NSI script (`esim-setup-script` file). Now only use the generated installer for distribution. -- cgit From 4ec3aa8dbd9ecf17af8e8dcad0a76fb57525d642 Mon Sep 17 00:00:00 2001 From: Bladen Martin Date: Thu, 16 Jul 2020 23:00:44 +0530 Subject: Plugins required by NSIS for NGHDL --- Windows/NSISplugins/CPUFeatures.2013-02-26.zip | Bin 0 -> 92286 bytes Windows/NSISplugins/EnVar_plugin.zip | Bin 0 -> 33630 bytes Windows/NSISplugins/Nsis7z_19.00.7z | Bin 0 -> 461078 bytes Windows/NSISplugins/ZipDLL (1).zip | Bin 0 -> 379356 bytes 4 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 Windows/NSISplugins/CPUFeatures.2013-02-26.zip create mode 100644 Windows/NSISplugins/EnVar_plugin.zip create mode 100644 Windows/NSISplugins/Nsis7z_19.00.7z create mode 100644 Windows/NSISplugins/ZipDLL (1).zip (limited to 'Windows') diff --git a/Windows/NSISplugins/CPUFeatures.2013-02-26.zip b/Windows/NSISplugins/CPUFeatures.2013-02-26.zip new file mode 100644 index 0000000..2f701d8 Binary files /dev/null and b/Windows/NSISplugins/CPUFeatures.2013-02-26.zip differ diff --git a/Windows/NSISplugins/EnVar_plugin.zip b/Windows/NSISplugins/EnVar_plugin.zip new file mode 100644 index 0000000..cdee545 Binary files /dev/null and b/Windows/NSISplugins/EnVar_plugin.zip differ diff --git a/Windows/NSISplugins/Nsis7z_19.00.7z b/Windows/NSISplugins/Nsis7z_19.00.7z new file mode 100644 index 0000000..78d88ab Binary files /dev/null and b/Windows/NSISplugins/Nsis7z_19.00.7z differ diff --git a/Windows/NSISplugins/ZipDLL (1).zip b/Windows/NSISplugins/ZipDLL (1).zip new file mode 100644 index 0000000..f5c4fc0 Binary files /dev/null and b/Windows/NSISplugins/ZipDLL (1).zip differ -- cgit From 1f4985d7e4cd56ebbd342fc62b89837f57b9eadd Mon Sep 17 00:00:00 2001 From: Bladen Martin Date: Thu, 16 Jul 2020 23:10:18 +0530 Subject: GHDL source --- Windows/sources/ghdl.zip | Bin 0 -> 21331447 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Windows/sources/ghdl.zip (limited to 'Windows') diff --git a/Windows/sources/ghdl.zip b/Windows/sources/ghdl.zip new file mode 100644 index 0000000..197414d Binary files /dev/null and b/Windows/sources/ghdl.zip differ -- cgit From d200df270aab304c732adaa7699f8a3a190c5b58 Mon Sep 17 00:00:00 2001 From: Bladen Martin Date: Thu, 16 Jul 2020 23:36:07 +0530 Subject: Add existing file --- Windows/sources/MSYS.zip | Bin 0 -> 52163263 bytes Windows/sources/mingw.7z | Bin 0 -> 49370037 bytes Windows/sources/nghdl-src.zip | Bin 0 -> 15494597 bytes Windows/sources/ngspice-nghdl.zip | Bin 0 -> 9349804 bytes 4 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 Windows/sources/MSYS.zip create mode 100644 Windows/sources/mingw.7z create mode 100644 Windows/sources/nghdl-src.zip create mode 100644 Windows/sources/ngspice-nghdl.zip (limited to 'Windows') diff --git a/Windows/sources/MSYS.zip b/Windows/sources/MSYS.zip new file mode 100644 index 0000000..84ccd49 Binary files /dev/null and b/Windows/sources/MSYS.zip differ diff --git a/Windows/sources/mingw.7z b/Windows/sources/mingw.7z new file mode 100644 index 0000000..9c1eb68 Binary files /dev/null and b/Windows/sources/mingw.7z differ diff --git a/Windows/sources/nghdl-src.zip b/Windows/sources/nghdl-src.zip new file mode 100644 index 0000000..2535bf4 Binary files /dev/null and b/Windows/sources/nghdl-src.zip differ diff --git a/Windows/sources/ngspice-nghdl.zip b/Windows/sources/ngspice-nghdl.zip new file mode 100644 index 0000000..d35f0d2 Binary files /dev/null and b/Windows/sources/ngspice-nghdl.zip differ -- cgit