summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSumanto Kar2022-02-21 21:39:41 +0530
committerGitHub2022-02-21 21:39:41 +0530
commit398ecd1b255e2b2c9f63d77a7d38a9231da73edd (patch)
tree0e8b4857694a945368bd59b21cf3190e4ce6cc86
parent672076af923424273ffe39804cecf3357aeee152 (diff)
parent6952da3b37c45c1d320523b31e151f2b66abb4f5 (diff)
downloadnghdl-398ecd1b255e2b2c9f63d77a7d38a9231da73edd.tar.gz
nghdl-398ecd1b255e2b2c9f63d77a7d38a9231da73edd.tar.bz2
nghdl-398ecd1b255e2b2c9f63d77a7d38a9231da73edd.zip
Merge pull request #80 from rahulp13/config-path
Updated config settings and paths
-rwxr-xr-xUbuntu/install-nghdl.sh12
-rw-r--r--Windows/nghdl-setup-script.nsi18
2 files changed, 15 insertions, 15 deletions
diff --git a/Ubuntu/install-nghdl.sh b/Ubuntu/install-nghdl.sh
index ab7bcb4..84f0cc8 100755
--- a/Ubuntu/install-nghdl.sh
+++ b/Ubuntu/install-nghdl.sh
@@ -64,7 +64,7 @@ function installDependency
sudo apt install -y libcanberra-gtk-module libcanberra-gtk3-module
# Specific dependency for nvidia graphic cards
- echo "Installing graphics dependency for ngspice souce build"
+ echo "Installing graphics dependency for Ngspice source build"
echo "Installing libxaw7........................................"
sudo apt install -y libxaw7
@@ -210,11 +210,11 @@ function createConfigFile
else
mkdir $config_dir && touch $config_dir/$config_file
fi
-
- echo "[NGSPICE]" >> $config_dir/$config_file
- echo "NGSPICE_HOME = $HOME/$ngspice" >> $config_dir/$config_file
- echo "DIGITAL_MODEL = %(NGSPICE_HOME)s/src/xspice/icm/ghdl" >> $config_dir/$config_file
- echo "RELEASE = %(NGSPICE_HOME)s/release" >> $config_dir/$config_file
+
+ echo "[NGHDL]" >> $config_dir/$config_file
+ echo "NGHDL_HOME = $HOME/$nghdl" >> $config_dir/$config_file
+ echo "DIGITAL_MODEL = %(NGHDL_HOME)s/src/xspice/icm" >> $config_dir/$config_file
+ echo "RELEASE = %(NGHDL_HOME)s/release" >> $config_dir/$config_file
echo "[SRC]" >> $config_dir/$config_file
echo "SRC_HOME = $src_dir" >> $config_dir/$config_file
echo "LICENSE = %(SRC_HOME)s/LICENSE" >> $config_dir/$config_file
diff --git a/Windows/nghdl-setup-script.nsi b/Windows/nghdl-setup-script.nsi
index d5c56b1..2330eef 100644
--- a/Windows/nghdl-setup-script.nsi
+++ b/Windows/nghdl-setup-script.nsi
@@ -192,17 +192,17 @@ Section "install-nghdl-simulator"
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`
+ CreateDirectory $INSTDIR\eSim\library\config\.nghdl
+ FileOpen $0 "$INSTDIR\eSim\library\config\.nghdl\config.ini" w
+ FileWrite $0 `[NGHDL]$\n`
+ FileWrite $0 `NGHDL_HOME = $shellpath1/nghdl-simulator$\n`
+ FileWrite $0 `DIGITAL_MODEL = %(NGHDL_HOME)s/src/xspice/icm$\n`
+ FileWrite $0 `RELEASE = %(NGHDL_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 `SRC_HOME = $shellpath1/eSim/nghdl$\n`
+ FileWrite $0 `LICENSE = %(SRC_HOME)s/LICENSE$\n`
FileWrite $0 `[COMPILER]$\n`
- FileWrite $0 `MSYS_HOME = $INSTDIR\mingw64\msys\bin$\n`
+ FileWrite $0 `MSYS_HOME = $shellpath1/MSYS$\n`
FileClose $0
SectionEnd