[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: gaf.git: branch: master updated (1.6.1-20100214-227-g7cf7a33)
The branch, master has been updated
via 7cf7a33ea187092c242bad45512134b27627f93b (commit)
via 7256891e6800b47f29fa9e6f2bbc0507a887fb98 (commit)
via cc2ea46161c1994b3cb294c81154be3656f7c81e (commit)
via 9e18ec2b836e1c5729b5d7381ed3e545ab5aab1a (commit)
via f5e8bbd51c7bc4653e74f58657ba25a93906fa8b (commit)
from 77621ac14298e1ec41a994a47ce10e1104fa5cc4 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
=========
Summary
=========
NEWS | 13 ++++++++++
gattrib/docs/.gitignore | 1 +
gattrib/docs/Makefile.am | 22 +++++++++++++++-
gattrib/docs/gattrib.1 | 48 ++++++++++++++++++++++++++++++++++++++
gnetlist/docs/gnetlist.1 | 17 -------------
gnetlist/include/globals.h | 4 ---
gnetlist/src/globals.c | 4 ---
gnetlist/src/gnetlist.c | 6 ++--
gnetlist/src/parsecmd.c | 31 +-----------------------
gnetlist/tests/common/tests.list | 14 +++++-----
utils/Makefile.am | 2 +-
utils/docs/.gitignore | 3 ++
utils/docs/Makefile.am | 6 ++--
utils/{man => docs}/grenum.1 | 0
utils/{man => docs}/gxyrs.1 | 0
utils/man/.gitignore | 4 ---
utils/man/Makefile.am | 26 --------------------
17 files changed, 100 insertions(+), 101 deletions(-)
create mode 100644 gattrib/docs/gattrib.1
rename utils/{man => docs}/grenum.1 (100%)
rename utils/{man => docs}/gxyrs.1 (100%)
delete mode 100644 utils/man/.gitignore
delete mode 100644 utils/man/Makefile.am
=================
Commit Messages
=================
commit 7cf7a33ea187092c242bad45512134b27627f93b
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
utils: Tidy up manpages.
Put utils manpages in utils/docs to match other manpages. Ensure
gxyrs.html is created & distributed.
:100644 100644 6bc2cf0... 3696a67... M utils/Makefile.am
:100644 100644 fae61eb... dd457b7... M utils/docs/.gitignore
:100644 100644 6d082ab... 7041ff5... M utils/docs/Makefile.am
:000000 100644 0000000... 4bc1652... A utils/docs/grenum.1
:000000 100644 0000000... 2f2dc73... A utils/docs/gxyrs.1
:100644 000000 a4caef1... 0000000... D utils/man/.gitignore
:100644 000000 a86f50b... 0000000... D utils/man/Makefile.am
:100644 000000 4bc1652... 0000000... D utils/man/grenum.1
:100644 000000 2f2dc73... 0000000... D utils/man/gxyrs.1
commit 7256891e6800b47f29fa9e6f2bbc0507a887fb98
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
gattrib: Add man page.
:100644 100644 fae61eb... e9d810a... M gattrib/docs/.gitignore
:100644 100644 61809ec... 885eb2b... M gattrib/docs/Makefile.am
:000000 100644 0000000... 6096e1c... A gattrib/docs/gattrib.1
commit cc2ea46161c1994b3cb294c81154be3656f7c81e
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
gnetlist: Remove options specific to `spice-sdb' backend.
The gnetlist `-e', `-I', `-n' and `-s' command-line options are only
used by the `spice-sdb' backend. They have equivalents based on the
`-O' option. Remove them.
Acked-by: Stuart Brorson <sdb@xxxxxxxxxx>
:100644 100644 4c8dfe2... d57e893... M NEWS
:100644 100644 784ea3e... a20edb1... M gnetlist/docs/gnetlist.1
:100644 100644 90425a2... 974d38e... M gnetlist/include/globals.h
:100644 100644 ee6101c... e352e8f... M gnetlist/src/globals.c
:100644 100644 1fba9a9... 6166f43... M gnetlist/src/parsecmd.c
:100644 100644 5e81fd5... db1072a... M gnetlist/tests/common/tests.list
commit 9e18ec2b836e1c5729b5d7381ed3e545ab5aab1a
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
gnetlist: Exit if a Scheme error occurs.
If a Scheme error occurs, gnetlist ignores it silently apart from
printing a message to the log file. This is not a good thing.
This patch makes Scheme errors stop gnetlist noisily. The error
messages could be improved, but they're better than nothing.
:100644 100644 30354ad... fb89d63... M gnetlist/src/gnetlist.c
commit f5e8bbd51c7bc4653e74f58657ba25a93906fa8b
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
Update NEWS.
Add info on new `--list-backends' option to gnetlist (missed out from
commit ae45df48397e).
:100644 100644 2c7a82b... 4c8dfe2... M NEWS
=========
Changes
=========
commit 7cf7a33ea187092c242bad45512134b27627f93b
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
utils: Tidy up manpages.
Put utils manpages in utils/docs to match other manpages. Ensure
gxyrs.html is created & distributed.
diff --git a/utils/Makefile.am b/utils/Makefile.am
index 6bc2cf0..3696a67 100644
--- a/utils/Makefile.am
+++ b/utils/Makefile.am
@@ -1,5 +1,5 @@
-SUBDIRS = src gschlas scripts gxyrs lib include examples docs man tests
+SUBDIRS = src gschlas scripts gxyrs lib include examples docs tests
EXTRA_DIST = ChangeLog ChangeLog.tragesym-1.0 ChangeLog.gsch2pcb-1.0 \
ChangeLog-1.0 AUTHORS
diff --git a/utils/docs/.gitignore b/utils/docs/.gitignore
index fae61eb..dd457b7 100644
--- a/utils/docs/.gitignore
+++ b/utils/docs/.gitignore
@@ -3,3 +3,6 @@ Makefile.in
html
latex
*~
+grenum.html
+gsch2pcb.html
+gxyrs.html
diff --git a/utils/docs/Makefile.am b/utils/docs/Makefile.am
index 6d082ab..7041ff5 100644
--- a/utils/docs/Makefile.am
+++ b/utils/docs/Makefile.am
@@ -15,16 +15,16 @@ else
@echo 'The documentation cannot be built from the sources.'
endif
-dist_man_MANS = gsch2pcb.1
+dist_man_MANS = gsch2pcb.1 grenum.1 gxyrs.1
# Rules for converting man->html
-html_man_files = gsch2pcb.html
+html_man_files = gsch2pcb.html grenum.html gxyrs.html
SUFFIXES = .1 .html
if ENABLE_GROFF_HTML
docsmandir=$(docdir)/man
-docsman_DATA=$(html_man_files)
+dist_docsman_DATA=$(html_man_files)
.1.html:
rm -rf $@.tmp && \
LC_NUMERIC=C $(GROFF) -man -T html $< >$@.tmp && \
diff --git a/utils/docs/grenum.1 b/utils/docs/grenum.1
new file mode 100644
index 0000000..4bc1652
--- /dev/null
+++ b/utils/docs/grenum.1
@@ -0,0 +1,59 @@
+.TH grenum 1 "February 14th, 2010" Version 1.6.1.20100214
+
+.SH NAME
+.B grenum
+\- An advanced refdes renumber utility
+
+.SH SYNOPSIS
+.B grenum
+[\-v\||\|\-\-version \-h\||\|\-\-help \-p\||\|\-\-pagejump]
+.I infile1.sch infile2.sch
+\|.\|.\|.
+
+
+.SH DESCRIPTION
+
+The
+.B grenum
+program will renumber the refdes definitions read from
+.I infile\|.
+
+.SH OPTIONS
+.TP
+\-p, \-\-pagejump
+This will switch on the page jump mode. It means that refdes's from each
+.I inputfile
+gets renumbered from 100,200... etc.
+.TP
+\-v, \-\-version
+prints version information
+.TP
+\-h, \-\-help
+prints help message
+
+.SH RETURN VALUE
+.B grenum
+will return
+.B 0
+if all files processed successfully,
+.B 1
+if there was no input file specified,
+.B 2
+if I/O files can't be opened/written,
+.B 3
+if there is parse error in input file,
+.B 4
+if there is not enough memory to store refdes prefixes.
+.SH BUGS
+
+If you find one, please report it to:
+
+.SH AUTHOR
+
+Levente Kovacs
+
+Levente.Kovacs@xxxxxxxxxxxx
+
+.SH SEE ALSO
+
+.B gschem(1)
diff --git a/utils/docs/gxyrs.1 b/utils/docs/gxyrs.1
new file mode 100644
index 0000000..2f2dc73
--- /dev/null
+++ b/utils/docs/gxyrs.1
@@ -0,0 +1,330 @@
+.\"Created with GNOME Manpages Editor Wizard
+.\"http://sourceforge.net/projects/gmanedit2
+.TH \fBgxyrs\fP 1 "Agosto 22, 2010" "" "\fBgxyrs\fP"
+
+.SH NAME
+\fBgxyrs\fP \- is a program to batch process XYRS files.
+
+.SH SYNOPSIS
+.B \fBgxyrs\fP
+.RI \fBfile\fP
+.RI [OPTIONS]
+.br
+
+.SH DESCRIPTION
+XYRS files are usually generated by PCB design programs, and are used by board assemblers.
+.PP
+Format of XYRS files is discussed in FILES section.
+.PP
+Processing of these files is often needed by board assemblers or designers to suit their
+process and tools flows.
+.PP
+\fBgxyrs\fP helps batch-processing these files. Rules and commands can be defined to make
+batch-processing easy.
+.PP
+\fBgxyrs\fP consists on a perl library providing the core functions, and a perl script providing some basic functionality.
+.PP
+It takes some arguments from the command line: input and output files, some modifiers, and an action-file or an action-string.
+.PP
+The action-file or action-script contains some commands. For every line of the input file, \fBgxyrs\fP executes those commands, which can modify the contents of the line,
+and then writes the resulting line to the output file.
+.PP
+Since \fBgxyrs\fP is written in perl, actions are also written in this language.
+
+.SH OPTIONS
+.B
+.IP --help
+Display a usage message on standard output and exit successfully.
+.BI \--verbose
+Display more information messages when processing files.
+.TP
+.BI \--process-comments
+By default, gxyrs doesn't process lines starting with '*' and '#' characters.
+
+It just copies these lines to the output, without further processing.
+
+With this option, it processes these lines as well.
+.TP
+.BI \--tabulate
+Give each field in the output file a fixed length, enough to contain the longest string.
+ Using this option make the output file easier to read by humans.
+.TP
+.BI \--caseinsensitive
+Ignore case distinctions when comparing patterns.
+.TP
+.BI \--adjust "\| FILE\ "
+File with the commands to process the input file.
+.TP
+.BI \--eval "\| PATTERN\ "
+Interpret PATTERN as the commands to process the input file.
+.TP
+.BI \--output "\| FILE\ "
+Save the output to the specified FILE.
+
+If FILE string is "-" (without double quotes), then output is redirected to standard output STDOUT.
+.TP
+.BI \--output-delimiter "\| CHAR\ "
+Use the given CHAR as an output field delimiter.
+
+.SH "PREDEFINED VARIABLES"
+.PP
+gxyrs defines automatically the following variables:
+.PP
+.TP
+.B REF_COL
+column number (starting at 0) where the component reference is.
+.TP
+.B FOOTPRINT_COL
+column number (starting at 0) where the component footprint is.
+.TP
+.B X_COL
+column number (starting at 0) where the component's X location coordinate is.
+.TP
+.B Y_COL
+column number (starting at 0) where the component's Y location coordinate is.
+.TP
+.B ANGLE_COL
+column number (starting at 0) where the component rotation angle is.
+.TP
+.B LAYER_COL
+column number (starting at 0) where the component's layer side location is.
+.TP
+.B VALUE_COL
+column number (starting at 0) where the component's value is. Usually this is the component's part number.
+.TP
+.B LINE_NUMBER
+this is the line number of the input file that is being currently processed.
+.TP
+.B LINE
+array where each array element is a field or column of the input file's line being processed.
+.SH "BUILTIN COMMANDS"
+All the following commands accept a \fIchecklist\fP parameter.
+A \fIchecklist\fP is a list of one or more \fIcheck_items\fP.
+A \fIcheckitem\fP is a list of two single elements:
+.TP
+.B column_number
+is the data index number 'n' of the global variable \fBLINE\fP to be checked.
+The first element of the data has the number 1.
+.TP
+.B pattern
+is the regular expression to be matched.
+.PP
+The commands will only be executed on those lines that match all the \fIcheckitems\fP in the \fIchecklist\fP.
+
+.TP
+.B \fBdel_line\fP \fIchecklist\fP;
+Delete the line (global variable \fBLINE\fP) if \fIchecklist\fP is matched.
+
+Returns -1 if error, 0 if not match, 1 if match and changed.
+.TP
+.B rotate_comp \fIangle_col\fP, \fIangle\fP, \fIchecklist\fP;
+rotate the component the degrees given in \fIangle\fP parameter, if \fIchecklist\fP is matched.
+
+The angle column number is \fIangle_col\fP.
+
+Returns 1 if match and changed, 0 if not match, -1 if error.
+.TP
+.B subst_col_val \fIcol\fP, \fIvalue\fP, \fIchecklist\fP;
+Replace a column value by the new value \fIvalue\fP, if \fIchecklist\fP is matched.
+
+Returns 1 if match and changed, 0 if not match, -1 if error.
+
+.TP
+.B change_col_units \fIunits\fP, \fIcolumn_numbers\fP;
+Change units of a given column number. More than one column number can be specified.
+
+\fIUnits\fP is a string with the desired units. Only "mm" (milimeters), "in" (inches) and "mil" (thousands of an inch) are supported.
+
+It is required that numbers to be converted are followed their units (see supported units above). Otherwise, the number is not changed.
+
+.TP
+.B add_number_to_col \fIcol_number\fP, \fIvalue\fP, \fIchecklist\fP;
+Adds a number to the value in a given column number.
+Note: offset and the value to be changed can be in different units.
+
+Returns -1 if error, -2 if warning, and 1 if success.
+
+.TP
+.B translate_col_val \fIcol_number\fP, \fIstring\fP, \fIsubstitution\fP, \fIchecklist\fP;
+Translate a \fIstring\fP in the column \fIcol_number\fP if \fIchecklist\fP is matched.
+
+\fISubstitution\fP is an expression with the new string. Old column value can be used here.
+
+Returns -1 if error, 0 if not match, 1 if match and changed.
+
+Example:
+ translate 2, '^([0-9]+)n$','sprintf("%dnF",$1)', 3, 'C[0-9]+';
+ if the value in column 3 is C followed by a number, then
+ if the value in column 2 is a number followed by 'n', translate it to the same value followed by 'nF'.
+ If there is 'C10' in column 3 and '10n' in column 2,
+ change '10n' to '10nF'.
+
+.TP
+.B mul_col_val \fIcol_number\fP, \fIfactor\fP, \fIchecklist\fP;
+Multiply the number in the specified column number \fIcol_number\fP by the given \fIfactor\fP, if \fIchecklist\fP is matched.
+
+The number in the specified column number may have units at the end.
+
+Returns -1 if error, 0 if not match, 1 if match and changed.
+
+.TP
+.B swap_columns \fIcol_number1\fP, \fIcol_number2\fP, \fIchecklist\fP;
+Swap columns \fIcol_number1\fP and \fIcol_number2\fP if \fIchecklist\fP is matched.
+
+Returns -1 if error, 0 if not match, 1 if match and changed.
+
+.TP
+.B insert_column \fIcol_number\fP, \fInew_column_value\fP;
+Insert a new column in the given \fIcol_number\fP position (0 if it's going to be the first column), with the value \fInew_column_value\fP.
+
+Returns -1 if error, 1 if the new column was inserted.
+
+.SH "RETURN VALUE"
+The return value of \fBgxyrs\fP is an integer with the following possible values:
+.TP
+ 1 if the command found a match and the execution was succesful
+.PP
+ 0 if there was no match
+.PP
+ -1 if there was an error
+.PP
+ -2 if there was a warning
+.PP
+
+.SH FILES
+.TP
+.B XYRS files
+The format of these files is not standard, and depends on the application used to generate it.
+
+The data stored in these files is usually a header, and one line per component of the board.
+
+For each component, at least the following information is needed by assemblers:
+
+ - Reference
+
+ - Coordinates (X and Y)
+
+ - Rotation angle
+
+ - Side where the component is located (top or bottom)
+
+There can be more information, such as description, footprint, but this depends on the
+design program an its configuration.
+
+This information is organized in lines, one line per component, and each line is divided in as much fields or columns as needed.
+Field delimiters are used between columns, but field delimiters are not standardized and they depend on the program used to generate the XYRS file.
+
+The program that generates the XYRS file usually write a header (usually the first two or thre lines in the file) with a column title.
+
+\fBgxyrs\fP tries to guess the file format, and column numbers, based on this header. Thus, the known column titles are the following:
+
+ - for reference designator: \fIDesignator\fP, \fIRefDesignator\fP, \fIRefDes\fP.
+
+ - for footprint: \fIFootprint\fP, \fITopCell\fP, \fIDescription\fP (only if there is no other "TopCell" column title).
+
+ - for X coordinate: \fIMid X\fP, \fIX\fP.
+
+ - for Y coordinate: \fIMid Y\fP, \fIY\fP.
+
+ - for rotation angle: \fIRotation\fP, \fIrotation\fP, \fIRot\fP.
+
+ - for location side: \fITB\fP, \fISide\fP, \fItop/bottom\fP.
+
+ - for value: \fIComment\fP, \fIPartNumber\fP, \fIValue\fP.
+
+.TP
+.B Action files
+An action file contains a list of commands, using perl language, that can include any call to a built-in function or use any variable defined by \fIgxyrs\fP.
+
+Each action file should end with the following line (with a carrier return at the end of the line):
+
+ 1;
+
+.SH EXAMPLES
+.TP
+.B Run an action file:
+Run the action file \fIyour_comands.txt\fP with the XYRS file \fIyour_xyrs_file.txt\fP and write the output result to the file \fIoutput_file.txt\fP:
+
+ gxyrs your_xyrs_file.txt --adjust your_commands.txt --output output_file.txt
+.PP
+.TP
+.B Run a command specified in the command line:
+Run the commands \fIyour_commands\fP wiith the XYRS file \fIyour_xyrs_file.txt\fP and write the output result to the file \fIoutput_file.txt\fP:
+
+ gxyrs your_xyrs_file.txt --eval "your_commands" --output output_file.txt
+.PP
+
+.TP
+.B Delete some lines matching a pattern.
+Parse the XYRS file \fIyour_xyrs_file.txt\fP, delete all lines having a R followed by a number in column number 2, and write the output result to the file \fIoutput_file.txt\fP:
+
+ gxyrs your_xyrs_file.txt --eval "del 2, 'R[0-9]+';" --output output_file.txt
+.PP
+.TP
+.B Delete some lines matching a pattern, using the column number guessed by \fBgxyrs\fP.
+Parse the XYRS file \fIyour_xyrs_file.txt\fP, delete all lines having a R followed by a number in reference designator column, and write the output result to the file \fIoutput_file.txt\fP:
+
+ gxyrs your_xyrs_file.txt --eval "del \\$REF_COL, 'R[0-9]+';" --output output_file.txt
+.PP
+.TP
+.B Rotate some lines matching a pattern.
+Parse the XYRS file \fIyour_xyrs_file.txt\fP, rotate by 90º all lines having a R followed by a number in reference designator column, and write the output result to the file \fIoutput_file.txt\fP. Use the rotation and reference column number guessed by \fIgxyrs\fP:
+
+ gxyrs your_xyrs_file.txt --eval "rotate \\$ANGLE_COL, 90, \\$REF_COL, 'R[0-9]+';" --output output_file.txt
+.PP
+.TP
+.B Change all numbers to 'mm' units.
+Parse the XYRS file \fIyour_xyrs_file.txt\fP, convert all numbers in column 3 and 5 to its equivalent in mm, and write the output result to the file \fIoutput_file.txt\fP:
+
+ gxyrs your_xyrs_file.txt --eval "change_units 'mm', 3, 5;" --output output_file.txt
+.PP
+.TP
+.B Replace a value matching a pattern with another value.
+Parse the XYRS file \fIyour_xyrs_file.txt\fP, if the value in column 3 is "0.1u", then replace it with "100nF", and write the output result to the file \fIoutput_file.txt\fP:
+
+ gxyrs your_xyrs_file.txt --eval "subst 3 , '100nF', 3, '0.1u'" --output output_file.txt
+.PP
+.TP
+.B Change the reference of a component with a value matching a pattern.
+Parse the XYRS file \fIyour_xyrs_file.txt\fP, if the value in value column is "1n4148", then replace reference column with "D1", and write the output result to the file \fIoutput_file.txt\fP:
+
+ gxyrs your_xyrs_file.txt --eval "subst \\$REF_COL , 'D1', \\$VALUE_COL, '1n4148';" --output output_file.txt
+.PP
+
+.TP
+.B Adds an offset to the X coordinate of a component with a reference having a R followed by a number.
+Parse the XYRS file \fIyour_xyrs_file.txt\fP, if the text in reference column is R followed by a number, then adds 102.5mm to the value in X coordinate column, and write the output result to the file \fIoutput_file.txt\fP.
+
+Value in column 3 can be in other units (for example: '640mil'):
+
+ gxyrs your_xyrs_file.txt --eval "offset \\$X_COL, '102.5mm', \\$REF_COL, 'R[0-9]+' ;" --output output_file.txt
+.PP
+
+.TP
+.B Multiply the value of the X coordinate of a component by a number, if the component reference is having a R followed by a number.
+Parse the XYRS file \fIyour_xyrs_file.txt\fP, if the text in reference column is R followed by a number, then multiply the value in X coordinate column by 2.5, and write the output result to the file \fIoutput_file.txt\fP.
+
+Value in column 3 can be in other units (for example: '640mil'):
+
+ gxyrs your_xyrs_file.txt --eval "mul_col_val \\$X_COL, 2.5, \\$REF_COL, 'R[0-9]+' ;" --output output_file.txt
+.PP
+
+.TP
+.B Swap two columns.
+Parse the XYRS file \fIyour_xyrs_file.txt\fP, swap columns 3 and 4 if the text in column number 4 is R followed by a number, and write the output result to the file \fIoutput_file.txt\fP:
+
+ gxyrs your_xyrs_file.txt --eval "swap_columns 3, 4, 4, 'R[0-9]+' ;" --output output_file.txt
+.PP
+
+.TP
+.B Insert a column.
+Insert a column in the first position, displacing all existing columns to the right. Column value is 'new_column_value':
+
+ gxyrs your_xyrs_file.txt --eval "insert_column 0, 'new_column_value';" --output output_file.txt
+.PP
+
+.SH "SEE ALSO"
+.TP
+.B
+regex(7), GNU regular expression manual
+.PP
\ No newline at end of file
diff --git a/utils/man/.gitignore b/utils/man/.gitignore
deleted file mode 100644
index a4caef1..0000000
--- a/utils/man/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Makefile
-Makefile.in
-*~
-grenum.html
diff --git a/utils/man/Makefile.am b/utils/man/Makefile.am
deleted file mode 100644
index a86f50b..0000000
--- a/utils/man/Makefile.am
+++ /dev/null
@@ -1,26 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-dist_man_MANS = grenum.1 gxyrs.1
-
-
-# Rules for converting man->html
-html_man_files = grenum.html
-SUFFIXES = .1 .html
-
-if ENABLE_GROFF_HTML
-docsmandir=$(docdir)/man
-docsman_DATA=$(html_man_files)
-.1.html:
- rm -rf $@.tmp && \
- LC_NUMERIC=C $(GROFF) -man -T html $< >$@.tmp && \
- mv -f $@.tmp $@
-else
-.1.html:
- @echo "No working groff available: cannot create $@"
- @! :
-endif
-
-
-EXTRA_DIST = $(html_man_files)
-
-MAINTAINERCLEANFILES = Makefile.in $(html_man_files)
diff --git a/utils/man/grenum.1 b/utils/man/grenum.1
deleted file mode 100644
index 4bc1652..0000000
--- a/utils/man/grenum.1
+++ /dev/null
@@ -1,59 +0,0 @@
-.TH grenum 1 "February 14th, 2010" Version 1.6.1.20100214
-
-.SH NAME
-.B grenum
-\- An advanced refdes renumber utility
-
-.SH SYNOPSIS
-.B grenum
-[\-v\||\|\-\-version \-h\||\|\-\-help \-p\||\|\-\-pagejump]
-.I infile1.sch infile2.sch
-\|.\|.\|.
-
-
-.SH DESCRIPTION
-
-The
-.B grenum
-program will renumber the refdes definitions read from
-.I infile\|.
-
-.SH OPTIONS
-.TP
-\-p, \-\-pagejump
-This will switch on the page jump mode. It means that refdes's from each
-.I inputfile
-gets renumbered from 100,200... etc.
-.TP
-\-v, \-\-version
-prints version information
-.TP
-\-h, \-\-help
-prints help message
-
-.SH RETURN VALUE
-.B grenum
-will return
-.B 0
-if all files processed successfully,
-.B 1
-if there was no input file specified,
-.B 2
-if I/O files can't be opened/written,
-.B 3
-if there is parse error in input file,
-.B 4
-if there is not enough memory to store refdes prefixes.
-.SH BUGS
-
-If you find one, please report it to:
-
-.SH AUTHOR
-
-Levente Kovacs
-
-Levente.Kovacs@xxxxxxxxxxxx
-
-.SH SEE ALSO
-
-.B gschem(1)
diff --git a/utils/man/gxyrs.1 b/utils/man/gxyrs.1
deleted file mode 100644
index 2f2dc73..0000000
--- a/utils/man/gxyrs.1
+++ /dev/null
@@ -1,330 +0,0 @@
-.\"Created with GNOME Manpages Editor Wizard
-.\"http://sourceforge.net/projects/gmanedit2
-.TH \fBgxyrs\fP 1 "Agosto 22, 2010" "" "\fBgxyrs\fP"
-
-.SH NAME
-\fBgxyrs\fP \- is a program to batch process XYRS files.
-
-.SH SYNOPSIS
-.B \fBgxyrs\fP
-.RI \fBfile\fP
-.RI [OPTIONS]
-.br
-
-.SH DESCRIPTION
-XYRS files are usually generated by PCB design programs, and are used by board assemblers.
-.PP
-Format of XYRS files is discussed in FILES section.
-.PP
-Processing of these files is often needed by board assemblers or designers to suit their
-process and tools flows.
-.PP
-\fBgxyrs\fP helps batch-processing these files. Rules and commands can be defined to make
-batch-processing easy.
-.PP
-\fBgxyrs\fP consists on a perl library providing the core functions, and a perl script providing some basic functionality.
-.PP
-It takes some arguments from the command line: input and output files, some modifiers, and an action-file or an action-string.
-.PP
-The action-file or action-script contains some commands. For every line of the input file, \fBgxyrs\fP executes those commands, which can modify the contents of the line,
-and then writes the resulting line to the output file.
-.PP
-Since \fBgxyrs\fP is written in perl, actions are also written in this language.
-
-.SH OPTIONS
-.B
-.IP --help
-Display a usage message on standard output and exit successfully.
-.BI \--verbose
-Display more information messages when processing files.
-.TP
-.BI \--process-comments
-By default, gxyrs doesn't process lines starting with '*' and '#' characters.
-
-It just copies these lines to the output, without further processing.
-
-With this option, it processes these lines as well.
-.TP
-.BI \--tabulate
-Give each field in the output file a fixed length, enough to contain the longest string.
- Using this option make the output file easier to read by humans.
-.TP
-.BI \--caseinsensitive
-Ignore case distinctions when comparing patterns.
-.TP
-.BI \--adjust "\| FILE\ "
-File with the commands to process the input file.
-.TP
-.BI \--eval "\| PATTERN\ "
-Interpret PATTERN as the commands to process the input file.
-.TP
-.BI \--output "\| FILE\ "
-Save the output to the specified FILE.
-
-If FILE string is "-" (without double quotes), then output is redirected to standard output STDOUT.
-.TP
-.BI \--output-delimiter "\| CHAR\ "
-Use the given CHAR as an output field delimiter.
-
-.SH "PREDEFINED VARIABLES"
-.PP
-gxyrs defines automatically the following variables:
-.PP
-.TP
-.B REF_COL
-column number (starting at 0) where the component reference is.
-.TP
-.B FOOTPRINT_COL
-column number (starting at 0) where the component footprint is.
-.TP
-.B X_COL
-column number (starting at 0) where the component's X location coordinate is.
-.TP
-.B Y_COL
-column number (starting at 0) where the component's Y location coordinate is.
-.TP
-.B ANGLE_COL
-column number (starting at 0) where the component rotation angle is.
-.TP
-.B LAYER_COL
-column number (starting at 0) where the component's layer side location is.
-.TP
-.B VALUE_COL
-column number (starting at 0) where the component's value is. Usually this is the component's part number.
-.TP
-.B LINE_NUMBER
-this is the line number of the input file that is being currently processed.
-.TP
-.B LINE
-array where each array element is a field or column of the input file's line being processed.
-.SH "BUILTIN COMMANDS"
-All the following commands accept a \fIchecklist\fP parameter.
-A \fIchecklist\fP is a list of one or more \fIcheck_items\fP.
-A \fIcheckitem\fP is a list of two single elements:
-.TP
-.B column_number
-is the data index number 'n' of the global variable \fBLINE\fP to be checked.
-The first element of the data has the number 1.
-.TP
-.B pattern
-is the regular expression to be matched.
-.PP
-The commands will only be executed on those lines that match all the \fIcheckitems\fP in the \fIchecklist\fP.
-
-.TP
-.B \fBdel_line\fP \fIchecklist\fP;
-Delete the line (global variable \fBLINE\fP) if \fIchecklist\fP is matched.
-
-Returns -1 if error, 0 if not match, 1 if match and changed.
-.TP
-.B rotate_comp \fIangle_col\fP, \fIangle\fP, \fIchecklist\fP;
-rotate the component the degrees given in \fIangle\fP parameter, if \fIchecklist\fP is matched.
-
-The angle column number is \fIangle_col\fP.
-
-Returns 1 if match and changed, 0 if not match, -1 if error.
-.TP
-.B subst_col_val \fIcol\fP, \fIvalue\fP, \fIchecklist\fP;
-Replace a column value by the new value \fIvalue\fP, if \fIchecklist\fP is matched.
-
-Returns 1 if match and changed, 0 if not match, -1 if error.
-
-.TP
-.B change_col_units \fIunits\fP, \fIcolumn_numbers\fP;
-Change units of a given column number. More than one column number can be specified.
-
-\fIUnits\fP is a string with the desired units. Only "mm" (milimeters), "in" (inches) and "mil" (thousands of an inch) are supported.
-
-It is required that numbers to be converted are followed their units (see supported units above). Otherwise, the number is not changed.
-
-.TP
-.B add_number_to_col \fIcol_number\fP, \fIvalue\fP, \fIchecklist\fP;
-Adds a number to the value in a given column number.
-Note: offset and the value to be changed can be in different units.
-
-Returns -1 if error, -2 if warning, and 1 if success.
-
-.TP
-.B translate_col_val \fIcol_number\fP, \fIstring\fP, \fIsubstitution\fP, \fIchecklist\fP;
-Translate a \fIstring\fP in the column \fIcol_number\fP if \fIchecklist\fP is matched.
-
-\fISubstitution\fP is an expression with the new string. Old column value can be used here.
-
-Returns -1 if error, 0 if not match, 1 if match and changed.
-
-Example:
- translate 2, '^([0-9]+)n$','sprintf("%dnF",$1)', 3, 'C[0-9]+';
- if the value in column 3 is C followed by a number, then
- if the value in column 2 is a number followed by 'n', translate it to the same value followed by 'nF'.
- If there is 'C10' in column 3 and '10n' in column 2,
- change '10n' to '10nF'.
-
-.TP
-.B mul_col_val \fIcol_number\fP, \fIfactor\fP, \fIchecklist\fP;
-Multiply the number in the specified column number \fIcol_number\fP by the given \fIfactor\fP, if \fIchecklist\fP is matched.
-
-The number in the specified column number may have units at the end.
-
-Returns -1 if error, 0 if not match, 1 if match and changed.
-
-.TP
-.B swap_columns \fIcol_number1\fP, \fIcol_number2\fP, \fIchecklist\fP;
-Swap columns \fIcol_number1\fP and \fIcol_number2\fP if \fIchecklist\fP is matched.
-
-Returns -1 if error, 0 if not match, 1 if match and changed.
-
-.TP
-.B insert_column \fIcol_number\fP, \fInew_column_value\fP;
-Insert a new column in the given \fIcol_number\fP position (0 if it's going to be the first column), with the value \fInew_column_value\fP.
-
-Returns -1 if error, 1 if the new column was inserted.
-
-.SH "RETURN VALUE"
-The return value of \fBgxyrs\fP is an integer with the following possible values:
-.TP
- 1 if the command found a match and the execution was succesful
-.PP
- 0 if there was no match
-.PP
- -1 if there was an error
-.PP
- -2 if there was a warning
-.PP
-
-.SH FILES
-.TP
-.B XYRS files
-The format of these files is not standard, and depends on the application used to generate it.
-
-The data stored in these files is usually a header, and one line per component of the board.
-
-For each component, at least the following information is needed by assemblers:
-
- - Reference
-
- - Coordinates (X and Y)
-
- - Rotation angle
-
- - Side where the component is located (top or bottom)
-
-There can be more information, such as description, footprint, but this depends on the
-design program an its configuration.
-
-This information is organized in lines, one line per component, and each line is divided in as much fields or columns as needed.
-Field delimiters are used between columns, but field delimiters are not standardized and they depend on the program used to generate the XYRS file.
-
-The program that generates the XYRS file usually write a header (usually the first two or thre lines in the file) with a column title.
-
-\fBgxyrs\fP tries to guess the file format, and column numbers, based on this header. Thus, the known column titles are the following:
-
- - for reference designator: \fIDesignator\fP, \fIRefDesignator\fP, \fIRefDes\fP.
-
- - for footprint: \fIFootprint\fP, \fITopCell\fP, \fIDescription\fP (only if there is no other "TopCell" column title).
-
- - for X coordinate: \fIMid X\fP, \fIX\fP.
-
- - for Y coordinate: \fIMid Y\fP, \fIY\fP.
-
- - for rotation angle: \fIRotation\fP, \fIrotation\fP, \fIRot\fP.
-
- - for location side: \fITB\fP, \fISide\fP, \fItop/bottom\fP.
-
- - for value: \fIComment\fP, \fIPartNumber\fP, \fIValue\fP.
-
-.TP
-.B Action files
-An action file contains a list of commands, using perl language, that can include any call to a built-in function or use any variable defined by \fIgxyrs\fP.
-
-Each action file should end with the following line (with a carrier return at the end of the line):
-
- 1;
-
-.SH EXAMPLES
-.TP
-.B Run an action file:
-Run the action file \fIyour_comands.txt\fP with the XYRS file \fIyour_xyrs_file.txt\fP and write the output result to the file \fIoutput_file.txt\fP:
-
- gxyrs your_xyrs_file.txt --adjust your_commands.txt --output output_file.txt
-.PP
-.TP
-.B Run a command specified in the command line:
-Run the commands \fIyour_commands\fP wiith the XYRS file \fIyour_xyrs_file.txt\fP and write the output result to the file \fIoutput_file.txt\fP:
-
- gxyrs your_xyrs_file.txt --eval "your_commands" --output output_file.txt
-.PP
-
-.TP
-.B Delete some lines matching a pattern.
-Parse the XYRS file \fIyour_xyrs_file.txt\fP, delete all lines having a R followed by a number in column number 2, and write the output result to the file \fIoutput_file.txt\fP:
-
- gxyrs your_xyrs_file.txt --eval "del 2, 'R[0-9]+';" --output output_file.txt
-.PP
-.TP
-.B Delete some lines matching a pattern, using the column number guessed by \fBgxyrs\fP.
-Parse the XYRS file \fIyour_xyrs_file.txt\fP, delete all lines having a R followed by a number in reference designator column, and write the output result to the file \fIoutput_file.txt\fP:
-
- gxyrs your_xyrs_file.txt --eval "del \\$REF_COL, 'R[0-9]+';" --output output_file.txt
-.PP
-.TP
-.B Rotate some lines matching a pattern.
-Parse the XYRS file \fIyour_xyrs_file.txt\fP, rotate by 90º all lines having a R followed by a number in reference designator column, and write the output result to the file \fIoutput_file.txt\fP. Use the rotation and reference column number guessed by \fIgxyrs\fP:
-
- gxyrs your_xyrs_file.txt --eval "rotate \\$ANGLE_COL, 90, \\$REF_COL, 'R[0-9]+';" --output output_file.txt
-.PP
-.TP
-.B Change all numbers to 'mm' units.
-Parse the XYRS file \fIyour_xyrs_file.txt\fP, convert all numbers in column 3 and 5 to its equivalent in mm, and write the output result to the file \fIoutput_file.txt\fP:
-
- gxyrs your_xyrs_file.txt --eval "change_units 'mm', 3, 5;" --output output_file.txt
-.PP
-.TP
-.B Replace a value matching a pattern with another value.
-Parse the XYRS file \fIyour_xyrs_file.txt\fP, if the value in column 3 is "0.1u", then replace it with "100nF", and write the output result to the file \fIoutput_file.txt\fP:
-
- gxyrs your_xyrs_file.txt --eval "subst 3 , '100nF', 3, '0.1u'" --output output_file.txt
-.PP
-.TP
-.B Change the reference of a component with a value matching a pattern.
-Parse the XYRS file \fIyour_xyrs_file.txt\fP, if the value in value column is "1n4148", then replace reference column with "D1", and write the output result to the file \fIoutput_file.txt\fP:
-
- gxyrs your_xyrs_file.txt --eval "subst \\$REF_COL , 'D1', \\$VALUE_COL, '1n4148';" --output output_file.txt
-.PP
-
-.TP
-.B Adds an offset to the X coordinate of a component with a reference having a R followed by a number.
-Parse the XYRS file \fIyour_xyrs_file.txt\fP, if the text in reference column is R followed by a number, then adds 102.5mm to the value in X coordinate column, and write the output result to the file \fIoutput_file.txt\fP.
-
-Value in column 3 can be in other units (for example: '640mil'):
-
- gxyrs your_xyrs_file.txt --eval "offset \\$X_COL, '102.5mm', \\$REF_COL, 'R[0-9]+' ;" --output output_file.txt
-.PP
-
-.TP
-.B Multiply the value of the X coordinate of a component by a number, if the component reference is having a R followed by a number.
-Parse the XYRS file \fIyour_xyrs_file.txt\fP, if the text in reference column is R followed by a number, then multiply the value in X coordinate column by 2.5, and write the output result to the file \fIoutput_file.txt\fP.
-
-Value in column 3 can be in other units (for example: '640mil'):
-
- gxyrs your_xyrs_file.txt --eval "mul_col_val \\$X_COL, 2.5, \\$REF_COL, 'R[0-9]+' ;" --output output_file.txt
-.PP
-
-.TP
-.B Swap two columns.
-Parse the XYRS file \fIyour_xyrs_file.txt\fP, swap columns 3 and 4 if the text in column number 4 is R followed by a number, and write the output result to the file \fIoutput_file.txt\fP:
-
- gxyrs your_xyrs_file.txt --eval "swap_columns 3, 4, 4, 'R[0-9]+' ;" --output output_file.txt
-.PP
-
-.TP
-.B Insert a column.
-Insert a column in the first position, displacing all existing columns to the right. Column value is 'new_column_value':
-
- gxyrs your_xyrs_file.txt --eval "insert_column 0, 'new_column_value';" --output output_file.txt
-.PP
-
-.SH "SEE ALSO"
-.TP
-.B
-regex(7), GNU regular expression manual
-.PP
\ No newline at end of file
commit 7256891e6800b47f29fa9e6f2bbc0507a887fb98
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
gattrib: Add man page.
diff --git a/gattrib/docs/.gitignore b/gattrib/docs/.gitignore
index fae61eb..e9d810a 100644
--- a/gattrib/docs/.gitignore
+++ b/gattrib/docs/.gitignore
@@ -3,3 +3,4 @@ Makefile.in
html
latex
*~
+gattrib.html
diff --git a/gattrib/docs/Makefile.am b/gattrib/docs/Makefile.am
index 61809ec..885eb2b 100644
--- a/gattrib/docs/Makefile.am
+++ b/gattrib/docs/Makefile.am
@@ -1,5 +1,3 @@
-SUFFIXES = .html
-
EXTRA_DIST = gattrib.dox what-is-gattrib.html what-is-geda.html \
gattrib-main.txt logo.png
@@ -15,6 +13,26 @@ else
@echo 'The documentation cannot be built from the sources.'
endif
+dist_man_MANS = gattrib.1
+
+
+# Rules for converting man->html
+html_man_files = gattrib.html
+SUFFIXES = .1 .html
+
+if ENABLE_GROFF_HTML
+docsmandir=$(docdir)/man
+dist_docsman_DATA=$(html_man_files)
+.1.html:
+ rm -rf $@.tmp && \
+ LC_NUMERIC=C $(GROFF) -man -T html $< >$@.tmp && \
+ mv -f $@.tmp $@
+else
+.1.html:
+ @echo "No working groff available: cannot create $@"
+ @! :
+endif
+
MOSTLYCLEANFILES = *.log *~
CLEANFILES = *.log *~
DISTCLEANFILES = *.log
diff --git a/gattrib/docs/gattrib.1 b/gattrib/docs/gattrib.1
new file mode 100644
index 0000000..6096e1c
--- /dev/null
+++ b/gattrib/docs/gattrib.1
@@ -0,0 +1,48 @@
+.TH gattrib 1 "January 5th, 2011" "gEDA Project" 1.6.1.20100214
+.SH NAME
+gattrib - gEDA/gaf Schematic Attribute Editor
+.SH SYNOPSIS
+.B gattrib
+[\fIOPTION\fR ...] [\fIFILE\fR ...]
+.SH DESCRIPTION
+.PP
+\fBgattrib\fR is a spreadsheet-like tool for bulk editing of
+attributes in gEDA schematics, usually created in \fBgschem\fR(1).
+.PP
+If no \fIFILE\fRs to open are specified on the command line,
+\fBgattrib\fR will display a file selector dialog on startup.
+
+.SH OPTIONS
+.TP 8
+\fB-q\fR, \fB--quiet\fR
+Quiet mode. Turn off all warnings/notes/messages.
+.TP 8
+\fB-v\fR, \fB--verbose\fR
+Verbose mode. Output all diagnostic information.
+.TP 8
+\fB-h\fR, \fB--help\fR
+Print a help message.
+
+.SH ENVIRONMENT
+.TP 8
+.B GEDADATA
+specifies the search directory for Scheme and rc files. The default
+is `${prefix}/share/gEDA'.
+.TP 8
+.B GEDADATARC
+specifies the search directory for rc files. The default is `$GEDADATA'.
+
+.SH AUTHORS
+See the `AUTHORS' file included with this program.
+
+.SH COPYRIGHT
+.nf
+Copyright \(co 1999-2011 gEDA Contributors. License GPLv2+: GNU GPL
+version 2 or later. Please see the `COPYING' file included with this
+program for full details.
+.PP
+This is free software: you are free to change and redistribute it.
+There is NO WARRANTY, to the extent permitted by law.
+
+.SH SEE ALSO
+\fBgschem\fR(1)
commit cc2ea46161c1994b3cb294c81154be3656f7c81e
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
gnetlist: Remove options specific to `spice-sdb' backend.
The gnetlist `-e', `-I', `-n' and `-s' command-line options are only
used by the `spice-sdb' backend. They have equivalents based on the
`-O' option. Remove them.
Acked-by: Stuart Brorson <sdb@xxxxxxxxxx>
diff --git a/NEWS b/NEWS
index 4c8dfe2..d57e893 100644
--- a/NEWS
+++ b/NEWS
@@ -49,6 +49,15 @@ Notable changes in gEDA/gaf 1.7.0
* Several changes to `gnetlist' command-line options:
+ - Four command-line options specific to the `spice-sdb' backend have
+ been removed. They can be replaced with `-O <option>' according
+ to the following table:
+
+ -e, --embedd -O embedd_mode
+ -I, --include -O include_mode
+ -n, --nomunge -O nomunge_mode
+ -s, --sort -O sort_mode
+
- The list of available backends is now obtained using a new
`--list-backends' option. `-g help' no longer outputs a list of
backends.
diff --git a/gnetlist/docs/gnetlist.1 b/gnetlist/docs/gnetlist.1
index 784ea3e..a20edb1 100644
--- a/gnetlist/docs/gnetlist.1
+++ b/gnetlist/docs/gnetlist.1
@@ -76,23 +76,6 @@ Print \fBgnetlist\fR version information.
Treat all remaining arguments as schematic filenames. Use this if you
have a schematic filename which begins with `-'.
-.SH BACKEND-SPECIFIC OPTIONS
-.PP
-The following options are ignored unless using the `spice-sdb' backend:
-.TP 8
-\fB-e\fR, \fB--embedd\fR
-Force embedding contents of `.include' files.
-.TP 8
-\fB-n\fR, \fB--nomunge\fR
-Do not autocorrect the refdes attributes.
-.TP 8
-\fB-I\fR, \fB--include\fR
-Put .INCLUDE <filename> in output file instead of model file's contents.
-.TP 8
-\fB-s\fR
-Sorts netlist output for better compatibility with \fBgnucap\fR(1).
-Equivalent to `-O sort_mode'.
-
.SH BACKENDS
.PP
Currently, \fBgnetlist\fR includes the following backends:
diff --git a/gnetlist/include/globals.h b/gnetlist/include/globals.h
index 90425a2..974d38e 100644
--- a/gnetlist/include/globals.h
+++ b/gnetlist/include/globals.h
@@ -31,12 +31,8 @@ extern char *guile_proc;
extern int list_backends;
extern int verbose_mode;
extern int interactive_mode;
-extern int include_mode;
extern int quiet_mode;
extern int netlist_mode;
-extern int sort_mode;
-extern int embedd_mode;
-extern int nomunge_mode;
extern char *output_filename;
extern SCM pre_rc_list; /* before rc loaded */
extern SCM pre_backend_list; /* before backend loaded */
diff --git a/gnetlist/src/globals.c b/gnetlist/src/globals.c
index ee6101c..e352e8f 100644
--- a/gnetlist/src/globals.c
+++ b/gnetlist/src/globals.c
@@ -48,10 +48,6 @@ int list_backends=FALSE;
int verbose_mode=FALSE;
int interactive_mode=FALSE;
int quiet_mode=FALSE;
-int sort_mode=FALSE;
-int include_mode=FALSE;
-int embedd_mode=FALSE;
-int nomunge_mode = FALSE;
/* what kind of netlist are we generating? see define.h for #defs */
int netlist_mode=gEDA;
diff --git a/gnetlist/src/parsecmd.c b/gnetlist/src/parsecmd.c
index 1fba9a9..6166f43 100644
--- a/gnetlist/src/parsecmd.c
+++ b/gnetlist/src/parsecmd.c
@@ -42,7 +42,7 @@
#include <dmalloc.h>
#endif
-#define OPTIONS "c:eg:hiIl:L:m:o:O:nqsvV"
+#define OPTIONS "c:g:hil:L:m:o:O:qvV"
#ifndef OPTARG_IN_UNISTD
extern char *optarg;
@@ -56,12 +56,8 @@ struct option long_options[] =
{
{"help", 0, 0, 'h'},
{"list-backends", 0, &list_backends, TRUE},
- {"nomunge", 0, 0, 'n'},
{"verbose", 0, 0, 'v'},
{"version", 0, 0, 'V'},
- {"sort", 0, 0, 's'},
- {"embedd", 0, 0, 'e'},
- {"include", 0, 0, 'I'},
{0, 0, 0, 0}
};
#endif
@@ -90,11 +86,6 @@ void usage(char *cmd)
" -V, --version Show version information.\n"
" -- Treat all remaining arguments as filenames.\n"
"\n"
-"Backend-specific options:\n"
-" -e, --embedd Force embedding of .include file contents (spice-sdb).\n"
-" -n, --nomunge Do not autocorrect component refdes (spice-sdb).\n"
-" -s, --sort Sort output netlist (spice-sdb).\n"
-"\n"
"Report bugs to <geda-bug@xxxxxxxx>.\n"
"gEDA/gaf homepage: <http://gpleda.org>\n",
cmd);
@@ -166,16 +157,6 @@ parse_commandline (int argc, char *argv[])
interactive_mode = TRUE;
break;
- case 'I':
- backend_params = g_slist_append(backend_params, "include_mode");
- include_mode = TRUE;
- break;
-
- case 'e':
- backend_params = g_slist_append(backend_params, "embedd_mode");
- embedd_mode = TRUE;
- break;
-
case 'q':
backend_params = g_slist_append(backend_params, "quiet_mode");
quiet_mode = TRUE;
@@ -214,11 +195,6 @@ parse_commandline (int argc, char *argv[])
post_backend_list);
break;
- case 'n':
- backend_params = g_slist_append(backend_params, "nomunge_mode");
- nomunge_mode = TRUE;
- break;
-
case 'o':
g_free(output_filename);
output_filename = g_strdup(optarg);
@@ -236,11 +212,6 @@ parse_commandline (int argc, char *argv[])
(void *) optarg);
break;
- case 's':
- backend_params = g_slist_append(backend_params, "sort_mode");
- sort_mode = TRUE;
- break;
-
case 'h':
usage(argv[0]);
break;
diff --git a/gnetlist/tests/common/tests.list b/gnetlist/tests/common/tests.list
index 5e81fd5..db1072a 100644
--- a/gnetlist/tests/common/tests.list
+++ b/gnetlist/tests/common/tests.list
@@ -19,18 +19,18 @@ singlenet | singlenet.sch | | |
# The two stage amp
TwoStageAmp | TwoStageAmp.sch | Simulation.cmd gafrc models/2N3904.mod sym/transistor.sym | |
-TwoStageAmp_Include | TwoStageAmp.sch | Simulation.cmd gafrc models/2N3904.mod sym/transistor.sym | -I
-TwoStageAmp_Sort | TwoStageAmp.sch | Simulation.cmd gafrc models/2N3904.mod sym/transistor.sym | -s
+TwoStageAmp_Include | TwoStageAmp.sch | Simulation.cmd gafrc models/2N3904.mod sym/transistor.sym | -O include_mode
+TwoStageAmp_Sort | TwoStageAmp.sch | Simulation.cmd gafrc models/2N3904.mod sym/transistor.sym | -O sort_mode
# John Doty's test circuit
# First test mangling
JD | LVDfoo.sch | gafrc models/openIP_5.cir sym/LVD.sym | |
-JD_Include | LVDfoo.sch | gafrc models/openIP_5.cir sym/LVD.sym | -I
-JD_Sort | LVDfoo.sch | gafrc models/openIP_5.cir sym/LVD.sym | -s
+JD_Include | LVDfoo.sch | gafrc models/openIP_5.cir sym/LVD.sym | -O include_mode
+JD_Sort | LVDfoo.sch | gafrc models/openIP_5.cir sym/LVD.sym | -O sort_mode
# Now test non-munged version.
-JD_nomunge | LVDfoo.sch | gafrc models/openIP_5.cir sym/LVD.sym | -n
-JD_Include_nomunge | LVDfoo.sch | gafrc models/openIP_5.cir sym/LVD.sym | -I -n
-JD_Sort_nomunge | LVDfoo.sch | gafrc models/openIP_5.cir sym/LVD.sym | -s -n
+JD_nomunge | LVDfoo.sch | gafrc models/openIP_5.cir sym/LVD.sym | -O nomunge_mode
+JD_Include_nomunge | LVDfoo.sch | gafrc models/openIP_5.cir sym/LVD.sym | -O include_mode -O nomunge_mode
+JD_Sort_nomunge | LVDfoo.sch | gafrc models/openIP_5.cir sym/LVD.sym | -O sort_mode -O nomunge_mode
# Tests for slotted parts
SlottedOpamps | SlottedOpamps.sch | gafrc sym/LM324_slotted-1.sym | |
commit 9e18ec2b836e1c5729b5d7381ed3e545ab5aab1a
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
gnetlist: Exit if a Scheme error occurs.
If a Scheme error occurs, gnetlist ignores it silently apart from
printing a message to the log file. This is not a good thing.
This patch makes Scheme errors stop gnetlist noisily. The error
messages could be improved, but they're better than nothing.
diff --git a/gnetlist/src/gnetlist.c b/gnetlist/src/gnetlist.c
index 30354ad..fb89d63 100644
--- a/gnetlist/src/gnetlist.c
+++ b/gnetlist/src/gnetlist.c
@@ -187,7 +187,7 @@ void main_prog(void *closure, int argc, char *argv[])
/* Evaluate Scheme expressions that need to be run before rc files
* are loaded. */
- g_scm_eval_protected (pre_rc_list, scm_current_module ());
+ scm_eval_x (pre_rc_list, scm_current_module ());
g_rc_parse(pr_current, "gnetlistrc", rc_filename);
/* immediately setup user params */
@@ -202,7 +202,7 @@ void main_prog(void *closure, int argc, char *argv[])
/* Evaluate the first set of Scheme expressions before we load any
* schematic files */
- g_scm_eval_protected (pre_backend_list, scm_current_module ());
+ scm_eval_x (pre_backend_list, scm_current_module ());
i = argv_index;
while (argv[i] != NULL) {
@@ -278,7 +278,7 @@ void main_prog(void *closure, int argc, char *argv[])
scm_primitive_load (s_backend_path);
/* Evaluate second set of Scheme expressions. */
- g_scm_eval_protected (post_backend_list, scm_current_module ());
+ scm_eval_x (post_backend_list, scm_current_module ());
}
s_traverse_init();
commit f5e8bbd51c7bc4653e74f58657ba25a93906fa8b
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
Update NEWS.
Add info on new `--list-backends' option to gnetlist (missed out from
commit ae45df48397e).
diff --git a/NEWS b/NEWS
index 2c7a82b..4c8dfe2 100644
--- a/NEWS
+++ b/NEWS
@@ -49,6 +49,10 @@ Notable changes in gEDA/gaf 1.7.0
* Several changes to `gnetlist' command-line options:
+ - The list of available backends is now obtained using a new
+ `--list-backends' option. `-g help' no longer outputs a list of
+ backends.
+
- A new `-L' option is available, which adds a directory to the
Scheme load path.
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs