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

added xschem_library/generators directory for future schematic/symbol generator scripts. Handle empty XSCHEM_LIBRARY_PATH (use [pwd]).

This commit is contained in:
stefan schippers 2022-12-18 13:03:38 +01:00
parent 9c3a506ed5
commit 1a76f89464
8 changed files with 36 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
XSchemWin/README_WIN
View File

@ -90,6 +90,7 @@ INSTRUCTIONS TO COMPILE XSCHEM IN VISUAL STUDIO 2022
C:/Program Files/XSchem/xschem_library/ngspice C:/Program Files/XSchem/xschem_library/ngspice
C:/Program Files/XSchem/xschem_library/logic C:/Program Files/XSchem/xschem_library/logic
C:/Program Files/XSchem/xschem_library/binto7seg C:/Program Files/XSchem/xschem_library/binto7seg
C:/Program Files/XSchem/xschem_library/generators
C:/Program Files/XSchem/xschem_library/pcb C:/Program Files/XSchem/xschem_library/pcb
C:/Program Files/XSchem/xschem_library/rom8k C:/Program Files/XSchem/xschem_library/rom8k

4
XSchemWin/XSchemWix/xschemrc
View File

@ -21,6 +21,7 @@
#### /home/schippes/share/doc/xschem/ngspice #### /home/schippes/share/doc/xschem/ngspice
#### /home/schippes/share/doc/xschem/logic #### /home/schippes/share/doc/xschem/logic
#### /home/schippes/share/doc/xschem/xschem_simulator #### /home/schippes/share/doc/xschem/xschem_simulator
#### /home/schippes/share/doc/xschem/generators
#### /home/schippes/share/doc/xschem/binto7seg #### /home/schippes/share/doc/xschem/binto7seg
#### /home/schippes/share/doc/xschem/pcb #### /home/schippes/share/doc/xschem/pcb
#### /home/schippes/share/doc/xschem/rom8k #### /home/schippes/share/doc/xschem/rom8k
@ -33,6 +34,7 @@
#### ../xschem_library/ngspice #### ../xschem_library/ngspice
#### ../xschem_library/logic #### ../xschem_library/logic
#### ../xschem_library/xschem_simulator #### ../xschem_library/xschem_simulator
#### ../xschem_library/generators
#### ../xschem_library/binto7seg #### ../xschem_library/binto7seg
#### ../xschem_library/pcb #### ../xschem_library/pcb
#### ../xschem_library/rom8k #### ../xschem_library/rom8k
@ -48,6 +50,7 @@
# append XSCHEM_LIBRARY_PATH :${xschem_doc_dir}/rom8k # append XSCHEM_LIBRARY_PATH :${xschem_doc_dir}/rom8k
# append XSCHEM_LIBRARY_PATH :${xschem_doc_dir}/logic # append XSCHEM_LIBRARY_PATH :${xschem_doc_dir}/logic
# append XSCHEM_LIBRARY_PATH :${xschem_doc_dir}/pcb # append XSCHEM_LIBRARY_PATH :${xschem_doc_dir}/pcb
# append XSCHEM_LIBRARY_PATH :${xschem_doc_dir}/generators
# append XSCHEM_LIBRARY_PATH :${xschem_doc_dir}/binto7seg # append XSCHEM_LIBRARY_PATH :${xschem_doc_dir}/binto7seg
# append XSCHEM_LIBRARY_PATH :${xschem_doc_dir}/symgen # append XSCHEM_LIBRARY_PATH :${xschem_doc_dir}/symgen
# append XSCHEM_LIBRARY_PATH :${xschem_doc_dir}/xTAG # append XSCHEM_LIBRARY_PATH :${xschem_doc_dir}/xTAG
@ -65,6 +68,7 @@
# append XSCHEM_LIBRARY_PATH ";${XSCHEM_SHAREDIR}/../xschem_library/rom8k" # append XSCHEM_LIBRARY_PATH ";${XSCHEM_SHAREDIR}/../xschem_library/rom8k"
# append XSCHEM_LIBRARY_PATH ";${XSCHEM_SHAREDIR}/../xschem_library/logic" # append XSCHEM_LIBRARY_PATH ";${XSCHEM_SHAREDIR}/../xschem_library/logic"
# append XSCHEM_LIBRARY_PATH ";${XSCHEM_SHAREDIR}/../xschem_library/pcb" # append XSCHEM_LIBRARY_PATH ";${XSCHEM_SHAREDIR}/../xschem_library/pcb"
# append XSCHEM_LIBRARY_PATH ";${XSCHEM_SHAREDIR}/../xschem_library/generators"
# append XSCHEM_LIBRARY_PATH ";${XSCHEM_SHAREDIR}/../xschem_library/binto7seg" # append XSCHEM_LIBRARY_PATH ";${XSCHEM_SHAREDIR}/../xschem_library/binto7seg"
########################################################################### ###########################################################################

