luke
/
xschem
mirror of https://github.com/StefanSchippers/xschem.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

update to 2.9.9.8; added release_binary to build binary with self compiled tcl/tk library; remove xschem.1 from Wix package

This commit is contained in:
Stefan Frederik 2021-08-24 07:59:04 +02:00
parent 5abe48f24e
commit 73b51dff79
6 changed files with 2073 additions and 1996 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
XSchemWin/XSchemWin.sln
View File

@ -11,6 +11,8 @@ Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release_binary|x64 = Release_binary|x64
Release_binary|x86 = Release_binary|x86
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
@ -19,6 +21,10 @@ Global
{22C260FD-DCF7-4ED2-93AD-491F08007584}.Debug|x64.Build.0 = Debug|x64
{22C260FD-DCF7-4ED2-93AD-491F08007584}.Debug|x86.ActiveCfg = Debug|Win32
{22C260FD-DCF7-4ED2-93AD-491F08007584}.Debug|x86.Build.0 = Debug|Win32
{22C260FD-DCF7-4ED2-93AD-491F08007584}.Release_binary|x64.ActiveCfg = Release_binary|x64
{22C260FD-DCF7-4ED2-93AD-491F08007584}.Release_binary|x64.Build.0 = Release_binary|x64
{22C260FD-DCF7-4ED2-93AD-491F08007584}.Release_binary|x86.ActiveCfg = Release_binary|Win32
{22C260FD-DCF7-4ED2-93AD-491F08007584}.Release_binary|x86.Build.0 = Release_binary|Win32
{22C260FD-DCF7-4ED2-93AD-491F08007584}.Release|x64.ActiveCfg = Release|x64
{22C260FD-DCF7-4ED2-93AD-491F08007584}.Release|x64.Build.0 = Release|x64
{22C260FD-DCF7-4ED2-93AD-491F08007584}.Release|x86.ActiveCfg = Release|Win32
@ -26,6 +32,10 @@ Global
{91FBAA21-56D3-42E7-A3E8-DF92C89CD027}.Debug|x64.ActiveCfg = Debug|x86
{91FBAA21-56D3-42E7-A3E8-DF92C89CD027}.Debug|x86.ActiveCfg = Debug|x86
{91FBAA21-56D3-42E7-A3E8-DF92C89CD027}.Debug|x86.Build.0 = Debug|x86
{91FBAA21-56D3-42E7-A3E8-DF92C89CD027}.Release_binary|x64.ActiveCfg = Release|x86
{91FBAA21-56D3-42E7-A3E8-DF92C89CD027}.Release_binary|x64.Build.0 = Release|x86
{91FBAA21-56D3-42E7-A3E8-DF92C89CD027}.Release_binary|x86.ActiveCfg = Release|x86
{91FBAA21-56D3-42E7-A3E8-DF92C89CD027}.Release_binary|x86.Build.0 = Release|x86
{91FBAA21-56D3-42E7-A3E8-DF92C89CD027}.Release|x64.ActiveCfg = Release|x86
{91FBAA21-56D3-42E7-A3E8-DF92C89CD027}.Release|x86.ActiveCfg = Release|x86
{91FBAA21-56D3-42E7-A3E8-DF92C89CD027}.Release|x86.Build.0 = Release|x86

75
XSchemWin/XSchemWin.vcxproj
View File

