From b548a6abb0a514bdd4f50f1e0dee1be9707d81f6 Mon Sep 17 00:00:00 2001
From: Guilherme Brondani Torri <guitorri@gmail.com>
Date: Mon, 21 Nov 2016 22:00:20 +0100
Subject: [PATCH 01/13] changelog: fix spelling typos

---
 ChangeLog | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2ae7aff..d1d4d38 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,5 @@
 adms-2.3.6:
- * Fix parser for parameter lists in subdevice instanciation.
+ * Fix parser for parameter lists in subdevice instantiation.
  * Remove duplicated constants on provided headers.
  * Fix crash on x64 when printing the message about standard headers.
 
@@ -20,11 +20,11 @@ adms-2.3.5:
  * Autotools, add back support for static and shared libraries build.
    * Build shared libraries by default. Tested on Linux, Mac OSX, and MSYS2.
      See the configure --disable-shared flag to change that.
-   * CMake contiues to builds static libraries only.
+   * CMake continues to builds static libraries only.
 
  * Fix out-of-tree build for Autotools and CMake.
 
- * Check scaling factors againd LRM v2.4.0
+ * Check scaling factors against LRM v2.4.0
    * Add missing K scaling (uppercase kilo)
    * standard scale_factor T|G|M|K|k|m|u|n|p|f|a
    * Add testset (va and xml files) to test the scaling factors
@@ -49,7 +49,7 @@ adms-2.3.4:
 	 * avoid spurious fatal error from an included file which last line contains
 	 onlywhite space.
  * preprocessorYacc.y:
-   * fix BSIM6 parse problem, string macro arg broken by continuator
+   * fix BSIM6 parse problem, string macro arg broken by line continuation
      caused 'unexpected end-of-line' error.
  * verilogLex.l:
 	 * Change string recognition to allow embedded \" as literal quote

From 7c78bb809f1973c659aa737cc570f2dc535e7fd7 Mon Sep 17 00:00:00 2001
From: Guilherme Brondani Torri <guitorri@gmail.com>
Date: Fri, 31 Mar 2017 23:47:36 +0200
Subject: [PATCH 02/13] constants: fix P_U0 name

---
 admsXml/constants.vams | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admsXml/constants.vams b/admsXml/constants.vams
index 1237a24..88df0e6 100644
--- a/admsXml/constants.vams
+++ b/admsXml/constants.vams
@@ -46,6 +46,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 `define M_LN10 2.30258509299404568401
 `define P_C 299792458 // m / s
 `define P_H 6.62607004081e-34 //planck constant. in \text{ J⋅s}
-`define P_MU0 1.2566370614e-6 // v. perm.  H / m or T·m / A or Wb / (A·m) or V·s / (A·m)
+`define P_U0 1.2566370614e-6 // v. perm.  H / m or T·m / A or Wb / (A·m) or V·s / (A·m)
 
 `endif // CONSTANTS_VAMS

From 964d783ed68bd967c057203f41ce26b108cbb7b9 Mon Sep 17 00:00:00 2001
From: Guilherme Brondani Torri <guitorri@gmail.com>
Date: Sun, 18 Mar 2018 21:24:20 +0100
Subject: [PATCH 03/13] implicit: add $port_connected()

Patch provided by ngspice team.
---
 admsXml/adms.implicit.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/admsXml/adms.implicit.xml b/admsXml/adms.implicit.xml
index 6ca8b36..c2b2d7a 100644
--- a/admsXml/adms.implicit.xml
+++ b/admsXml/adms.implicit.xml
@@ -156,6 +156,9 @@
             </admst:otherwise>
           </admst:choose>
         </admst:when>
+        <admst:when test="[name='\$port_connected']">
+          <admst:value-to select="dependency" string="constant"/>
+        </admst:when>
         <admst:otherwise>
           <admst:apply-templates select="arguments" match="e:dependency"/>
           <admst:choose>
@@ -191,6 +194,7 @@
           name='idt' or
           name='ddt' or
           name='\$param_given' or
+          name='\$port_connected' or
           name='\$given' or
           name='ddx' or
           name='flicker_noise' or