5
scconfig/hooks.c
View File

@ -138,6 +138,11 @@ int hook_postarg()
append("/local/xschem/xschem-lib-path", "/"); append("/local/xschem/xschem-lib-path", "/");
append("/local/xschem/xschem-lib-path", "share/doc/xschem/xschem_simulator"); append("/local/xschem/xschem-lib-path", "share/doc/xschem/xschem_simulator");
append("/local/xschem/xschem-lib-path", ":");
append("/local/xschem/xschem-lib-path", get("/local/xschem/prefix"));
append("/local/xschem/xschem-lib-path", "/");
append("/local/xschem/xschem-lib-path", "share/doc/xschem/generators");
append("/local/xschem/xschem-lib-path", ":"); append("/local/xschem/xschem-lib-path", ":");
append("/local/xschem/xschem-lib-path", get("/local/xschem/prefix")); append("/local/xschem/xschem-lib-path", get("/local/xschem/prefix"));
append("/local/xschem/xschem-lib-path", "/"); append("/local/xschem/xschem-lib-path", "/");

2
src/save.c
View File

@ -2192,6 +2192,7 @@ void load_schematic(int load_symbols, const char *fname, int reset_undo) /* 2015
my_strncpy(xctx->current_name, rel_sym_path(filename), S(xctx->current_name)); my_strncpy(xctx->current_name, rel_sym_path(filename), S(xctx->current_name));
/* local file specified and not coming from web url */ /* local file specified and not coming from web url */
} else { } else {
/* if name is /some/path/. remove /. at end */
my_snprintf(msg, S(msg), "regsub {/\\.$} [get_directory {%s}] {}", filename); my_snprintf(msg, S(msg), "regsub {/\\.$} [get_directory {%s}] {}", filename);
my_strncpy(xctx->current_dirname, tcleval(msg), S(xctx->current_dirname)); my_strncpy(xctx->current_dirname, tcleval(msg), S(xctx->current_dirname));
/* local file name */ /* local file name */
@ -2199,7 +2200,6 @@ void load_schematic(int load_symbols, const char *fname, int reset_undo) /* 2015
/* local relative reference */ /* local relative reference */
my_strncpy(xctx->current_name, rel_sym_path(filename), S(xctx->current_name)); my_strncpy(xctx->current_name, rel_sym_path(filename), S(xctx->current_name));
} }
/* if name is /some/path/. remove /. at end */
dbg(1, "load_schematic(): opening file for loading:%s, filename=%s\n", name, filename); dbg(1, "load_schematic(): opening file for loading:%s, filename=%s\n", name, filename);
dbg(1, "load_schematic(): sch[currsch]=%s\n", xctx->sch[xctx->currsch]); dbg(1, "load_schematic(): sch[currsch]=%s\n", xctx->sch[xctx->currsch]);
if(!name[0]) return; if(!name[0]) return;

10
src/xinit.c
View File

@ -1976,6 +1976,9 @@ int Tcl_AppInit(Tcl_Interp *inter)
my_snprintf(tmp, S(tmp), my_snprintf(tmp, S(tmp),
"append XSCHEM_LIBRARY_PATH : [file dirname \"%s\"]/xschem_library/xschem_simulator", pwd_dir); "append XSCHEM_LIBRARY_PATH : [file dirname \"%s\"]/xschem_library/xschem_simulator", pwd_dir);
tcleval(tmp); tcleval(tmp);
my_snprintf(tmp, S(tmp),
"append XSCHEM_LIBRARY_PATH : [file dirname \"%s\"]/xschem_library/generators", pwd_dir);
tcleval(tmp);
my_snprintf(tmp, S(tmp), my_snprintf(tmp, S(tmp),
"append XSCHEM_LIBRARY_PATH : [file dirname \"%s\"]/xschem_library/binto7seg", pwd_dir); "append XSCHEM_LIBRARY_PATH : [file dirname \"%s\"]/xschem_library/binto7seg", pwd_dir);
tcleval(tmp); tcleval(tmp);
@ -1999,9 +2002,10 @@ int Tcl_AppInit(Tcl_Interp *inter)
/*4*/ "xschem_library/ngspice", /*4*/ "xschem_library/ngspice",
/*5*/ "xschem_library/logic", /*5*/ "xschem_library/logic",
/*6*/ "xschem_library/xschem_simulator", /*6*/ "xschem_library/xschem_simulator",
/*7*/ "xschem_library/binto7seg", /*7*/ "xschem_library/generators",
/*8*/ "xschem_library/pcb", /*8*/ "xschem_library/binto7seg",
/*9*/ "xschem_library/rom8k" }; /*9*/ "xschem_library/pcb",
/*10*/ "xschem_library/rom8k" };
GetModuleFileNameA(NULL, install_dir, MAX_PATH); GetModuleFileNameA(NULL, install_dir, MAX_PATH);
change_to_unix_fn(install_dir); change_to_unix_fn(install_dir);
size_t dir_len=strlen(install_dir); size_t dir_len=strlen(install_dir);

