Merge branch 'qucsator_submodule' into develop

.appveyor.yml

@@ -76,10 +76,12 @@ build_script:
  - bash -lc "exec 0</dev/null && cd $APPVEYOR_BUILD_FOLDER/qucs && make -j2 install"
  - bash -lc "exec 0</dev/null && cd /c/qucs-win$MBITS/bin && ./qucs -v"
 
- ## Build Qucs-core and install
- - bash -lc "exec 0</dev/null && cd $APPVEYOR_BUILD_FOLDER/qucs-core && ./bootstrap"
- - bash -lc "exec 0</dev/null && cd $APPVEYOR_BUILD_FOLDER/qucs-core && ./configure --prefix=/c/qucs-win$MBITS --with-mkadms=/c/qucs-win$MBITS/bin/admsXml --disable-dependency-tracking"
- - bash -lc "exec 0</dev/null && cd $APPVEYOR_BUILD_FOLDER/qucs-core && make -j2 install"
+ ## Build Qucsator and install
+ - git submodule init qucsator
+ - git submodule update qucsator
+ - bash -lc "exec 0</dev/null && cd $APPVEYOR_BUILD_FOLDER/qucsator && ./bootstrap"
+ - bash -lc "exec 0</dev/null && cd $APPVEYOR_BUILD_FOLDER/qucsator && ./configure --prefix=/c/qucs-win$MBITS --with-mkadms=/c/qucs-win$MBITS/bin/admsXml --disable-dependency-tracking"
+ - bash -lc "exec 0</dev/null && cd $APPVEYOR_BUILD_FOLDER/qucsator && make -j2 install"
  - bash -lc "exec 0</dev/null && cd /c/qucs-win$MBITS/bin && ./qucsator -v"
 
  ## Check

.gitignore

@@ -1,55 +1,4 @@
 /compile
-/qucs-core/build-aux/ar-lib
-/qucs-core/build-aux/compile
-/qucs-core/build-aux/test-driver
-/qucs-core/build-aux/ylwrap
-/qucs-core/src/components/verilog/DLS_1ton.cpp
-/qucs-core/src/components/verilog/DLS_nto1.cpp
-/qucs-core/src/components/verilog/EKV26MOS.cpp
-/qucs-core/src/components/verilog/MESFET.cpp
-/qucs-core/src/components/verilog/andor4x2.cpp
-/qucs-core/src/components/verilog/andor4x3.cpp
-/qucs-core/src/components/verilog/andor4x4.cpp
-/qucs-core/src/components/verilog/binarytogrey4bit.cpp
-/qucs-core/src/components/verilog/comp_1bit.cpp
-/qucs-core/src/components/verilog/comp_2bit.cpp
-/qucs-core/src/components/verilog/comp_4bit.cpp
-/qucs-core/src/components/verilog/dff_SR.cpp
-/qucs-core/src/components/verilog/dmux2to4.cpp
-/qucs-core/src/components/verilog/dmux3to8.cpp
-/qucs-core/src/components/verilog/dmux4to16.cpp
-/qucs-core/src/components/verilog/fa1b.cpp
-/qucs-core/src/components/verilog/fa2b.cpp
-/qucs-core/src/components/verilog/gatedDlatch.cpp
-/qucs-core/src/components/verilog/greytobinary4bit.cpp
-/qucs-core/src/components/verilog/ha1b.cpp
-/qucs-core/src/components/verilog/hpribin4bit.cpp
-/qucs-core/src/components/verilog/jkff_SR.cpp
-/qucs-core/src/components/verilog/log_amp.cpp
-/qucs-core/src/components/verilog/logic_0.cpp
-/qucs-core/src/components/verilog/logic_1.cpp
-/qucs-core/src/components/verilog/mod_amp.cpp
-/qucs-core/src/components/verilog/mux2to1.cpp
-/qucs-core/src/components/verilog/mux4to1.cpp
-/qucs-core/src/components/verilog/mux8to1.cpp
-/qucs-core/src/components/verilog/nigbt.cpp
-/qucs-core/src/components/verilog/pad2bit.cpp
-/qucs-core/src/components/verilog/pad3bit.cpp
-/qucs-core/src/components/verilog/pad4bit.cpp
-/qucs-core/src/components/verilog/photodiode.cpp
-/qucs-core/src/components/verilog/phototransistor.cpp
-/qucs-core/src/components/verilog/potentiometer.cpp
-/qucs-core/src/components/verilog/tff_SR.cpp
-/qucs-core/src/components/verilog/vcresistor.cpp
-/qucs-core/src/converter/parse_spice.hpp
-/qucs-core/src/converter/parse_vcd.hpp
-/qucs-core/src/parse_citi.hpp
-/qucs-core/src/parse_csv.hpp
-/qucs-core/src/parse_dataset.hpp
-/qucs-core/src/parse_mdl.hpp
-/qucs-core/src/parse_netlist.hpp
-/qucs-core/src/parse_touchstone.hpp
-/qucs-core/src/parse_zvr.hpp
 /qucs/ar-lib
 # Qucs Specific #
 #################
@@ -59,45 +8,8 @@
 qucs_typedefs.h
 */src/components/verilog/discipline.vams
 
