From 803b4fbe5f84fb01551ad78128ab1e3d9018e8a9 Mon Sep 17 00:00:00 2001 From: dwarning Date: Tue, 4 Mar 2025 14:39:20 +0100 Subject: [PATCH] simplify batch files for release/debug installation --- visualc/make-install-vngspice.bat | 25 +- visualc/sharedspice.sln | 35 --- visualc/sharedspice.vcxproj | 452 +++--------------------------- visualc/vngspice.vcxproj | 24 +- 4 files changed, 66 insertions(+), 470 deletions(-) diff --git a/visualc/make-install-vngspice.bat b/visualc/make-install-vngspice.bat index 9e05ff920..d1b43394a 100644 --- a/visualc/make-install-vngspice.bat +++ b/visualc/make-install-vngspice.bat @@ -1,19 +1,26 @@ @echo off -REM copy ngspice.exe, codemodels *.cm to C:\Spice or Spice64 +REM copy ngspice.exe, codemodels *.cm to Spice64 REM arguments to make-install-vngspice: -REM %1: path to ngspice.exe, %2: fftw +REM %1: path to ngspice.exe, %2: release/debug %3: fftw, %4: omp -set dst=c:\Spice64 -set cmsrc=.\codemodels\x64\Release +if "%2" == "release" ( + set dst=c:\Spice64 + set cmsrc=.\codemodels\x64\Release +) +if "%2" == "debug" ( + set dst=c:\Spice64d + set cmsrc=.\codemodels\x64\Debug + copy .\spinitd64 .\spinit +) mkdir %dst%\bin mkdir %dst%\lib\ngspice -if "%2" == "omp" ( +if "%3" == "omp" ( copy "c:\Program Files\Microsoft Visual Studio\2022\Community\VC\Redist\MSVC\14.42.34433\debug_nonredist\x64\Microsoft.VC143.OpenMP.LLVM\libomp140.x86_64.dll" %dst%\bin\ ) -if "%3" == "omp" ( +if "%4" == "omp" ( copy "c:\Program Files\Microsoft Visual Studio\2022\Community\VC\Redist\MSVC\14.42.34433\debug_nonredist\x64\Microsoft.VC143.OpenMP.LLVM\libomp140.x86_64.dll" %dst%\bin\ ) copy %cmsrc%\analog64.cm %dst%\lib\ngspice\analog.cm @@ -25,19 +32,19 @@ copy %cmsrc%\spice2poly64.cm %dst%\lib\ngspice\spice2poly.cm copy xspice\verilog\ivlng.dll %dst%\lib\ngspice\ivlng.dll copy xspice\verilog\shim.vpi %dst%\lib\ngspice\ivlng.vpi -if "%2" == "fftw" goto copy2-64 +if "%3" == "fftw" goto copy-fftw copy %1\ngspice.exe %dst%\bin\ -copy .\spinitr64 .\spinit goto end -:copy2-64 +:copy-fftw copy %1\ngspice.exe %dst%\bin\ copy ..\..\fftw-3.3-dll64\libfftw3-3.dll %dst%\bin\ :end mkdir %dst%\share\ngspice\scripts\src\ngspice copy .\spinit_all %dst%\share\ngspice\scripts\spinit + cd ..\src copy ciderinit %dst%\share\ngspice\scripts copy devaxis %dst%\share\ngspice\scripts diff --git a/visualc/sharedspice.sln b/visualc/sharedspice.sln index 3969057dd..de2fe1c7e 100644 --- a/visualc/sharedspice.sln +++ b/visualc/sharedspice.sln @@ -13,57 +13,22 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 - Debug-fftw|x64 = Debug-fftw|x64 - Debug-fftw|x86 = Debug-fftw|x86 Release|x64 = Release|x64 - Release|x86 = Release|x86 ReleaseOMP|x64 = ReleaseOMP|x64 - ReleaseOMP|x86 = ReleaseOMP|x86 - ReleaseOMP-fftw|x64 = ReleaseOMP-fftw|x64 - ReleaseOMP-fftw|x86 = ReleaseOMP-fftw|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {83E315C7-EDD3-4F6B-AF28-87A92A4FA49A}.Debug|x64.ActiveCfg = Debug|x64 {83E315C7-EDD3-4F6B-AF28-87A92A4FA49A}.Debug|x64.Build.0 = Debug|x64 - {83E315C7-EDD3-4F6B-AF28-87A92A4FA49A}.Debug|x86.ActiveCfg = Debug|Win32 - {83E315C7-EDD3-4F6B-AF28-87A92A4FA49A}.Debug|x86.Build.0 = Debug|Win32 - {83E315C7-EDD3-4F6B-AF28-87A92A4FA49A}.Debug-fftw|x64.ActiveCfg = Debug-fftw|x64 - {83E315C7-EDD3-4F6B-AF28-87A92A4FA49A}.Debug-fftw|x64.Build.0 = Debug-fftw|x64 - {83E315C7-EDD3-4F6B-AF28-87A92A4FA49A}.Debug-fftw|x86.ActiveCfg = Debug-fftw|Win32 - {83E315C7-EDD3-4F6B-AF28-87A92A4FA49A}.Debug-fftw|x86.Build.0 = Debug-fftw|Win32 {83E315C7-EDD3-4F6B-AF28-87A92A4FA49A}.Release|x64.ActiveCfg = Release|x64 {83E315C7-EDD3-4F6B-AF28-87A92A4FA49A}.Release|x64.Build.0 = Release|x64 - {83E315C7-EDD3-4F6B-AF28-87A92A4FA49A}.Release|x86.ActiveCfg = Release|Win32 - {83E315C7-EDD3-4F6B-AF28-87A92A4FA49A}.Release|x86.Build.0 = Release|Win32 {83E315C7-EDD3-4F6B-AF28-87A92A4FA49A}.ReleaseOMP|x64.ActiveCfg = ReleaseOMP|x64 {83E315C7-EDD3-4F6B-AF28-87A92A4FA49A}.ReleaseOMP|x64.Build.0 = ReleaseOMP|x64 - {83E315C7-EDD3-4F6B-AF28-87A92A4FA49A}.ReleaseOMP|x86.ActiveCfg = ReleaseOMP|Win32 - {83E315C7-EDD3-4F6B-AF28-87A92A4FA49A}.ReleaseOMP|x86.Build.0 = ReleaseOMP|Win32 - {83E315C7-EDD3-4F6B-AF28-87A92A4FA49A}.ReleaseOMP-fftw|x64.ActiveCfg = ReleaseOMP-fftw|x64 - {83E315C7-EDD3-4F6B-AF28-87A92A4FA49A}.ReleaseOMP-fftw|x64.Build.0 = ReleaseOMP-fftw|x64 - {83E315C7-EDD3-4F6B-AF28-87A92A4FA49A}.ReleaseOMP-fftw|x86.ActiveCfg = ReleaseOMP-fftw|Win32 - {83E315C7-EDD3-4F6B-AF28-87A92A4FA49A}.ReleaseOMP-fftw|x86.Build.0 = ReleaseOMP-fftw|Win32 {B8DD41C5-70C6-4183-9018-C4B518E8D36A}.Debug|x64.ActiveCfg = Debug|x64 {B8DD41C5-70C6-4183-9018-C4B518E8D36A}.Debug|x64.Build.0 = Debug|x64 - {B8DD41C5-70C6-4183-9018-C4B518E8D36A}.Debug|x86.ActiveCfg = Debug|Win32 - {B8DD41C5-70C6-4183-9018-C4B518E8D36A}.Debug|x86.Build.0 = Debug|Win32 - {B8DD41C5-70C6-4183-9018-C4B518E8D36A}.Debug-fftw|x64.ActiveCfg = Debug-fftw|x64 - {B8DD41C5-70C6-4183-9018-C4B518E8D36A}.Debug-fftw|x64.Build.0 = Debug-fftw|x64 - {B8DD41C5-70C6-4183-9018-C4B518E8D36A}.Debug-fftw|x86.ActiveCfg = Debug-fftw|Win32 - {B8DD41C5-70C6-4183-9018-C4B518E8D36A}.Debug-fftw|x86.Build.0 = Debug-fftw|Win32 {B8DD41C5-70C6-4183-9018-C4B518E8D36A}.Release|x64.ActiveCfg = Release|x64 {B8DD41C5-70C6-4183-9018-C4B518E8D36A}.Release|x64.Build.0 = Release|x64 - {B8DD41C5-70C6-4183-9018-C4B518E8D36A}.Release|x86.ActiveCfg = Release|Win32 - {B8DD41C5-70C6-4183-9018-C4B518E8D36A}.Release|x86.Build.0 = Release|Win32 {B8DD41C5-70C6-4183-9018-C4B518E8D36A}.ReleaseOMP|x64.ActiveCfg = Release|x64 {B8DD41C5-70C6-4183-9018-C4B518E8D36A}.ReleaseOMP|x64.Build.0 = Release|x64 - {B8DD41C5-70C6-4183-9018-C4B518E8D36A}.ReleaseOMP|x86.ActiveCfg = Release|Win32 - {B8DD41C5-70C6-4183-9018-C4B518E8D36A}.ReleaseOMP|x86.Build.0 = Release|Win32 - {B8DD41C5-70C6-4183-9018-C4B518E8D36A}.ReleaseOMP-fftw|x64.ActiveCfg = ReleaseOMP-fftw|x64 - {B8DD41C5-70C6-4183-9018-C4B518E8D36A}.ReleaseOMP-fftw|x64.Build.0 = ReleaseOMP-fftw|x64 - {B8DD41C5-70C6-4183-9018-C4B518E8D36A}.ReleaseOMP-fftw|x86.ActiveCfg = ReleaseOMP-fftw|Win32 - {B8DD41C5-70C6-4183-9018-C4B518E8D36A}.ReleaseOMP-fftw|x86.Build.0 = ReleaseOMP-fftw|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/visualc/sharedspice.vcxproj b/visualc/sharedspice.vcxproj index c62fafd5e..19b09c676 100644 --- a/visualc/sharedspice.vcxproj +++ b/visualc/sharedspice.vcxproj @@ -1,30 +1,6 @@  - - Debug-fftw - Win32 - - - Debug-fftw - x64 - - - Debug - Win32 - - - ReleaseOMP-fftw - Win32 - - - ReleaseOMP-fftw - x64 - - - Release - Win32 - Debug x64 @@ -33,10 +9,6 @@ Release x64 - - ReleaseOMP - Win32 - ReleaseOMP x64 @@ -47,78 +19,32 @@ Win32Proj - - DynamicLibrary - v143 - - - DynamicLibrary - v143 - - - DynamicLibrary - v143 - DynamicLibrary v143 - - DynamicLibrary - v143 - DynamicLibrary v143 - - DynamicLibrary - v143 - - - DynamicLibrary - v143 - DynamicLibrary v143 - - DynamicLibrary - v143 - - - - - - - - - - - - - + - - - - - - + - - - + @@ -127,178 +53,22 @@ $(ProjectName)\$(Configuration).$(Platform)\ $(ProjectName)\$(Configuration).$(Platform)\obj\ - - - - - - - - - - - - - - - - - - - - - - - - force recompilation of conf.c with actual date - if exist $(IntDir)conf.obj del $(IntDir)conf.obj - - - - - - - Disabled - ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;..\src\spicelib\parser;src\include;..\src\include;..\src\include\cppduals;.;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;SHARED_MODULE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);NGDEBUG;%(PreprocessorDefinitions) - false - false - false - - EnableFastChecks - MultiThreadedDebug - false - - Level4 - ProgramDatabase - Default - true - stdcpp14 - - - psapi.lib;KLU_COMPLEX.lib;%(AdditionalDependencies) - true - false - Windows - 0 - 0 - 0 - 0 - - false - - MachineX86 - true - KLU/Debug/;%(AdditionalLibraryDirectories) - - - - - force recompilation of conf.c with actual date - if exist $(IntDir)conf.obj del $(IntDir)conf.obj - - - - - - - - - Disabled - ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;..\src\spicelib\parser;src\include;..\src\include;..\src\include\cppduals;.;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;SHARED_MODULE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);NGDEBUG;%(PreprocessorDefinitions) - false - false - false - - - EnableFastChecks - MultiThreadedDebug - false - - - Level4 - ProgramDatabase - Default - true - stdcpp14 - - - psapi.lib;KLU_COMPLEX.lib;%(AdditionalDependencies) - true - false - Windows - 0 - 0 - 0 - 0 - - - false - - - MachineX86 - true - KLU/Debug/;%(AdditionalLibraryDirectories) - - - - - force recompilation of conf.c with actual date - if exist $(IntDir)conf.obj del $(IntDir)conf.obj - - - - - - - Full - Speed - true - ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;..\src\spicelib\parser;src\include;..\src\include;..\src\include\cppduals;.;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;SHARED_MODULE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);%(PreprocessorDefinitions) - false - - MultiThreaded - false - - Level4 - ProgramDatabase - Default - true - stdcpp14 - - - psapi.lib;KLU_COMPLEX.lib;%(AdditionalDependencies) - true - Windows - 0 - 0 - 0 - 0 - true - true - UseLinkTimeCodeGeneration - false - - MachineX86 - true - KLU/Release/;%(AdditionalLibraryDirectories) - - force recompilation of conf.c with current date if exist $(IntDir)conf.obj del $(IntDir)conf.obj + + + lib /machine:x64 /def:..\..\fftw-3.3-dll64\libfftw3-3.def /out:$(IntDir)libfftw3-3.lib Disabled @@ -335,53 +105,23 @@ KLU\x64\Debug;%(AdditionalLibraryDirectories) - - - - force recompilation of conf.c with current date - if exist $(IntDir)conf.obj del $(IntDir)conf.obj -lib /machine:x64 /def:..\..\fftw-3.3-dll64\libfftw3-3.def /out:$(IntDir)libfftw3-3.lib - - - Disabled - ..\src\maths\poly;..\src\osdi;..\src\frontend;..\src\spicelib\devices;tmp-bison;..\src\spicelib\parser;src\include;..\src\include;..\src\include\cppduals;.;..\..\fftw-3.3-dll64;%(AdditionalIncludeDirectories) - HAVE_LIBFFTW3;_CRT_SECURE_NO_DEPRECATE;SIMULATOR;SHARED_MODULE;CONFIG64;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);NGDEBUG;%(PreprocessorDefinitions) - false - false - false - - - EnableFastChecks - MultiThreadedDebug - false - - - Level4 - ProgramDatabase - Default - true - stdcpp14 - /openmp:llvm %(AdditionalOptions) - - - psapi.lib;KLU_COMPLEX.lib;$(IntDir)libfftw3-3.lib;%(AdditionalDependencies) - true - false - Windows - 0 - 0 - 4194304 - 1048576 - false - - - KLU\x64\Debug;%(AdditionalLibraryDirectories) - + + + + make-install-sharedspice.bat $(OutDir) debug fftw + + + make-install-sharedspice.bat $(OutDir) debug + + force recompilation of conf.c with current date if exist $(IntDir)conf.obj del $(IntDir)conf.obj + + + lib /machine:x64 /def:..\..\fftw-3.3-dll64\libfftw3-3.def /out:$(IntDir)libfftw3-3.lib @@ -425,96 +165,23 @@ lib /machine:x64 /def:..\..\fftw-3.3-dll64\libfftw3-3.def /out:$(IntDir)libfftw3 - - - - force recompilation of conf.c with actual date - if exist $(IntDir)conf.obj del $(IntDir)conf.obj - - - Full - Speed - true - ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;..\src\spicelib\parser;src\include;..\src\include;..\src\include\cppduals;.;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;SHARED_MODULE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);USE_OMP;%(PreprocessorDefinitions) - false - - MultiThreaded - false - true - - Level4 - ProgramDatabase - Default - true - stdcpp14 - - - psapi.lib;KLU_COMPLEX.lib;%(AdditionalDependencies) - true - Windows - 0 - 0 - 0 - 0 - true - true - UseLinkTimeCodeGeneration - false - - MachineX86 - true - KLU/Release/;%(AdditionalLibraryDirectories) - - - - - force recompilation of conf.c with actual date - if exist $(IntDir)conf.obj del $(IntDir)conf.obj - - - Full - Speed - true - ..\src\maths\poly;..\src\frontend;..\src\spicelib\devices;tmp-bison;..\src\spicelib\parser;src\include;..\src\include;..\src\include\cppduals;.;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_DEPRECATE;SIMULATOR;XSPICE;SHARED_MODULE;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);USE_OMP;%(PreprocessorDefinitions) - false - - - MultiThreaded - false - true - - - Level4 - ProgramDatabase - Default - true - stdcpp14 - - - psapi.lib;KLU_COMPLEX.lib;%(AdditionalDependencies) - true - Windows - 0 - 0 - 0 - 0 - true - true - UseLinkTimeCodeGeneration - false - - - MachineX86 - true - KLU/Release/;%(AdditionalLibraryDirectories) - + + + + make-install-sharedspice.bat $(OutDir) release fftw + + + make-install-sharedspice.bat $(OutDir) release + + force recompilation of conf.c with current date if exist $(IntDir)conf.obj del $(IntDir)conf.obj + + + lib /machine:x64 /def:..\..\fftw-3.3-dll64\libfftw3-3.def /out:$(IntDir)libfftw3-3.lib @@ -561,58 +228,15 @@ lib /machine:x64 /def:..\..\fftw-3.3-dll64\libfftw3-3.def /out:$(IntDir)libfftw3 true KLU\x64\Release;%(AdditionalLibraryDirectories) - - - - force recompilation of conf.c with current date - if exist $(IntDir)conf.obj del $(IntDir)conf.obj -lib /machine:x64 /def:..\..\fftw-3.3-dll64\libfftw3-3.def /out:$(IntDir)libfftw3-3.lib - - - - - + + + + make-install-sharedspice.bat $(OutDir) release fftw omp - - - Full - Speed - true - ..\src\maths\poly;..\src\osdi;..\src\frontend;..\src\spicelib\devices;tmp-bison;..\src\spicelib\parser;src\include;..\src\include;..\src\include\cppduals;.;..\..\fftw-3.3-dll64;%(AdditionalIncludeDirectories) - HAVE_LIBFFTW3;_CRT_SECURE_NO_DEPRECATE;SIMULATOR;SHARED_MODULE;CONFIG64;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);USE_OMP;%(PreprocessorDefinitions) - false - - - MultiThreaded - false - - - - - Level4 - ProgramDatabase - Default - true - stdcpp14 - /openmp:llvm %(AdditionalOptions) - - - psapi.lib;KLU_COMPLEX.lib;$(IntDir)libfftw3-3.lib;%(AdditionalDependencies) - true - Windows - 0 - 0 - 4194304 - 1048576 - true - true - UseLinkTimeCodeGeneration - false - - - true - KLU\x64\Release;%(AdditionalLibraryDirectories) - + + make-install-sharedspice.bat $(OutDir) release omp + + diff --git a/visualc/vngspice.vcxproj b/visualc/vngspice.vcxproj index 9b95ffeff..a4a6c71fb 100644 --- a/visualc/vngspice.vcxproj +++ b/visualc/vngspice.vcxproj @@ -168,10 +168,10 @@ - make-install-vngspiced.bat $(OutDir) fftw + make-install-vngspice.bat $(OutDir) debug fftw - make-install-vngspiced.bat $(OutDir) + make-install-vngspice.bat $(OutDir) debug @@ -234,10 +234,10 @@ - make-install-vngspice.bat $(OutDir) fftw + make-install-vngspice.bat $(OutDir) release fftw - make-install-vngspice.bat $(OutDir) + make-install-vngspice.bat $(OutDir) release @@ -292,10 +292,10 @@ - make-install-vngspiced.bat $(OutDir) fftw + make-install-vngspice.bat $(OutDir) debug fftw - make-install-vngspiced.bat $(OutDir) + make-install-vngspice.bat $(OutDir) debug @@ -356,10 +356,10 @@ - make-install-vngspice.bat $(OutDir) fftw + make-install-vngspice.bat $(OutDir) release fftw - make-install-vngspice.bat $(OutDir) + make-install-vngspice.bat $(OutDir) release @@ -424,10 +424,10 @@ - make-install-vngspice.bat $(OutDir) fftw omp + make-install-vngspice.bat $(OutDir) release fftw omp - make-install-vngspice.bat $(OutDir) omp + make-install-vngspice.bat $(OutDir) release omp @@ -490,10 +490,10 @@ - make-install-vngspice.bat $(OutDir) fftw omp + make-install-vngspice.bat $(OutDir) release fftw omp - make-install-vngspice.bat $(OutDir) omp + make-install-vngspice.bat $(OutDir) release omp