[ngspice] Update to release 35 (microsoft#19542)

Co-authored-by: JonLiu1993 <[email protected]> Co-authored-by: JonLiu1993 <[email protected]>
Kretikus · Aug 31, 2021 · 78b7f1b · 78b7f1b
1 parent 0997386
commit 78b7f1b
Show file tree

Hide file tree

Showing 7 changed files with 389 additions and 17 deletions.
diff --git a/ports/ngspice/CONTROL b/ports/ngspice/CONTROL
diff --git a/ports/ngspice/portfile.cmake b/ports/ngspice/portfile.cmake
@@ -8,12 +8,15 @@ set(VCPKG_CRT_LINKAGE static)
 vcpkg_from_sourceforge(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO ngspice/ng-spice-rework
-    REF 34
-    FILENAME "ngspice-34.tar.gz"
-    SHA512 5e90727f3f6b8675b83f71e1961d33cd498081a7f3bea5d081521f12ecb3979775159f083f84a5856233529505262c399f75d305758af51894a1245603476cf8
+    REF 35
+    FILENAME "ngspice-35.tar.gz"
+    SHA512 2f9b0f951e3ca8d52692beadb895b352311f67b8760f99d0e2f4718fce4b497dd68e2b933029eeacb4ed57551e959bc6e3747e64feb4722a4f841e734f5a664b
     PATCHES
         use-winbison-sharedspice.patch
         use-winbison-vngspice.patch
+        remove-post-build.patch
+        remove-64-in-codemodel-name.patch
+
 )
 
 vcpkg_find_acquire_program(BISON)
@@ -49,8 +52,6 @@ if("codemodels" IN_LIST FEATURES)
 
     vcpkg_build_msbuild(
         PROJECT_PATH ${BUILDTREE_PATH}/visualc/vngspice.sln
-        INCLUDES_SUBPATH /src/include
-        LICENSE_SUBPATH COPYING
         # build_msbuild swaps x86 for win32(bad) if we dont force our own setting
         PLATFORM ${TRIPLET_SYSTEM_ARCH}
         TARGET Build

diff --git a/ports/ngspice/remove-64-in-codemodel-name.patch b/ports/ngspice/remove-64-in-codemodel-name.patch
@@ -0,0 +1,131 @@
+From dc6b6c0aa4205047e9fd052c401f3f357d83ef57 Mon Sep 17 00:00:00 2001
+From: Marek Roszko <[email protected]>
+Date: Thu, 12 Aug 2021 22:26:43 -0400
+Subject: [PATCH] Remove 64 in filename output of codemodels
+
+---
+ visualc/xspice/analog.vcxproj     | 4 ++--
+ visualc/xspice/digital.vcxproj    | 4 ++--
+ visualc/xspice/spice2poly.vcxproj | 4 ++--
+ visualc/xspice/table.vcxproj      | 4 ++--
+ visualc/xspice/xtradev.vcxproj    | 4 ++--
+ visualc/xspice/xtraevt.vcxproj    | 4 ++--
+ 6 files changed, 12 insertions(+), 12 deletions(-)
+
+diff --git a/visualc/xspice/analog.vcxproj b/visualc/xspice/analog.vcxproj
+index cf65a37..8b320ce 100644
+--- a/visualc/xspice/analog.vcxproj
++++ b/visualc/xspice/analog.vcxproj
+@@ -77,12 +77,12 @@
+     <GenerateManifest>false</GenerateManifest>
+   </PropertyGroup>
+   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+-    <TargetName>$(ProjectName)64</TargetName>
++    <TargetName>$(ProjectName)</TargetName>
+     <GenerateManifest>true</GenerateManifest>
+     <LinkIncremental>false</LinkIncremental>
+   </PropertyGroup>
+   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+-    <TargetName>$(ProjectName)64</TargetName>
++    <TargetName>$(ProjectName)</TargetName>
+     <GenerateManifest>false</GenerateManifest>
+   </PropertyGroup>
+   <ItemDefinitionGroup>
+diff --git a/visualc/xspice/digital.vcxproj b/visualc/xspice/digital.vcxproj
+index 87f4802..7722ce6 100644
+--- a/visualc/xspice/digital.vcxproj
++++ b/visualc/xspice/digital.vcxproj
+@@ -77,12 +77,12 @@
+     <GenerateManifest>false</GenerateManifest>
+   </PropertyGroup>
+   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+-    <TargetName>$(ProjectName)64</TargetName>
++    <TargetName>$(ProjectName)</TargetName>
+     <GenerateManifest>true</GenerateManifest>
+     <LinkIncremental>false</LinkIncremental>
+   </PropertyGroup>
+   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+-    <TargetName>$(ProjectName)64</TargetName>
++    <TargetName>$(ProjectName)</TargetName>
+     <GenerateManifest>false</GenerateManifest>
+   </PropertyGroup>
+   <ItemDefinitionGroup>
+diff --git a/visualc/xspice/spice2poly.vcxproj b/visualc/xspice/spice2poly.vcxproj
+index c92471b..786ff7e 100644
+--- a/visualc/xspice/spice2poly.vcxproj
++++ b/visualc/xspice/spice2poly.vcxproj
+@@ -77,12 +77,12 @@
+     <GenerateManifest>false</GenerateManifest>
+   </PropertyGroup>
+   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+-    <TargetName>$(ProjectName)64</TargetName>
++    <TargetName>$(ProjectName)</TargetName>
+     <GenerateManifest>true</GenerateManifest>
+     <LinkIncremental>false</LinkIncremental>
+   </PropertyGroup>
+   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+-    <TargetName>$(ProjectName)64</TargetName>
++    <TargetName>$(ProjectName)</TargetName>
+     <GenerateManifest>false</GenerateManifest>
+   </PropertyGroup>
+   <ItemDefinitionGroup>
+diff --git a/visualc/xspice/table.vcxproj b/visualc/xspice/table.vcxproj
+index fb4791c..ad3ee03 100644
+--- a/visualc/xspice/table.vcxproj
++++ b/visualc/xspice/table.vcxproj
+@@ -77,12 +77,12 @@
+     <GenerateManifest>false</GenerateManifest>
+   </PropertyGroup>
+   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+-    <TargetName>$(ProjectName)64</TargetName>
++    <TargetName>$(ProjectName)</TargetName>
+     <GenerateManifest>true</GenerateManifest>
+     <LinkIncremental>false</LinkIncremental>
+   </PropertyGroup>
+   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+-    <TargetName>$(ProjectName)64</TargetName>
++    <TargetName>$(ProjectName)</TargetName>
+     <GenerateManifest>false</GenerateManifest>
+   </PropertyGroup>
+   <ItemDefinitionGroup>
+diff --git a/visualc/xspice/xtradev.vcxproj b/visualc/xspice/xtradev.vcxproj
+index 6f0197f..53975b0 100644
+--- a/visualc/xspice/xtradev.vcxproj
++++ b/visualc/xspice/xtradev.vcxproj
+@@ -77,12 +77,12 @@
+     <GenerateManifest>false</GenerateManifest>
+   </PropertyGroup>
+   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+-    <TargetName>$(ProjectName)64</TargetName>
++    <TargetName>$(ProjectName)</TargetName>
+     <GenerateManifest>true</GenerateManifest>
+     <LinkIncremental>false</LinkIncremental>
+   </PropertyGroup>
+   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+-    <TargetName>$(ProjectName)64</TargetName>
++    <TargetName>$(ProjectName)</TargetName>
+     <GenerateManifest>false</GenerateManifest>
+   </PropertyGroup>
+   <ItemDefinitionGroup>
+diff --git a/visualc/xspice/xtraevt.vcxproj b/visualc/xspice/xtraevt.vcxproj
+index d5741e7..3177a91 100644
+--- a/visualc/xspice/xtraevt.vcxproj
++++ b/visualc/xspice/xtraevt.vcxproj
+@@ -77,12 +77,12 @@
+     <GenerateManifest>false</GenerateManifest>
+   </PropertyGroup>
+   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+-    <TargetName>$(ProjectName)64</TargetName>
++    <TargetName>$(ProjectName)</TargetName>
+     <GenerateManifest>true</GenerateManifest>
+     <LinkIncremental>false</LinkIncremental>
+   </PropertyGroup>
+   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+-    <TargetName>$(ProjectName)64</TargetName>
++    <TargetName>$(ProjectName)</TargetName>
+     <GenerateManifest>false</GenerateManifest>
+   </PropertyGroup>
+   <ItemDefinitionGroup>
+-- 
+2.32.0.windows.2
+