3
src/xschem.tcl
View File

@ -6149,8 +6149,9 @@ proc set_paths {} {
lappend pathlist $i lappend pathlist $i
} }
} }
set myload_files1 $pathlist
} }
if {$pathlist eq {}} { set pathlist [pwd] }
set myload_files1 $pathlist
# set INITIALLOADDIR INITIALINSTDIR INITIALPROPDIR as initial locations in load file dialog box # set INITIALLOADDIR INITIALINSTDIR INITIALPROPDIR as initial locations in load file dialog box
set_initial_dirs set_initial_dirs
} }

4
src/xschemrc
View File

@ -21,6 +21,7 @@
#### /home/schippes/share/doc/xschem/ngspice #### /home/schippes/share/doc/xschem/ngspice
#### /home/schippes/share/doc/xschem/logic #### /home/schippes/share/doc/xschem/logic
#### /home/schippes/share/doc/xschem/xschem_simulator #### /home/schippes/share/doc/xschem/xschem_simulator
#### /home/schippes/share/doc/xschem/generators
#### /home/schippes/share/doc/xschem/binto7seg #### /home/schippes/share/doc/xschem/binto7seg
#### /home/schippes/share/doc/xschem/pcb #### /home/schippes/share/doc/xschem/pcb
#### /home/schippes/share/doc/xschem/rom8k #### /home/schippes/share/doc/xschem/rom8k
@ -33,6 +34,7 @@
#### ../xschem_library/ngspice #### ../xschem_library/ngspice
#### ../xschem_library/logic #### ../xschem_library/logic
#### ../xschem_library/xschem_simulator #### ../xschem_library/xschem_simulator
#### ../xschem_library/generators
#### ../xschem_library/binto7seg #### ../xschem_library/binto7seg
#### ../xschem_library/pcb #### ../xschem_library/pcb
#### ../xschem_library/rom8k #### ../xschem_library/rom8k
@ -48,6 +50,7 @@
# append XSCHEM_LIBRARY_PATH :${xschem_doc_dir}/rom8k # append XSCHEM_LIBRARY_PATH :${xschem_doc_dir}/rom8k
# append XSCHEM_LIBRARY_PATH :${xschem_doc_dir}/logic # append XSCHEM_LIBRARY_PATH :${xschem_doc_dir}/logic
# append XSCHEM_LIBRARY_PATH :${xschem_doc_dir}/pcb # append XSCHEM_LIBRARY_PATH :${xschem_doc_dir}/pcb
# append XSCHEM_LIBRARY_PATH :${xschem_doc_dir}/generators
# append XSCHEM_LIBRARY_PATH :${xschem_doc_dir}/binto7seg # append XSCHEM_LIBRARY_PATH :${xschem_doc_dir}/binto7seg
# append XSCHEM_LIBRARY_PATH :${xschem_doc_dir}/symgen # append XSCHEM_LIBRARY_PATH :${xschem_doc_dir}/symgen
# append XSCHEM_LIBRARY_PATH :${xschem_doc_dir}/xTAG # append XSCHEM_LIBRARY_PATH :${xschem_doc_dir}/xTAG
@ -64,6 +67,7 @@
# append XSCHEM_LIBRARY_PATH ";${XSCHEM_SHAREDIR}/../xschem_library/rom8k" # append XSCHEM_LIBRARY_PATH ";${XSCHEM_SHAREDIR}/../xschem_library/rom8k"
# append XSCHEM_LIBRARY_PATH ";${XSCHEM_SHAREDIR}/../xschem_library/logic" # append XSCHEM_LIBRARY_PATH ";${XSCHEM_SHAREDIR}/../xschem_library/logic"
# append XSCHEM_LIBRARY_PATH ";${XSCHEM_SHAREDIR}/../xschem_library/pcb" # append XSCHEM_LIBRARY_PATH ";${XSCHEM_SHAREDIR}/../xschem_library/pcb"
# append XSCHEM_LIBRARY_PATH ";${XSCHEM_SHAREDIR}/../xschem_library/generators"
# append XSCHEM_LIBRARY_PATH ";${XSCHEM_SHAREDIR}/../xschem_library/binto7seg" # append XSCHEM_LIBRARY_PATH ";${XSCHEM_SHAREDIR}/../xschem_library/binto7seg"
########################################################################### ###########################################################################

5
xschem_library/Makefile
View File