From a8387f0d3c61e77aab6849cd1c24cae970b1a602 Mon Sep 17 00:00:00 2001
From: Ricardo Fantin da Costa <ricardofantin@gmail.com>
Date: Sun, 20 May 2018 16:01:41 -0300
Subject: [PATCH 04/13] Remove the Maintainer mode

---
 .appveyor.yml          |   2 +-
 .travis.yml            |   4 +-
 CMakeLists.txt         |  22 +++----
 README.md              |  18 +++---
 admsXml/CMakeLists.txt | 134 ++++++++++++++++++++---------------------
 admsXml/Makefile.am    |   8 ---
 configure.ac           |  29 +++------
 7 files changed, 92 insertions(+), 125 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index fc62c1f..e1ed8d0 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -28,7 +28,7 @@ build_script:
 
   ## Build
   - bash -lc "exec 0</dev/null && cd $APPVEYOR_BUILD_FOLDER && ./bootstrap.sh"
-  - bash -lc "exec 0</dev/null && cd $APPVEYOR_BUILD_FOLDER && ./configure --enable-maintainer-mode --prefix=/c/adms-win%MBITS% --disable-shared"
+  - bash -lc "exec 0</dev/null && cd $APPVEYOR_BUILD_FOLDER && ./configure --prefix=/c/adms-win%MBITS% --disable-shared"
   - bash -lc "exec 0</dev/null && cd $APPVEYOR_BUILD_FOLDER && make distcheck"
   - bash -lc "exec 0</dev/null && cd $APPVEYOR_BUILD_FOLDER && make install"
 
diff --git a/.travis.yml b/.travis.yml
index 2cef293..e92ec9c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,13 +28,13 @@ script:
   - case $BUILD_SYSTEM in
       autotools)
         ./bootstrap.sh &&
-        ./configure --enable-maintainer-mode --prefix=/usr &&
+        ./configure --prefix=/usr &&
         make distcheck &&
         sudo make install
         ;;
       cmake)
         mkdir build && cd build &&
-        cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DUSE_MAINTAINER_MODE=ON &&
+        cmake .. -DCMAKE_INSTALL_PREFIX=/usr &&
         make &&
         sudo make install
         ;;
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a78a738..1796144 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -31,8 +31,6 @@ SET(PACKAGE_NAME "adms")
 SET(PACKAGE_VERSION "2.3.6")
 SET(PACKAGE_BUGREPORT "qucs-bugs@lists.sourceforge.net")
 
-OPTION ( USE_MAINTAINER_MODE "Enable generation of code (parser source) from Perl scripts." OFF )
-
 # Default to static libs ( shared needs work, BUG with MinGW). 
 OPTION ( BUILD_STATIC_LIBS "Build static libraries." ON )
 IF ( MINGW )
@@ -54,20 +52,18 @@ CHECK_FUNCTION_EXISTS (putenv HAVE_PUTENV)
 
 CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)
 
-# Only care about Perl in case maintainer needs to recreate sources
+# Perl is used to recreate sources
 # * mkelements.pl
 # * mktext.pl
 # * mkgrammar.pl
-if ( USE_MAINTAINER_MODE )
-  # Checking for perl modules requires FindPerlModules.cmake
-  # Check all required modules at once
-  SET(CMAKE_MODULE_PATH "${ADMS_SOURCE_DIR}/cmake/modules")
-  include(FindPerlModules)
-  find_package(PerlModules COMPONENTS XML::LibXML)
-  if(NOT PERLMODULES_FOUND)
-    message(FATAL_ERROR "Not all required perl modules were found on your system")
-  endif(NOT PERLMODULES_FOUND)
-endif ( USE_MAINTAINER_MODE )
+# Checking for perl modules requires FindPerlModules.cmake
+# Check all required modules at once
+SET(CMAKE_MODULE_PATH "${ADMS_SOURCE_DIR}/cmake/modules")
+include(FindPerlModules)
+find_package(PerlModules COMPONENTS XML::LibXML)
+if(NOT PERLMODULES_FOUND)
+  message(FATAL_ERROR "Not all required perl modules were found on your system")
+endif(NOT PERLMODULES_FOUND)
 
 
 find_package(BISON 2.5)
