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

Fixed Windows Xschem running from VS2019 without installing Xschem to find (Root)/xschem_library/devices as XSCHEM_LIBRARY_PATH, so that viewing schematics through VS2019 will find all symbols in xschem_library/devices. Moved doc and xschem_library XML files to its own *.wxs. Cleaned up Product.wxs by taking out doc and xschem_library files; fixed spacings in License.rtf; added condition that proper version of Active TCL is required to install

This commit is contained in:
Stefan Schippers 2020-11-07 10:52:50 +01:00
parent 292958e4a2
commit 24dd02b713
8 changed files with 13785 additions and 13767 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
XSchemWin/XSchemWix/License.rtf
View File

@ -1,9 +1,13 @@
{\rtf1\ansi\ansicpg1252\deff0\nouicompat\deflang1033{\fonttbl{\f0\fnil\fcharset0 Calibri;}}
{\colortbl ;\red0\green0\blue255;}
{\*\generator Riched20 10.0.18362}\viewkind4\uc1
\pard\sa200\sl276\slmult1\f0\fs22\lang9 # This is a source file distribution of XSCHEM,\line # a schematic capture and Spice/Vhdl/Verilog netlisting tool for circuit \line # simulation.\line # Copyright (C) 1998-2020 Stefan Frederik Schippers\line # \line # This program is free software; you can redistribute it and/or modify\line # it under the terms of the GNU General Public License as published by\line # the Free Software Foundation; either version 2 of the License, or\line # (at your option) any later version.\line # \line # This program is distributed in the hope that it will be useful,\line # but WITHOUT ANY WARRANTY; without even the implied warranty of\line # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\line # GNU General Public License for more details.\line # \line # You should have received a copy of the GNU General Public License\line # along with this program; if not, write to the Free Software\line # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA\par
# This software uses scconfig ({{\field{\*\fldinst{HYPERLINK http://repo.hu/projects/scconfig/ }}{\fldrslt{http://repo.hu/projects/scconfig/\ul0\cf0}}}}\f0\fs22 ) for\line # configuration and install from sources (Copyright (C) 2009..2019 Tibor Palinkas)\line # Most source files under the scconfig/ directory are released under the\line # GNU Lesser General Public License version 2 (GNU LGPL2 or later versions).\par
# For details consider the explicit copyright banner in each source file.\line # for files without Copyright and license information consider:\line # Copyright (C) 2009..2019 Tibor Palinkas and license GNU LGPL2 (or\line # later versions of the GNU LGPL).\line # See file scconfig/COPYING for details.\par
\pard\sa200\sl276\slmult1\f0\fs22\lang9 This is a source file distribution of XSCHEM, a schematic capture and Spice/Vhdl/Verilog netlisting tool for circuit simulation.\par
Copyright (C) 1998-2020 Stefan Frederik Schippers\par
This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\line\line This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\par
You should have received a copy of the GNU General Public License\line along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA\par
This software uses scconfig ({{\field{\*\fldinst{HYPERLINK http://repo.hu/projects/scconfig/ }}{\fldrslt{http://repo.hu/projects/scconfig/\ul0\cf0}}}}\f0\fs22 ) for configuration and install from sources (Copyright (C) 2009..2019 Tibor Palinkas)\par
Most source files under the scconfig/ directory are released under the GNU Lesser General Public License version 2 (GNU LGPL2 or later versions).\par
For details consider the explicit copyright banner in each source file. For files without Copyright and license information consider: Copyright (C) 2009..2019 Tibor Palinkas and license GNU LGPL2 (or later versions of the GNU LGPL). See file scconfig/COPYING for details.\par
GNU GENERAL PUBLIC LICENSE\line Version 2, June 1991\par
Copyright (C) 1989, 1991 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA? Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.\par
Preamble\par

8129
XSchemWin/XSchemWix/Product.wxs
View File

File diff suppressed because it is too large Load Diff

7
XSchemWin/XSchemWix/XSchemWix.wixproj
View File

@ -21,9 +21,12 @@
<CompilerAdditionalOptions>-arch x64</CompilerAdditionalOptions>
<LinkerAdditionalOptions>
</LinkerAdditionalOptions>
<DefineConstants>docSrcDir=../../doc;xschemLibrarySrcDir=../../xschem_library</DefineConstants>
</PropertyGroup>
<ItemGroup>
<Compile Include="doc.wxs" />
<Compile Include="Product.wxs" />
<Compile Include="xschem_library.wxs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\XSchemWin.vcxproj">
@ -50,8 +53,8 @@
<PostBuildEvent />
</PropertyGroup>
<PropertyGroup>
<PreBuildEvent>C:\"Program Files (x86)"\"WiX Toolset v3.11"\bin\heat.exe dir "..\..\..\..\doc" -cg doc -gg -sfrag -fragment -out $(ProjectDir)heat_doc.wxs
C:\"Program Files (x86)"\"WiX Toolset v3.11"\bin\heat.exe dir "..\..\..\..\xschem_library" -cg xschem_library -gg -sfrag -fragment -out $(ProjectDir)heat_xschem_library.wxs</PreBuildEvent>
<PreBuildEvent>C:\"Program Files (x86)"\"WiX Toolset v3.11"\bin\heat.exe dir "..\..\..\..\doc" -dr INSTALLFOLDER -cg doc -gg -sfrag -var "var.docSrcDir" -out $(ProjectDir)heat_doc.wxs
C:\"Program Files (x86)"\"WiX Toolset v3.11"\bin\heat.exe dir "..\..\..\..\xschem_library" -dr INSTALLFOLDER -cg xschem_library -gg -sfrag -var "var.xschemLibrarySrcDir" -out $(ProjectDir)heat_xschem_library.wxs</PreBuildEvent>
</PropertyGroup>
<!--
To modify your build process, add your task inside one of the targets below and uncomment it.

1001
XSchemWin/XSchemWix/doc.wxs Normal file
View File

File diff suppressed because it is too large Load Diff

1484
XSchemWin/XSchemWix/heat_doc.wxs
View File

File diff suppressed because it is too large Load Diff

10138
XSchemWin/XSchemWix/heat_xschem_library.wxs
View File

File diff suppressed because it is too large Load Diff

6777
XSchemWin/XSchemWix/xschem_library.wxs Normal file
View File

File diff suppressed because it is too large Load Diff

6
src/xinit.c
View File

@ -957,7 +957,13 @@ int Tcl_AppInit(Tcl_Interp *inter)
tcleval(tmp);
running_in_src_dir = 0;
if (atoi(tclresult()) == 0)
{
running_in_src_dir = 1; /* no bin, so it's running in Visual studio source directory*/
my_snprintf(tmp, S(tmp), "subst [regsub {\\w+/\\w+/\\w+$} \"%s\" {}]xschem_library/devices", install_dir);
tcleval(tmp);
my_snprintf(tmp, S(tmp), ".;%s", tclresult());
tclsetvar("XSCHEM_LIBRARY_PATH", tmp);
}
char* gxschem_library=NULL, *xschem_sharedir=NULL;
if ((xschem_sharedir=getenv("XSCHEM_SHAREDIR")) != NULL) {
if (!stat(xschem_sharedir, &buf)) {