@ -8,6 +8,7 @@ install: FORCE
$(SCCBOX) mkdir -p "$(system_library_dir)" "$(XDOCDIR)"/examples "$(XDOCDIR)"/pcb $(SCCBOX) mkdir -p "$(system_library_dir)" "$(XDOCDIR)"/examples "$(XDOCDIR)"/pcb
$(SCCBOX) mkdir -p "$(XDOCDIR)"/logic "$(XDOCDIR)"/xTAG "$(XDOCDIR)"/binto7seg $(SCCBOX) mkdir -p "$(XDOCDIR)"/logic "$(XDOCDIR)"/xTAG "$(XDOCDIR)"/binto7seg
$(SCCBOX) mkdir -p "$(XDOCDIR)"/symgen "$(XDOCDIR)"/ngspice "$(XDOCDIR)"/rulz-r8c33 $(SCCBOX) mkdir -p "$(XDOCDIR)"/symgen "$(XDOCDIR)"/ngspice "$(XDOCDIR)"/rulz-r8c33
$(SCCBOX) mkdir -p "$(XDOCDIR)"/generators
$(SCCBOX) mkdir -p "$(XDOCDIR)"/rom8k "$(XDOCDIR)"/gschem_import/sym $(SCCBOX) mkdir -p "$(XDOCDIR)"/rom8k "$(XDOCDIR)"/gschem_import/sym
$(SCCBOX) install -f -d devices/*.sym "$(system_library_dir)" $(SCCBOX) install -f -d devices/*.sym "$(system_library_dir)"
$(SCCBOX) install -f -d devices/*.sch "$(system_library_dir)" $(SCCBOX) install -f -d devices/*.sch "$(system_library_dir)"
@ -16,6 +17,7 @@ install: FORCE
$(SCCBOX) install -f -d examples/stimuli.* "$(XDOCDIR)"/examples $(SCCBOX) install -f -d examples/stimuli.* "$(XDOCDIR)"/examples
$(SCCBOX) install -f -d binto7seg/*.sym "$(XDOCDIR)"/binto7seg $(SCCBOX) install -f -d binto7seg/*.sym "$(XDOCDIR)"/binto7seg
$(SCCBOX) install -f -d binto7seg/*.sch "$(XDOCDIR)"/binto7seg $(SCCBOX) install -f -d binto7seg/*.sch "$(XDOCDIR)"/binto7seg
$(SCCBOX) install -f -d generators/*.* "$(XDOCDIR)"/generators
$(SCCBOX) install -f -d xTAG/*.sym* "$(XDOCDIR)"/xTAG $(SCCBOX) install -f -d xTAG/*.sym* "$(XDOCDIR)"/xTAG
$(SCCBOX) install -f -d xTAG/*.sch "$(XDOCDIR)"/xTAG $(SCCBOX) install -f -d xTAG/*.sch "$(XDOCDIR)"/xTAG
$(SCCBOX) install -f -d logic/*.sym "$(XDOCDIR)"/logic $(SCCBOX) install -f -d logic/*.sym "$(XDOCDIR)"/logic
@ -41,7 +43,8 @@ install: FORCE
uninstall: FORCE uninstall: FORCE
$(SCCBOX) rm -f "$(system_library_dir)"/* "$(XDOCDIR)"/examples/* "$(XDOCDIR)"/pcb/* \ $(SCCBOX) rm -f "$(system_library_dir)"/* "$(XDOCDIR)"/examples/* "$(XDOCDIR)"/pcb/* \
"$(XDOCDIR)"/ngspice/* "$(XDOCDIR)"/symgen/* "$(XDOCDIR)"/logic/* "$(XDOCDIR)"/xTAG/* \ "$(XDOCDIR)"/ngspice/* "$(XDOCDIR)"/symgen/* "$(XDOCDIR)"/logic/* "$(XDOCDIR)"/xTAG/* \
"$(XDOCDIR)"/rom8k/* "$(XDOCDIR)"/xschem_simulator/ "$(XDOCDIR)"/binto7seg/* "$(XDOCDIR)"/rulz-r8c33/* \ "$(XDOCDIR)"/rom8k/* "$(XDOCDIR)"/xschem_simulator/ "$(XDOCDIR)"/binto7seg/* \
"$(XDOCDIR)"/rulz-r8c33/* "$(XDOCDIR)"/generators/* \
"$(XDOCDIR)"/gschem_import/*.sym \ "$(XDOCDIR)"/gschem_import/*.sym \
"$(XDOCDIR)"/gschem_import/*.sch \ "$(XDOCDIR)"/gschem_import/*.sch \
"$(XDOCDIR)"/gschem_import/sym/*.sym \ "$(XDOCDIR)"/gschem_import/sym/*.sym \