diff --git a/README.md b/README.md
index b74f5a0..84c314b 100644
--- a/README.md
+++ b/README.md
@@ -39,7 +39,7 @@ ADMS is known to work on these platforms.
 - GNU Flex
 - GNU Bison (tested with 2.5+)
 - GNU Libtool
-- Perl with XML::LibXml (only for maintainers)
+- Perl with XML::LibXml
   - GD modules to manually update documentation images
 
 Installing dependencies on Linux Debian/Ubuntu:
@@ -58,34 +58,30 @@ This section is relevant in case ADMS is compiled from the Git repository.
 
 #### Compilation Using Autotools
 
-The `--enable-maintainer-mode` makes sure the required files are generated (using Perl and LibXml).
+Use the default commands to compile, generate files and install.
 
     sh bootstrap.sh
-    ./configure --enable-maintainer-mode
+    ./configure
     make install
 
 Autotools it currently used for creating release packages, the `adms-x.x.x.tar.gz` source code archive.
 
     sh bootstrap.sh
-    ./configure --enable-maintainer-mode
+    ./configure
     make clean
     make dist
 
 #### Compilation Using CMake
 
-The `-DUSE_MAINTAINER_MODE=ON` makes sure the required files are generated (using Perl and LibXml).
-
     mkdir cmake; cd cmake
-    cmake .. -DUSE_MAINTAINER_MODE=ON -DCMAKE_BUILD_TYPE=RELEASE -DCMAKE_INSTALL_PREFIX=/install/location/
+    cmake .. -DCMAKE_BUILD_TYPE=RELEASE -DCMAKE_INSTALL_PREFIX=/install/location/
     make install
 
 Packaging is not yet supported with CMake. At the moment, only static libraries can be build with CMake.
 
-
 ### Users Install from Tarball
 
 This section is relevant in case ADMS is compiled from a source code archive (`adms-x.x.x.tar.gz`).
-Users should be able to build without Perl (and the maintainer required modules XML::LibXml and GD).
 
 #### Compilation Using Autotools
 
@@ -189,9 +185,9 @@ Original author's build instructions: (for posterity)
   3- run: libtoolize --force --ltdl -c (create libltdl and config.guess, config.sub, ltmain.sh in auxconf)
   4- run: automake -a -c (create missing, mkinstalldirs, install-sh in auxconf and all Makefile.in)
   5- run: autoconf (create configure)
-  6- run: ./configure --enable-maintainer-mode
+  6- run: ./configure
   In three shots:
     rm -rf auxconf && autoheader && mkdir auxconf && aclocal && libtoolize --force --ltdl -c
     touch ChangeLog && automake -a -c && autoconf