-# Verilog-A generated files
-qucs-core/src/components/verilog/*.cpp
-
 # Following files generated by lex and yacc
 
-# qucsator generated files (in qucs-core/src)
-scan_netlist.cpp
-parse_netlist.cpp
-scan_dataset.cpp
-parse_dataset.cpp
-tokens_dataset.h
-tokens_netlist.h
-parse_touchstone.cpp
-tokens_touchstone.h
-scan_touchstone.cpp
-parse_citi.cpp
-tokens_citi.h
-scan_citi.cpp
-parse_zvr.cpp
-scan_zvr.cpp
-tokens_zvr.h
-parse_mdl.cpp
-scan_mdl.cpp
-tokens_mdl.h
-parse_csv.cpp
-tokens_csv.h
-scan_csv.cpp
-qucsdefs.h
-gperfapphash.cpp
-gperfapphash.gph
-gperfappgen.h
-
-# spice converter generated files (in qucs-core/src/converter)
-parse_spice.cpp
-scan_spice.cpp
-tokens_spice.h
-parse_vcd.cpp
-scan_vcd.cpp
-tokens_vcd.h
 
 # ADMS Specific #
 ##################
@@ -272,6 +184,4 @@ CMakeFiles
 CMakeCache.txt
 *.cmake
 *.depends
-/qucs-core/src/components/verilog/constants.vams
-/qucs-core/src/components/verilog/disciplines.vams
 /qucs-doc/technical/octave-workspace

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "qucs-test"]
  path = qucs-test
  url = https://github.com/Qucs/qucs-test.git
+[submodule "qucsator"]
+ path = qucsator
+ url = https://github.com/Qucs/qucsator

Makefile.am

@@ -31,7 +31,7 @@ else
 DOC_SUBDIR =
 endif
 
-SUBDIRS = qucs qucs-core $(DOC_SUBDIR)
+SUBDIRS = qucs qucsator $(DOC_SUBDIR)
 
 EXTRA_DIST = bootstrap VERSION README.md NEWS.md CONTRIBUTING.md
 
@@ -49,7 +49,7 @@ all-local:
  # Need to be on `script` section to raise error as failure
  # Use qucsator in-tree to generate gcov coverage for GCC (LINUX)
  #
-MORE_PATH=$(abs_top_builddir)/qucs/qucs:$(abs_top_builddir)/qucs-core/src:$(abs_top_builddir)/qucs-core/src/converter
+MORE_PATH=$(abs_top_builddir)/qucs/qucs:$(abs_top_builddir)/qucsator/src:$(abs_top_builddir)/qucsator/src/converter
 
 if QUCS_TEST
 check-local: qucsatorcheck eqncheck qucscheck
@@ -74,13 +74,13 @@ qucscheck: $(PWD)/qucs-test
 # Run test on qucsator
 qucsatorcheck: $(PWD)/qucs-test
  $(QUCSTEST_ENV) \
- cd qucs-test && $(PYTHON) run.py --prefix $(abs_top_builddir)/qucs-core/src/ \
+ cd qucs-test && $(PYTHON) run.py --prefix $(abs_top_builddir)/qucsator/src/ \
  --qucsator --exclude skip$(macossuffix).txt
 
 # Run tests on Qucsator equation system
 eqncheck: $(PWD)/qucs-test
  $(QUCSTEST_ENV) \
- cd qucs-test && $(PYTHON) run_equations.py --prefix $(abs_top_builddir)/qucs-core/src/
+ cd qucs-test && $(PYTHON) run_equations.py --prefix $(abs_top_builddir)/qucsator/src/
 
 # BUG should not be necessary, but is.
 $(PWD)/qucs-test:
@@ -118,7 +118,7 @@ distclean-local:
 #- git checkout gh-pages ;
 #- git rm -r * ;
 #- mv ../qucs/contrib/doxygen/html/ qucs/ ;
-#- mv ../qucs-doc/doxygen/html/ qucs-core/ ;
+#- mv ../qucs-doc/doxygen/html/ qucsator/ ;
 #- git add --all . ;
 #- git commit -m "Auto-updating Doxygen developer documentation" ;
 #- git push https://${GH_TOKEN}@github.com/Qucs/qucs-doxygen gh-pages ;

README.md

@@ -56,8 +56,8 @@ All versions of the code may be accessed by cloning one of the Git repositories
  git clone git://github.com/Qucs/qucs.git
  git clone git://git.code.sf.net/p/qucs/git
 
-For test and development qucs-test is provided as a Git submodule.
-To download the submodule either:
+Both, qucsator (simulator) and qucs-test (test suite) are provided as Git
+submodules. To retrieve the submodules you may
 
  * clone submodules recursively:
  * `git clone --recursive [repository]`

configure.ac

@@ -46,7 +46,7 @@ PYTHON=python
 AC_SUBST([PYTHON])
 
 AC_CONFIG_SUBDIRS([qucs
- qucs-core])
+ qucsator])
 
 AS_IF([test -d "$srcdir/qucs-doc"],
  AC_CONFIG_SUBDIRS([qucs-doc])