@ -5,6 +5,14 @@
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release_binary|Win32">
<Configuration>Release_binary</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release_binary|x64">
<Configuration>Release_binary</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
@ -38,6 +46,13 @@
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_binary|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v142</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
@ -51,6 +66,13 @@
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_binary|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v142</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
@ -62,12 +84,18 @@
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_binary|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_binary|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
@ -82,6 +110,9 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_binary|Win32'">
<LinkIncremental>false</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LinkIncremental>false</LinkIncremental>
<IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);C:\ActiveTcl\include</IncludePath>
@ -89,6 +120,13 @@
<ExecutablePath>$(VC_ExecutablePath_x64);$(CommonExecutablePath);D:\GnuWin32\bin</ExecutablePath>
<TargetName>XSchem</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_binary|x64'">
<LinkIncremental>false</LinkIncremental>
<IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);C:\myTcl86\include</IncludePath>
<LibraryPath>$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);$(NETFXKitsDir)Lib\um\x64;C:\myTcl86\lib</LibraryPath>
<ExecutablePath>$(VC_ExecutablePath_x64);$(CommonExecutablePath);D:\GnuWin32\bin</ExecutablePath>
<TargetName>XSchem</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
@ -130,6 +168,22 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_binary|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
@ -147,6 +201,23 @@
<AdditionalDependencies>tcl86t.lib;tk86t.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_binary|x64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>tcl86t.lib;tk86t.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\src\actions.c" />
<ClCompile Include="..\src\callback.c" />
@ -193,14 +264,18 @@
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">bison -d -o expandlabel.c ..\src\expandlabel.y </Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">expandlabel.c</Outputs>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">bison -d -o expandlabel.c ..\src\expandlabel.y </Command>
<Command Condition="'$(Configuration)|$(Platform)'=='Release_binary|x64'">bison -d -o expandlabel.c ..\src\expandlabel.y </Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">expandlabel.c</Outputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release_binary|x64'">expandlabel.c</Outputs>
</CustomBuild>
<CustomBuild Include="..\src\parselabel.l">
<FileType>Document</FileType>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">flex -l -oparselabel.c ..\src\parselabel.l</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">flex -l -oparselabel.c ..\src\parselabel.l</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='Release_binary|x64'">flex -l -oparselabel.c ..\src\parselabel.l</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">parselabel.c</Outputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">parselabel.c</Outputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release_binary|x64'">parselabel.c</Outputs>
</CustomBuild>
</ItemGroup>
<ItemGroup>

2
XSchemWin/XSchemWix/Product.wxs
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Product Id="*" Name="Xschem" Language="1033" Version="2.9.9.7" Manufacturer="Xschem" UpgradeCode="0deb9c17-cbbd-491c-be3e-24446b27ccd5">
<Product Id="*" Name="Xschem" Language="1033" Version="2.9.9.8" Manufacturer="Xschem" UpgradeCode="0deb9c17-cbbd-491c-be3e-24446b27ccd5">
<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
<WixVariable Id="WixUILicenseRtf"
Value="License.rtf" />

4
XSchemWin/XSchemWix/doc.wxs
View File

@ -34,9 +34,6 @@
<File Id="filB5BAB18CD952C15145D612E191ECB3D5" KeyPath="yes" Source="$(var.docSrcDir)\xschem2.png" />
</Component>
<Directory Id="dir56824767C511B5A8BDE9AD99F23EBEB0" Name="manpages">
<Component Id="cmpC01C1013B4DCC58753621154A92EE8E4" Guid="{9BEE1C61-CEAE-498C-8C95-997A704499AA}">
<File Id="fil3F838419C8823B97975918DE6BFB300F" KeyPath="yes" Source="$(var.docSrcDir)\manpages\xschem.1" />
</Component>
<Component Id="cmp9825A377AC374CFEE6EB63CFA6BE0BF6" Guid="{42DA6192-9D46-446A-89F9-27F3CAEF631B}">
<File Id="filBD354E9C342F6AB2EBF466996BFA6597" KeyPath="yes" Source="$(var.docSrcDir)\manpages\xschem.1.in" />
</Component>
@ -811,7 +808,6 @@
<ComponentRef Id="cmp25A043AB41EF230E1E934445514477D5" />
<ComponentRef Id="cmp3EE12729C368AAE386D9F87D123AF8B1" />
<ComponentRef Id="cmpDB2679E4A9AD23987A0D7CA88533A656" />
<ComponentRef Id="cmpC01C1013B4DCC58753621154A92EE8E4" />
<ComponentRef Id="cmp9825A377AC374CFEE6EB63CFA6BE0BF6" />
<ComponentRef Id="cmpC4B67FB1F80BFA9664189B56CE8DAEC6" />
<ComponentRef Id="cmp9DD9B6DEAB0CD49429098E1026944E4F" />

528
XSchemWin/XSchemWix/heat_doc.wxs
View File

File diff suppressed because it is too large Load Diff

3450
XSchemWin/XSchemWix/heat_xschem_library.wxs
View File

File diff suppressed because it is too large Load Diff