-    ./configure --enable-maintainer-mode
+    ./configure
 ```
diff --git a/admsXml/CMakeLists.txt b/admsXml/CMakeLists.txt
index da2e768..cc37526 100644
--- a/admsXml/CMakeLists.txt
+++ b/admsXml/CMakeLists.txt
@@ -22,81 +22,77 @@ INCLUDE_DIRECTORIES( ${CMAKE_BINARY_DIR} ) # for config.h
 INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ) # for admsPreprocessor.h, amdsVeriloga.h
 INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR} ) # for generated source code
 
-# Maintainer mode runs the Perl scrips that generate source code
-if ( USE_MAINTAINER_MODE )
-
-  # Run mkelements.pl
-  #   Read in `adms.xml` and generete portions of adms and admst
-  # Generate outputs:
-  #    adms.h
-  #    adms.c
-  #    admstpathYacc.y
-  #    admstpathYacc.h
-  #    admstpath.dtd
-  MESSAGE(STATUS "Running mkelements.pl code generator")
+# Run the Perl scrips to generate source code
+# Run mkelements.pl
+#   Read in `adms.xml` and generete portions of adms and admst
+# Generate outputs:
+#    adms.h
+#    adms.c
+#    admstpathYacc.y
+#    admstpathYacc.h
+#    admstpath.dtd
+MESSAGE(STATUS "Running mkelements.pl code generator")
+
+EXECUTE_PROCESS(
+  COMMAND perl ${CMAKE_SOURCE_DIR}/admsXml/mkelements.pl ${CMAKE_SOURCE_DIR}
+  WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+        RESULT_VARIABLE element_result )
+
+IF(element_result EQUAL 0)
+  MESSAGE(STATUS "mkelement.pl completed successfully")
+ELSE(element_result EQUAL 0)
+  MESSAGE(FATAL_ERROR "mkelement.pl failed. Exit code: ${element_result}")
+ENDIF(element_result EQUAL 0)
+
+
+# Run mkctext.pl
+#   Wrap source files as C code
+# Generate outputs:
+#    constants.vams.c
+#    disciplines.vams.c
+#    adms.implicit.xml.c
+#    dummy.va.c
+#    dummy.xml.c
+SET(CTEXT
+  constants.vams
+  disciplines.vams
+  adms.implicit.xml
+  dummy.va
+  dummy.xml )
+
+FOREACH( inc ${CTEXT} )
+  MESSAGE(STATUS "Running mkctext.pl code generator on ${inc}")
 
   EXECUTE_PROCESS(
-    COMMAND perl ${CMAKE_SOURCE_DIR}/admsXml/mkelements.pl ${CMAKE_SOURCE_DIR}
+    COMMAND perl ${CMAKE_CURRENT_SOURCE_DIR}/mkctext.pl ${CMAKE_CURRENT_SOURCE_DIR}/${inc}
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-          RESULT_VARIABLE element_result )
-
-  IF(element_result EQUAL 0)
-    MESSAGE(STATUS "mkelement.pl completed successfully")
-  ELSE(element_result EQUAL 0)
-    MESSAGE(FATAL_ERROR "mkelement.pl failed. Exit code: ${element_result}")
-  ENDIF(element_result EQUAL 0)
-
-
-  # Run mkctext.pl
-  #   Wrap source files as C code
-  # Generate outputs:
-  #    constants.vams.c
-  #    disciplines.vams.c
-  #    adms.implicit.xml.c
-  #    dummy.va.c
-  #    dummy.xml.c
-  SET(CTEXT
-    constants.vams
-    disciplines.vams
-    adms.implicit.xml
-    dummy.va
-    dummy.xml )
-
-  FOREACH( inc ${CTEXT} )
-    MESSAGE(STATUS "Running mkctext.pl code generator on ${inc}")
-
-    EXECUTE_PROCESS(
-      COMMAND perl ${CMAKE_CURRENT_SOURCE_DIR}/mkctext.pl ${CMAKE_CURRENT_SOURCE_DIR}/${inc}
-      WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-      RESULT_VARIABLE text_result )
-
-    IF(text_result EQUAL 0)
-      MESSAGE(STATUS "mkctext.pl completed successfully")
-    ELSE(text_result EQUAL 0)
-      MESSAGE(FATAL_ERROR "mkctext.pl failed. Exit code: ${text_result}")
-    ENDIF(text_result EQUAL 0)
-  ENDFOREACH()
-
-
-  # Run mkgrammar.pl
-  #   Process verilogaYacc.y.in and generate the parser
-  # Generate output:
-  #    verilogaYacc.y
-  #
-  MESSAGE(STATUS "Running mkgrammar.pl code generator")
+    RESULT_VARIABLE text_result )
 
-  EXECUTE_PROCESS(
-    COMMAND perl ${CMAKE_CURRENT_SOURCE_DIR}/mkgrammar.pl ${CMAKE_CURRENT_SOURCE_DIR}/verilogaYacc.y.in
-    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-          RESULT_VARIABLE grammar_result )
+  IF(text_result EQUAL 0)
+    MESSAGE(STATUS "mkctext.pl completed successfully")
+  ELSE(text_result EQUAL 0)
+    MESSAGE(FATAL_ERROR "mkctext.pl failed. Exit code: ${text_result}")
+  ENDIF(text_result EQUAL 0)
+ENDFOREACH()
+
+
+# Run mkgrammar.pl
+#   Process verilogaYacc.y.in and generate the parser
+# Generate output:
+#    verilogaYacc.y
+#
+MESSAGE(STATUS "Running mkgrammar.pl code generator")
 
-  IF(grammar_result EQUAL 0)
-    MESSAGE(STATUS "mkgrammar.pl completed successfully")
-  ELSE(grammar_result EQUAL 0)
-    MESSAGE(FATAL_ERROR "mkgrammar.pl failed. Exit code: ${grammar_result}")
-  ENDIF(grammar_result EQUAL 0)
+EXECUTE_PROCESS(
+  COMMAND perl ${CMAKE_CURRENT_SOURCE_DIR}/mkgrammar.pl ${CMAKE_CURRENT_SOURCE_DIR}/verilogaYacc.y.in
+  WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+        RESULT_VARIABLE grammar_result )
 
-ENDIF ( USE_MAINTAINER_MODE )
+IF(grammar_result EQUAL 0)
+  MESSAGE(STATUS "mkgrammar.pl completed successfully")
+ELSE(grammar_result EQUAL 0)
+  MESSAGE(FATAL_ERROR "mkgrammar.pl failed. Exit code: ${grammar_result}")
+ENDIF(grammar_result EQUAL 0)
 
 # Issue with flex:
 #   BISON_TARGET, FLEX_TARGET and ADD_FLEX_BISON_DEPENDENCY
diff --git a/admsXml/Makefile.am b/admsXml/Makefile.am
index d7b3f97..f9cbbc3 100644
--- a/admsXml/Makefile.am
+++ b/admsXml/Makefile.am
@@ -10,12 +10,6 @@ SUFFIXES=.vams .vams.c .va .va.c .xml .xml.c .y.in
 # use mkctext.pl to create C files containing the contents of each input file
 # in a C character array. The output is used by make check only
 
-# Perl XML::LibXml module are only required for maintainer
-# Parser created by maintainer
-# BUG: these rules are also required when building from git.
-# workaround: default to maintainer mode when building from git.
-if MAINTAINER_MODE
-
 $(incfilec):%.c:% ${srcdir}/mkctext.pl
 	$(PERL) ${srcdir}/mkctext.pl $< $(top_srcdir)
 
@@ -25,8 +19,6 @@ admstpathYacc.y admstpathYacc.h adms.h adms.c: ${top_srcdir}/adms.xml ${top_srcd
 verilogaYacc.y: ${srcdir}/verilogaYacc.y.in ${srcdir}/mkgrammar.pl
 	$(PERL) ${srcdir}/mkgrammar.pl ${srcdir}/verilogaYacc.y.in
 
-endif
-
 dist_man_MANS = admsXml.1 admsCheck.1
 
 lib_LTLIBRARIES=libadmsElement.la libadmsPreprocessor.la libadmsVeriloga.la libadmsAdmstpath.la
diff --git a/configure.ac b/configure.ac
index 2767fe4..34d6271 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,16 +26,8 @@ LT_INIT
 AM_INIT_AUTOMAKE([foreign])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
-# Maintainer mode is used to detect/run Perl (XML::LibXml) and make dist tarball
-AM_MAINTAINER_MODE
-
 AC_CHECK_PROG(GIT,git,yes)
 AC_MSG_CHECKING([for git repo])
-AS_IF([test x"$GIT" = "xyes" && test -d $srcdir/.git],
-   [have_git_repo=yes
-    AM_MAINTAINER_MODE([enable])],
-   [have_git_repo=no])
-AC_MSG_RESULT([$have_git_repo])
 
 AX_PROG_FLEX([],[AC_MSG_WARN(Program flex not found (found $LEX))
                  AC_MSG_ERROR(Please install gnu flex from http://www.gnu.org/software/flex/)])
@@ -97,18 +89,15 @@ AC_LIBTOOL_WIN32_DLL
 AC_PROG_LIBTOOL
 AC_SUBST([LIBTOOL_DEPS])
 
-dnl Perl, XML::LibXML module required for maintainer
-if test $USE_MAINTAINER_MODE = yes; then
-
-  AC_PATH_PROG(PERL, perl, :)
-  if test "$PERL" = ":"; then
-      AC_MSG_ERROR([The $PACKAGE package requires an installed perl.])
-  fi;
+dnl Perl, XML::LibXML module required
+AC_PATH_PROG(PERL, perl, :)
+if test "$PERL" = ":"; then
+    AC_MSG_ERROR([The $PACKAGE package requires an installed perl.])
+fi;
 
-  AX_PERL_MODULE_VERSION([XML::LibXML 2],[],[
-      AC_MSG_RESULT(failed)
-      AC_MSG_ERROR([Perl package XML::LibXML may be downloaded from http://search.cpan.org/dist/libXML])])
-fi
+AX_PERL_MODULE_VERSION([XML::LibXML 2],[],[
+    AC_MSG_RESULT(failed)
+    AC_MSG_ERROR([Perl package XML::LibXML may be downloaded from http://search.cpan.org/dist/libXML])])
 
 # Define preprocessor flag for static build (MinGW).
 AS_IF([test "x$enable_shared" = "xno"], [
@@ -131,8 +120,6 @@ AC_MSG_RESULT([
 Configure Information:
   Host : $host
 
-  Maintainer mode : $USE_MAINTAINER_MODE
-
   C Compiler : $CC
   DEFS       :   $DEFS
   CFLAGS     :   $CFLAGS

From 2a76e2acb75b3eaec3fdc83ddf739bdf2dde5942 Mon Sep 17 00:00:00 2001
From: Felix Salfelder <felix@salfelder.org>
Date: Sat, 27 Oct 2018 14:11:10 +0100
Subject: [PATCH 05/13] augment searchpath

admsXml used to drop headers in ${CWD}, and complain.
also it failed to look for headers in the right place.

(postpone disabling the header creation.)
---
 admsXml/Makefile.am | 1 +
 admsXml/admsXml.c   | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/admsXml/Makefile.am b/admsXml/Makefile.am
index f9cbbc3..d2e96c2 100644
--- a/admsXml/Makefile.am
+++ b/admsXml/Makefile.am
@@ -50,6 +50,7 @@ bin_PROGRAMS=admsXml admsCheck
 
 admsXml_SOURCES=admsXml.c
 admsXml_LDADD=-lm libadmsElement.la libadmsVeriloga.la libadmsPreprocessor.la libadmsAdmstpath.la
+admsXml_CPPFLAGS=${AM_CPPFLAGS} -DADMS_INCLUDEDIR=\"${pkgincludedir}\"
 
 admsXml.c: adms.implicit.xml.c
 
diff --git a/admsXml/admsXml.c b/admsXml/admsXml.c
index a618dad..fa15213 100644
--- a/admsXml/admsXml.c
+++ b/admsXml/admsXml.c
@@ -616,6 +616,9 @@ static void parseva (const int argc,const char** argv,char* myverilogamsfile)
     adms_slist_push(&pproot()->skipp_text,(p_adms)(long)(0));
     pproot()->includePath=getlist_from_argv(argc,argv,"-I","directory");
     adms_slist_push(&pproot()->includePath,(p_adms)".");
+#ifdef ADMS_INCLUDEDIR
+    adms_slist_push(&pproot()->includePath,(p_adms)ADMS_INCLUDEDIR);
+#endif
     adms_preprocessor_get_define_from_argv(argc,argv);
     adms_preprocessor_define_add_default("insideADMS");
     adms_message_verbose(("create temporary file %s\n",mytmpverilogamsfile))

From 5306dcee4b1fe5aec1edceec93ff8759d4494547 Mon Sep 17 00:00:00 2001
From: Felix Salfelder <felix@salfelder.org>
Date: Mon, 25 Mar 2019 23:04:31 +0000
Subject: [PATCH 06/13] fix typo in admsXml/Makefile.am

there is no verilogYacc.{c,h}.
---
 admsXml/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admsXml/Makefile.am b/admsXml/Makefile.am
index f9cbbc3..d269e24 100644
--- a/admsXml/Makefile.am
+++ b/admsXml/Makefile.am
@@ -33,7 +33,7 @@ libadmsPreprocessor_la_CPPFLAGS=-DinsidePreprocessor
 libadmsPreprocessor_la_LDFLAGS=-no-undefined
 libadmsPreprocessor_la_LIBADD=libadmsElement.la
 
-verilogYacc.h: verilogYacc.c
+verilogaYacc.h: verilogaYacc.c
 libadmsVeriloga_la_SOURCES=verilogaYacc.y verilogaLex.l verilogaYacc.h
 libadmsVeriloga_la_CPPFLAGS=-DinsideVeriloga
 libadmsVeriloga_la_LDFLAGS=-no-undefined

From 4fcbe0ace9e56c47bf76af7e9d3cb7349b744985 Mon Sep 17 00:00:00 2001
From: Chris Lamb <lamby@debian.org>
Date: Wed, 3 Apr 2019 07:17:55 +0200
Subject: [PATCH 07/13] Make the build reproducible

Whilst working on the Reproducible Builds effort [0], we noticed
that ADMS could not be built reproducibly.

This is because it generated ordered C code from a grammar definition
and this process was non-deterministic in nature.

This was originally filed in Debian as #926298 [1].

 [0] https://reproducible-builds.org/
 [1] https://bugs.debian.org/926298

Signed-off-by: Chris Lamb <lamby@debian.org>
---
 admsXml/mkelements.pl | 2 +-
 admsXml/mkgrammar.pl  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/admsXml/mkelements.pl b/admsXml/mkelements.pl
index 8e62a49..b3ae052 100644
--- a/admsXml/mkelements.pl
+++ b/admsXml/mkelements.pl
@@ -1884,7 +1884,7 @@ ()
   }
   push @Location03,"  ENDIFIDENT\n";
 }
-foreach(keys(%A))
+foreach(sort keys(%A))
 {
   my($aname,$ee)=($_,$A{$_});
   push @Location03,"  IFIDENT($aname)\n";
diff --git a/admsXml/mkgrammar.pl b/admsXml/mkgrammar.pl
index 4a7ff06..9e3470b 100644
--- a/admsXml/mkgrammar.pl
+++ b/admsXml/mkgrammar.pl
@@ -71,7 +71,7 @@
     die "bisonrule should terminate with ';' - see $_" if(not m/^\s+;$/);
   }
 }
-map {print OFH "\%token <_lexval> $_\n";} keys %Token;
+map {print OFH "\%token <_lexval> $_\n";} sort keys %Token;
 print OFH "\n";
 map {print OFH "\%type <_yaccval> $_->{name}\n";} @allbisonrule;
 print OFH "\n";

From ca612a267defbc15eb020911453859361a58e562 Mon Sep 17 00:00:00 2001
From: Paul Mansfield <paul-github@mansfield.co.uk>
Date: Tue, 22 Oct 2019 14:37:11 +0100
Subject: [PATCH 08/13] spec file for building an RPM package

---
 adms.spec | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 adms.spec

diff --git a/adms.spec b/adms.spec
new file mode 100644
index 0000000..062af5e
--- /dev/null
+++ b/adms.spec
@@ -0,0 +1,37 @@
+Name:           ADMS
+Version:        2.3.0
+Release:        1%{?dist}
+Summary:        code generator that converts electrical compact device models.. transforms Verilog-AMS code into other target languages
+License:        GPL
+URL:            https://github.com/Qucs/ADMS
+Source0:        ADMS-2.3.0.tar.gz
+
+#BuildRequires:  
+#Requires:       
+
+%description
+
+
+%prep
+%setup -q
+
+
+%build
+%configure
+make %{?_smp_mflags}
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+%make_install
+
+
+%files
+%doc
+%{_bindir}/*
+/usr/include/adms/*
+/usr/lib64/*
+/usr/share/man/man1/*
+
+
+%changelog

From 273990bcb24040dcfdb19492468563aa91641e09 Mon Sep 17 00:00:00 2001
From: Paul Mansfield <paul-github@mansfield.co.uk>
Date: Tue, 22 Oct 2019 14:42:17 +0100
Subject: [PATCH 09/13] v brief instructions for making an rpm

---
 README.md | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/README.md b/README.md
index b74f5a0..d345c9a 100644
--- a/README.md
+++ b/README.md
@@ -103,6 +103,19 @@ Users should be able to build without Perl (and the maintainer required modules
     make install
 
 
+#### Building an RPM
+
+Go through all the aclocal/automake/configure process to ensure you have all the dependencies installed. 
+
+Chances are you will need to install these packages: gcc-c++ flex bison libtool libtool-ltdl-devel
+
+Then rename the ADSM directory to ADSM-2.3.0 and tar it to make ~/rpmbuild/SOURCES/ADMS-2.3.0.tar.gz
+
+Then copy the spec file into your rpmbuild/SPECS directory
+
+Then build with rpmbuild -ba SPECS/adms.spec
+
+
 ## Credits
 
 See AUTHORS file.

From 65bad4b26093eda25315bc8314bac3d01349bc99 Mon Sep 17 00:00:00 2001
From: Paul M <paul-github@mansfield.co.uk>
Date: Tue, 22 Oct 2019 15:07:10 +0000
Subject: [PATCH 10/13] moved spec file to contrib

---
 adms.spec => contrib/adms.spec | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename adms.spec => contrib/adms.spec (100%)

diff --git a/adms.spec b/contrib/adms.spec
similarity index 100%
rename from adms.spec
rename to contrib/adms.spec

From 1e4269a3705876c7b87c1af724e10679d3a182cd Mon Sep 17 00:00:00 2001
From: Felix Salfelder <felix@salfelder.org>
Date: Wed, 12 Aug 2020 09:08:30 +0100
Subject: [PATCH 11/13] prepare 2.3.7, #89

---
 NEWS | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/NEWS b/NEWS
index 4cead11..f80451d 100644
--- a/NEWS
+++ b/NEWS
@@ -94,6 +94,8 @@
             mica: same c code as 1.1.8
 03-05-2005: removed admsNS directory
             release adms-2.0.1
-
-
-
+===== gap ====
+21-11-2016: 2.3.6
+**-08-2020: 2.3.7. minor release.
+            reproducible build, typo fixes,
+            include path, instructions

From 728590cef424f61e2330e7ba862fdde055eb0e2b Mon Sep 17 00:00:00 2001
From: Felix Salfelder <felix@salfelder.org>
Date: Tue, 18 Aug 2020 10:08:23 +0100
Subject: [PATCH 12/13] bump package version to 2.3.7

---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 34d6271..bd11ed1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.61)
-AC_INIT([adms],[2.3.6],[qucs-devel@lists.sourceforge.net])
+AC_INIT([adms],[2.3.7],[qucs-devel@lists.sourceforge.net])
 AC_CONFIG_HEADER([config.h])
 
 # specific configuration.

From e6dfaff997fdbb8430780c06813783e7c2170043 Mon Sep 17 00:00:00 2001
From: Felix Salfelder <felix@salfelder.org>
Date: Tue, 18 Aug 2020 10:22:35 +0100
Subject: [PATCH 13/13] bump version in cmakelists, too

---
 CMakeLists.txt | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1796144..863edd8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,8 +27,11 @@ endif()
 PROJECT(ADMS C)
 cmake_minimum_required(VERSION 2.8)
 
+# TODO: store version in a sensible place
+# e.g. qucs: file(STRINGS "${qucs-project_SOURCE_DIR}/VERSION" QUCS_VERSION)
+
 SET(PACKAGE_NAME "adms")
-SET(PACKAGE_VERSION "2.3.6")
+SET(PACKAGE_VERSION "2.3.7")
 SET(PACKAGE_BUGREPORT "qucs-bugs@lists.sourceforge.net")
 
 # Default to static libs ( shared needs work, BUG with MinGW).