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

bump version to 3.1.0 (candidate #1)

This commit is contained in:
Stefan Frederik 2022-07-19 09:25:34 +02:00
parent b72d8387b2
commit baabac5fb7
10 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
doc/index.html
View File

@ -128,6 +128,14 @@
<td >3.0.0 release, now including windows binary distribution<br> <td >3.0.0 release, now including windows binary distribution<br>
</td> </td>
</tr> </tr>
<tr>
<td >20220721<br>
</td>
<td >3.1.0<br>
</td>
<td >3.1.0 release, ability to display simulation graphs and embeded images/logos<br>
</td>
</tr>
<tr> <tr>
<td ><br> <td ><br>

2
doc/xschem_man/developer_info.html
View File

@ -195,7 +195,7 @@ v {xschem version=2.9.7 file_version=1.2}</kbd>
A comment can be added (by manually editing the xschem schematic or symbol file) as shown below: A comment can be added (by manually editing the xschem schematic or symbol file) as shown below:
</p> </p>
<pre class="code"> <pre class="code">
v {xschem version=3.0.0 file_version=1.2 v {xschem version=3.1.0 file_version=1.2
* Copyright 2022 Stefan Frederik Schippers * Copyright 2022 Stefan Frederik Schippers
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");

7
scconfig/src/default/lib_compile.c
View File

@ -73,6 +73,7 @@ static char *clone_flags(const char *input, const char *node)
int compile_file_raw(int logdepth, const char *fn_input, char **fn_output, const char *cc, const char *cflags, const char *ldflags) int compile_file_raw(int logdepth, const char *fn_input, char **fn_output, const char *cc, const char *cflags, const char *ldflags)
{ {
char *cmdline; char *cmdline;
const char *cc_esc_orig;
char *cc_esc, *fn_input_esc, *fn_output_esc, *temp_out_esc, *temp_out; char *cc_esc, *fn_input_esc, *fn_output_esc, *temp_out_esc, *temp_out;
int ret; int ret;
@ -84,12 +85,12 @@ int compile_file_raw(int logdepth, const char *fn_input, char **fn_output, const
*fn_output = tempfile_new(*fn_output); *fn_output = tempfile_new(*fn_output);
unlink(*fn_output); unlink(*fn_output);
cc_esc = (cc == NULL ? get("cc/cc") : cc); cc_esc_orig = (cc == NULL ? get("cc/cc") : cc);
if (cc_esc == NULL) { if (cc_esc_orig == NULL) {
error("Trying to compile without a compiler available (cc/cc is empty)\n"); error("Trying to compile without a compiler available (cc/cc is empty)\n");
abort(); abort();
} }
cc_esc = shell_escape_dup(cc_esc); cc_esc = shell_escape_dup(cc_esc_orig);
fn_input_esc = shell_escape_dup(fn_input); fn_input_esc = shell_escape_dup(fn_input);
fn_output_esc = shell_escape_dup(*fn_output); fn_output_esc = shell_escape_dup(*fn_output);
temp_out_esc = shell_escape_dup(temp_out); temp_out_esc = shell_escape_dup(temp_out);

21
scconfig/src/gui/find_gl.c
View File

@ -27,8 +27,9 @@
#include "log.h" #include "log.h"
#include "db.h" #include "db.h"
#include "dep.h" #include "dep.h"
#include "find_gl.h"
int find_gl(const char *name, int logdepth, int fatal, const char *call, const char *arg) int find_gl(const char *name, int logdepth, int fatal)
{ {
char test_c[256]; char test_c[256];
const char *test_c_templ = const char *test_c_templ =
@ -48,8 +49,6 @@ int find_gl(const char *name, int logdepth, int fatal, const char *call, const c
const char **lf, *ldflgs[] = {"-lGL", "-lopengl32", "-framework OpenGL", NULL}; const char **lf, *ldflgs[] = {"-lGL", "-lopengl32", "-framework OpenGL", NULL};
char *cflags = NULL; char *cflags = NULL;
char *ldflags = NULL; char *ldflags = NULL;
(void) call; /* not used */
(void) arg; /* not used */
if (require("cc/cc", logdepth, fatal)) if (require("cc/cc", logdepth, fatal))
return try_fail(logdepth, node); return try_fail(logdepth, node);
@ -93,7 +92,7 @@ int find_gl(const char *name, int logdepth, int fatal, const char *call, const c
return 0; return 0;
} }
int find_gl_vao(const char *name, int logdepth, int fatal, const char *call, const char *arg) int find_gl_vao(const char *name, int logdepth, int fatal)
{ {
const char *test_c = const char *test_c =
NL "#include <stdio.h>" NL "#include <stdio.h>"
@ -105,8 +104,6 @@ int find_gl_vao(const char *name, int logdepth, int fatal, const char *call, con
NL; NL;
const char *node = "libs/gui/gl/vao"; const char *node = "libs/gui/gl/vao";
const char *cflags, *ldflags, *incs; const char *cflags, *ldflags, *incs;
(void) call; /* not used */
(void) arg; /* not used */
if (require("cc/cc", logdepth, fatal)) if (require("cc/cc", logdepth, fatal))
return try_fail(logdepth, node); return try_fail(logdepth, node);
@ -128,7 +125,7 @@ int find_gl_vao(const char *name, int logdepth, int fatal, const char *call, con
return try_fail(logdepth, node); return try_fail(logdepth, node);
} }
int find_gl_fb_attachment(const char *name, int logdepth, int fatal, const char *call, const char *arg) int find_gl_fb_attachment(const char *name, int logdepth, int fatal)
{ {
const char *test_c_templ = const char *test_c_templ =
NL "#include <stdio.h>" NL "#include <stdio.h>"
@ -143,8 +140,6 @@ int find_gl_fb_attachment(const char *name, int logdepth, int fatal, const char
char test_c[512]; char test_c[512];
const char *node = "libs/gui/gl/fb_attachment"; const char *node = "libs/gui/gl/fb_attachment";
const char *cflags, *ldflags, *incs, *ip; const char *cflags, *ldflags, *incs, *ip;
(void) call; /* not used */
(void) arg; /* not used */
if (require("cc/cc", logdepth, fatal)) if (require("cc/cc", logdepth, fatal))
return try_fail(logdepth, node); return try_fail(logdepth, node);
@ -170,7 +165,7 @@ int find_gl_fb_attachment(const char *name, int logdepth, int fatal, const char
} }
int find_glu(const char *name, int logdepth, int fatal, const char *call, const char *arg) int find_glu(const char *name, int logdepth, int fatal)
{ {
char test_c[256]; char test_c[256];
const char *test_c_templ = const char *test_c_templ =
@ -189,8 +184,6 @@ int find_glu(const char *name, int logdepth, int fatal, const char *call, const
char **cf, *cflgs[] = {"", "-I/usr/include/libdrm", NULL}; char **cf, *cflgs[] = {"", "-I/usr/include/libdrm", NULL};
char *cflags = NULL; char *cflags = NULL;
char *ldflags = NULL; char *ldflags = NULL;
(void) call; /* not used */
(void) arg; /* not used */
if (require("cc/cc", logdepth, fatal)) if (require("cc/cc", logdepth, fatal))
return try_fail(logdepth, node); return try_fail(logdepth, node);
@ -239,7 +232,7 @@ int find_glu(const char *name, int logdepth, int fatal, const char *call, const
return 0; return 0;
} }
int find_glut(const char *name, int logdepth, int fatal, const char *call, const char *arg) int find_glut(const char *name, int logdepth, int fatal)
{ {
const char *test_c = const char *test_c =
NL "#include <stdio.h>" NL "#include <stdio.h>"
@ -256,8 +249,6 @@ int find_glut(const char *name, int logdepth, int fatal, const char *call, const
char **inc, *incs[] = {"", "#include <openglut.h>", NULL}; char **inc, *incs[] = {"", "#include <openglut.h>", NULL};
char *cflags = NULL; char *cflags = NULL;
char *ldflags = NULL; char *ldflags = NULL;
(void) call; /* not used */
(void) arg; /* not used */
incs[0] = freeglut; incs[0] = freeglut;

2
scconfig/src/gui/find_gl.h
View File

@ -1,6 +1,6 @@
int find_gl(const char *name, int logdepth, int fatal); int find_gl(const char *name, int logdepth, int fatal);
int find_gl_vao(const char *name, int logdepth, int fatal); int find_gl_vao(const char *name, int logdepth, int fatal);
int find_gl_fb_attachment(const char *name, int logdepth, int fatal, const char *call, const char *arg); int find_gl_fb_attachment(const char *name, int logdepth, int fatal);
int find_glu(const char *name, int logdepth, int fatal); int find_glu(const char *name, int logdepth, int fatal);
int find_glut(const char *name, int logdepth, int fatal); int find_glut(const char *name, int logdepth, int fatal);

2
src/gschemtoxschem.awk
View File

@ -461,7 +461,7 @@ function print_header()
"device @name @device\n" \ "device @name @device\n" \
"@comptag\"\n" "@comptag\"\n"
} }
print "v {xschem version=3.0.0 file_version=1.2}" print "v {xschem version=3.1.0 file_version=1.2}"
template_attrs = "template=\"" template_attrs "\"\n" template_attrs = "template=\"" template_attrs "\"\n"
if(FILENAME ~/\.sym$/) { if(FILENAME ~/\.sym$/) {

2
src/make_sch_from_spice.awk
View File

@ -694,7 +694,7 @@ function print_sym(sym, template, format, subckt_name, sym_type, extra, dir, pin
print "start print symbol: " sym print "start print symbol: " sym
print "v {xschem version=3.0.0 file_version=1.2}" print "v {xschem version=3.1.0 file_version=1.2}"
print "K {type=" sym_type > sym print "K {type=" sym_type > sym
# print "format=\"@name @pinlist @symname " format_translate(template) "\"" > sym # print "format=\"@name @pinlist @symname " format_translate(template) "\"" > sym
iii = format_translate(template, extra) iii = format_translate(template, extra)

2
src/make_sym.awk
View File

@ -68,7 +68,7 @@ function beginfile(f)
text_voffset=20 text_voffset=20
lab_voffset=4 lab_voffset=4
ip=op=n_pin=0 ip=op=n_pin=0
print "v {xschem version=3.0.0 file_version=1.2}" > sym print "v {xschem version=3.1.0 file_version=1.2}" > sym
if(template=="") { if(template=="") {
printf "%s", "K {type=subcircuit\nformat=\"@name @pinlist @symname\"\n" >sym printf "%s", "K {type=subcircuit\nformat=\"@name @pinlist @symname\"\n" >sym
printf "%s\n", "template=\"name=x1\"" >sym printf "%s\n", "template=\"name=x1\"" >sym

2
src/symgen.awk
View File

@ -393,7 +393,7 @@ function attrs(a)
function header() function header()
{ {
print "v {xschem version=3.0.0 file_version=1.2}" print "v {xschem version=3.1.0 file_version=1.2}"
} }
function round(n) function round(n)

2
src/xschem.h
View File

@ -23,7 +23,7 @@
#ifndef CADGLOBALS #ifndef CADGLOBALS
#define CADGLOBALS #define CADGLOBALS
#define XSCHEM_VERSION "3.0.0" #define XSCHEM_VERSION "3.1.0"
#define XSCHEM_FILE_VERSION "1.2" #define XSCHEM_FILE_VERSION "1.2"
#if HAS_PIPE == 1 #if HAS_PIPE == 1