Update develop with release branch

.appveyor.yml

@@ -1,28 +1,36 @@
+environment:
+  matrix:
+    - MSYSTEM : MINGW64
+      MBITS: 64
+      MARCH: x86_64
+    - MSYSTEM : MINGW32
+      MBITS: 32
+      MARCH: i686
 
 platform:
   - x64
 
-cache:
-  - C:\msys64\var\cache\pacman\pkg\mingw-w64-x86_64-qt4* -> .appveyor.yml
+#cache:
+#  - C:\msys64\var\cache\pacman\pkg\mingw-w64-x86_64-qt4* -> .appveyor.yml
 
 install:
 
   # Take a look at the environment
   - set
 
-  - set "PATH=C:\msys64\usr\bin;C:\msys64\mingw64\bin;%PATH%"
+  - set "PATH=C:\msys64\usr\bin;C:\msys64\mingw%MBITS%\bin;%PATH%"
 
-  - C:\msys64\usr\bin\bash -lc ""
-  - C:\msys64\usr\bin\bash -lc "pacman --version"
-  - C:\msys64\usr\bin\bash -lc "pacman -Q"
+  - bash -lc ""
+  - bash -lc "pacman --version"
+  - bash -lc "pacman -Q"
   # Switch from SF to msys2.org (default, much faster)
-  - C:\msys64\usr\bin\bash -lc "pacman --noconfirm --sync pacman-mirrors"
-  - C:\msys64\usr\bin\bash -lc "pacman --noconfirm -S autoconf automake bison flex"
-  - C:\msys64\usr\bin\bash -lc "pacman --noconfirm -S mingw-w64-x86_64-qt4"
-
+  - bash -lc "pacman --noconfirm --sync pacman-mirrors"
+  - bash -lc "pacman --noconfirm -S autoconf automake bison flex"
+  - bash -lc "pacman --noconfirm -S mingw-w64-%MARCH%-qt4"
+  
   # Set compiler (64bit)
-  - set "CC=/c/msys64/mingw64/bin/gcc.exe"
-  - set "CXX=/c/msys64/mingw64/bin/g++.exe"
+  - set "CC=/c/msys64/mingw%MBITS%/bin/gcc.exe"
+  - set "CXX=/c/msys64/mingw%MBITS%/bin/g++.exe"
 
 
 build_script:
@@ -31,31 +39,27 @@ build_script:
 
   ## Other dependencies
   # Download, build and install ADMS
-  - bash -lc "exec 0</dev/null && wget.exe http://sourceforge.net/projects/mot-adms/files/adms-source/2.3/adms-2.3.4.tar.gz"
-  - bash -lc "exec 0</dev/null && tar xvfz adms-2.3.4.tar.gz"
-  - bash -lc "exec 0</dev/null && cd adms-2.3.4/ && ./configure --build=x86_64-w64-mingw32 && make install && cd -"
+  - bash -lc "exec 0</dev/null && wget.exe http://sourceforge.net/projects/mot-adms/files/adms-source/2.3/adms-2.3.6.tar.gz"
+  - bash -lc "exec 0</dev/null && tar xvfz adms-2.3.6.tar.gz"
+  - bash -lc "exec 0</dev/null && cd adms-2.3.6/ && ./configure && make install && cd -"
   - bash -lc "exec 0</dev/null && admsXml -h"
 
-  ## Build Qucs-GUI applications
+  ## Build Qucs-GUI applications and install
   - bash -lc "exec 0</dev/null && cd $APPVEYOR_BUILD_FOLDER/qucs && ./bootstrap"
-  - bash -lc "exec 0</dev/null && cd $APPVEYOR_BUILD_FOLDER/qucs && export QTDIR=/c/msys64/mingw64/ && ./configure"
-  - bash -lc "exec 0</dev/null && cd $APPVEYOR_BUILD_FOLDER/qucs && make install"
-  - bash -lc "exec 0</dev/null && qucs -v"
+  - bash -lc "exec 0</dev/null && cd $APPVEYOR_BUILD_FOLDER/qucs && export QTDIR=/c/msys64/mingw%MBITS% && ./configure --prefix=/c/qucs-win%MBITS% --disable-dependency-tracking"
+  - 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
+  ## 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 --disable-dependency-tracking --with-mkadms=`which admsXml`"
-  - bash -lc "exec 0</dev/null && cd $APPVEYOR_BUILD_FOLDER/qucs-core && make install"
-  - bash -lc "exec 0</dev/null && qucsator -v"
+  - bash -lc "exec 0</dev/null && cd $APPVEYOR_BUILD_FOLDER/qucs-core && ./configure --prefix=/c/qucs-win%MBITS% --with-mkadms=`which admsXml` --disable-dependency-tracking"
+  - bash -lc "exec 0</dev/null && cd $APPVEYOR_BUILD_FOLDER/qucs-core && make -j2 install"
+  - bash -lc "exec 0</dev/null && cd /c/qucs-win%MBITS%/bin && ./qucsator -v"
 
   ## Prepare simple redistributable package (no qucs-doc)
-  # Install to a destination
-  - bash -lc "exec 0</dev/null && cd $APPVEYOR_BUILD_FOLDER/qucs && make install DESTDIR=/c/qucs-win64"
-  - bash -lc "exec 0</dev/null && cd $APPVEYOR_BUILD_FOLDER/qucs-core && make install DESTDIR=/c/qucs-win64"
-
   # Copy required libraries, make binaries usable from command line, Windows Explorer
-  - set QTDIR=c:\msys64\mingw64\
-  - set QUCSDIR=c:\qucs-win64\usr\local\
+  - set QTDIR=c:\msys64\mingw%MBITS%\
+  - set QUCSDIR=c:\qucs-win%MBITS%\
   - cp %QTDIR%\bin\Qt3Support4.dll %QUCSDIR%\bin
   - cp %QTDIR%\bin\QtCore4.dll     %QUCSDIR%\bin
   - cp %QTDIR%\bin\QtGui4.dll      %QUCSDIR%\bin
@@ -68,7 +72,10 @@ build_script:
   - cp %QTDIR%\bin\libstdc++-6.dll     %QUCSDIR%\bin
   - cp %QTDIR%\bin\libwinpthread-1.dll %QUCSDIR%\bin
   - cp %QTDIR%\bin\libpng16-16.dll     %QUCSDIR%\bin
+  - cp %QTDIR%\bin\zlib1.dll %QUCSDIR%\bin
 
+  - if "%MSYSTEM%" == "MINGW32" (cp %QTDIR%\bin\libgcc_s_dw2-1.dll %QUCSDIR%\bin) else (cp %QTDIR%\bin\libgcc_s_seh-1.dll %QUCSDIR%\bin)
+
   # Run from windows cmd
   - cd %QUCSDIR%\bin
   - qucs.exe -v
@@ -78,3 +85,17 @@ build_script:
   # * one could zip the %QUCSDIR% and use it for testing
   # * perhaps it is best we finish the top level 'make dist',
   #   doing so it is easier to create tarballs, build the binaries from it and distribute both.
+
+after_build:
+  #  artifacts path is always relative to build folder, so put the zip there
+  - 7z a %APPVEYOR_BUILD_FOLDER%\qucs-win%MBITS%.zip %QUCSDIR%
+
+artifacts:
+  # variables here must use the PowerShell syntax
+  - path: qucs-win$(MBITS).zip
+    name: qucs-win$(MBITS).zip
+
+#on_failure:
+#  - bash -lc "exec 0</dev/null && cat $APPVEYOR_BUILD_FOLDER/qucs/config.log"
+#  - ps: Get-ChildItem .\*.log -Recurse | % { Push-AppveyorArtifact $_.FullName -FileName $_.Name }
+

.travis.yml

@@ -29,11 +29,19 @@ python:
 virtualenv:
   system_site_packages: true
 
+# Force OSX 10.10 as Qt 4.8.7 installer does not work with OSX 10.11
+osx_image: xcode6.4
+
 matrix:
   exclude:
     - os: osx
       compiler: gcc
 
+addons:
+  apt:
+    packages:
+      - octave
+
 # Set secure environment with encrypted string containing GIT_NAME, GIT_EMAIL and GH_TOKEN
 env:
   global:
@@ -49,6 +57,10 @@ before_install:
 
   - if [[ $TRAVIS_BRANCH == master ]] ; then MASTER=true; fi
 
+  - which $CC
+  # workaround clang not system wide, fail on sudo make install for adms
+  - export CC=`which $CC`
+
   # Set xvfb for headless qucs GUI test
   - "export DISPLAY=:99.0"
   -  if [[ $LINUX ]]; then sh -e /etc/init.d/xvfb start; fi
@@ -67,6 +79,7 @@ install:
       sudo apt-get install build-essential;
       sudo apt-get install libqt4-dev libqt4-qt3support;
       sudo apt-get install automake libtool gperf flex bison;
+      sudo apt-get install latex2html;
     fi
 
   # We want to compile with g++ 4.8 when rather than the default g++
@@ -82,9 +95,9 @@ install:
       sudo pip install cpp-coveralls ;
     fi
 
-  # Set up for Doxygen
+  # Set up for Doxygen and qucs-doc PDF build
   - if [[ $LINUX && $CLANG ]]; then
-      sudo apt-get install -qq doxygen texlive graphviz ;
+      sudo apt-get install -qq doxygen texlive texlive-math-extra texlive-science transfig gnuplot texlive-publishers graphviz ;
     fi
 
   # Qucs-Test uses Numpy to compare results
@@ -99,6 +112,7 @@ install:
       brew link --force flex;
       brew install bison;
       brew link --force bison;
+      brew install python;
       pip install matplotlib;
     fi
 
@@ -140,21 +154,33 @@ script:
 
 
   # Build ADMS from release (avoid need of Perl and its modules)
-  #   Workaround sourceforge shortage, use personal Dropbox.
-  #   wget http://sourceforge.net/projects/mot-adms/files/adms-source/2.3/adms-2.3.4.tar.gz -O /tmp/adms-2.3.4.tar.gz;
   - if [[ $LINUX ]]; then
-      wget https://www.dropbox.com/s/0d0hbsopb1xdg5y/adms-2.3.4.tar.gz -O /tmp/adms-2.3.4.tar.gz;
-      tar -xzvf /tmp/adms-2.3.4.tar.gz;
-      cd adms-2.3.4 && ./configure --prefix=/usr && make && sudo make install && cd ..;
+      wget http://sourceforge.net/projects/mot-adms/files/adms-source/2.3/adms-2.3.6.tar.gz -O /tmp/adms-2.3.6.tar.gz;
+      tar -xzvf /tmp/adms-2.3.6.tar.gz;
+      cd adms-2.3.6 && ./configure --prefix=/usr && make && sudo make install && cd ..;
     fi
 
   # Check available tools
   - which admsXml && admsXml --version
 
   # run all checks
   - ./bootstrap
-  - ./configure --disable-dependency-tracking --with-gtest=/tmp/gtest
-  - make distcheck DISTCHECK_CONFIGURE_FLAGS=--with-gtest=/tmp/gtest
+  - CONFIGURE_FLAGS=--disable-doc
+  - if [[ $LINUX && $CLANG ]]; then
+       CONFIGURE_FLAGS="";
+    fi
+  - DISTCHECK_CONFIGURE_FLAGS="--with-gtest=/tmp/gtest --disable-dependency-tracking --disable-doc"
+  - if [[ $LINUX && $CLANG ]]; then
+       DISTCHECK_CONFIGURE_FLAGS="--with-gtest=/tmp/gtest --enable-doc";
+    fi
+  - echo ${CONFIGURE_FLAGS}
+  - echo ${DISTCHECK_CONFIGURE_FLAGS}
+  - ./configure --disable-dependency-tracking --with-gtest=/tmp/gtest ${CONFIGURE_FLAGS}
+  - if [ "$OSX" = true ]; then
+      make check;
+    else
+      make distcheck DISTCHECK_CONFIGURE_FLAGS="${DISTCHECK_CONFIGURE_FLAGS}";
+    fi
   - echo $TRAVIS_BRANCH
 
   # incomplete

Makefile.am

@@ -31,7 +31,7 @@ else
 DOC_SUBDIR =
 endif
 
-SUBDIRS = examples qucs qucs-core $(DOC_SUBDIR)
+SUBDIRS = qucs qucs-core $(DOC_SUBDIR)
 
 EXTRA_DIST = bootstrap VERSION README.md NEWS.md CONTRIBUTING.md
 
@@ -51,7 +51,10 @@ all-local:
   #
 MORE_PATH=$(abs_top_builddir)/qucs/qucs:$(abs_top_builddir)/qucs-core/src:$(abs_top_builddir)/qucs-core/src/converter
 
+if QUCS_TEST
 check-local: qucsatorcheck eqncheck qucscheck
+endif
+
 QUCSTEST_ENV = export PATH=$(MORE_PATH):$(PATH); \
                export QUCSCONV=qucsconv; \
                export QUCS_LIBDIR=$(abs_top_srcdir)/qucs/qucs-lib/library; \

NEWS.md

@@ -9,6 +9,8 @@ See below a short summary of the enhancements.
 Qucs
 ----
 
+* Update translations for various languages
+
 * Fix diagram color picker button ([#30])
 
 * Fix zoom in a box ([#31])
@@ -76,6 +78,22 @@ Qucs
 
 * Fix the handling of project names containing `_prj` in them ([PR#486])
 
+* Remove usage of LANGUAGEDIR, LIBRARYDIR variables ([PR#501], [PR#508])
+
+* Enable loading unknown components, add sub-circuit place hoder ([PR#507])
+
+* Fix "Export as image" behavior that was clipping markers on selected diagrams ([PR#523])
+
+* Improve handling of Octave ([PR#530])
+  - removal of hardcoded path
+  - override environment variable renamed from OCTAVEBINDIR to QUCS_OCTAVE
+
+* Fix "Move Up/Down" buttons greyed out in the equation property window ([PR#548])
+
+* Fix Component search selecting wrong component ([#543])
+
+* Fix cross-hair behavior of insert wire mode, related to zoom/scrool and RMB click ([PR#504])
+
 Qucsator
 --------
 
@@ -111,6 +129,9 @@ Qucsator
 
 * Fix turn off behavior of thyristor device when reversed biased ([PR#493])
 
+* Require automake 1.12 for .ypp->.hpp rules ([PR#515])
+
+* Disable parallel build of Verilo-A modules, temporary fix to avoid race condition ([PR#575])
 
 Qucs-Transcalc
 -------------
@@ -136,7 +157,6 @@ Qucs-Filter
 * Added quarter wavelength bandpass and notch filters ([#310])
   Transmission line and the microstrip are available.
 
-
 Qucs-Lib
 -------------
 
@@ -152,6 +172,8 @@ Qucs-Lib
 
 * Add search box to search components in libraries ([PR#303])
 
+* Fix erroneous preview of symbols when using the searchbox ([#550])
+
 Qucs-Rescodes
 -------------
 
@@ -181,6 +203,8 @@ Documentation
 
 * Documentation for qucs-active filter ([PR#156])
 
+* Fix out-of-tree and parallel build for LaTeX documentation in qucs-doc directory ([PR#524])
+
 Translations
 ----------
 
@@ -222,6 +246,8 @@ Miscellaneous
 
 * Simplify Verilog-A compilation rules
 
+* Enable continuous automated builds (AppVeyor) of Windows binary packages, for test purposes ([PR#561])
+
 
 ---
 
@@ -370,6 +396,7 @@ Bug fixes
 [#43]: https://github.com/Qucs/qucs/issues/43
 [#73]: https://github.com/Qucs/qucs/issues/73
 [#272]: https://github.com/Qucs/qucs/issues/272
+[#550]: https://github.com/Qucs/qucs/issues/550
 [#133]: https://github.com/Qucs/qucs/issues/133
 [#421]: https://github.com/Qucs/qucs/issues/421
 [#296]: https://github.com/Qucs/qucs/issues/296
@@ -382,16 +409,21 @@ Bug fixes
 [#204]: https://github.com/Qucs/qucs/issues/204
 [#319]: https://github.com/Qucs/qucs/issues/319
 [#253]: https://github.com/Qucs/qucs/issues/253
+[#543]: https://github.com/Qucs/qucs/issues/543
 [#216]: https://github.com/Qucs/qucs/issues/216
 [#478]: https://github.com/Qucs/qucs/issues/478
 [#132]: https://github.com/Qucs/qucs/issues/132
 [PR#306]: https://github.com/Qucs/qucs/pull/306
 [PR#375]: https://github.com/Qucs/qucs/pull/375
 [PR#209]: https://github.com/Qucs/qucs/pull/209
+[PR#507]: https://github.com/Qucs/qucs/pull/507
+[PR#575]: https://github.com/Qucs/qucs/pull/575
 [PR#86]: https://github.com/Qucs/qucs/pull/86
 [PR#232]: https://github.com/Qucs/qucs/pull/232
 [PR#406]: https://github.com/Qucs/qucs/pull/406
 [PR#252]: https://github.com/Qucs/qucs/pull/252
+[PR#292]: https://github.com/Qucs/qucs/pull/292
+[PR#523]: https://github.com/Qucs/qucs/pull/523
 [PR#412]: https://github.com/Qucs/qucs/pull/412
 [PR#357]: https://github.com/Qucs/qucs/pull/357
 [PR#482]: https://github.com/Qucs/qucs/pull/482
@@ -400,19 +432,26 @@ Bug fixes
 [PR#414]: https://github.com/Qucs/qucs/pull/414
 [PR#389]: https://github.com/Qucs/qucs/pull/389
 [PR#303]: https://github.com/Qucs/qucs/pull/303
+[PR#501]: https://github.com/Qucs/qucs/pull/501
 [PR#371]: https://github.com/Qucs/qucs/pull/371
-[PR#292]: https://github.com/Qucs/qucs/pull/292
+[PR#515]: https://github.com/Qucs/qucs/pull/515
 [PR#436]: https://github.com/Qucs/qucs/pull/436
 [PR#168]: https://github.com/Qucs/qucs/pull/168
 [PR#349]: https://github.com/Qucs/qucs/pull/349
 [PR#444]: https://github.com/Qucs/qucs/pull/444
 [PR#456]: https://github.com/Qucs/qucs/pull/456
+[PR#548]: https://github.com/Qucs/qucs/pull/548
 [PR#267]: https://github.com/Qucs/qucs/pull/267
 [PR#95]: https://github.com/Qucs/qucs/pull/95
 [PR#493]: https://github.com/Qucs/qucs/pull/493
 [PR#481]: https://github.com/Qucs/qucs/pull/481
 [PR#128]: https://github.com/Qucs/qucs/pull/128
+[PR#504]: https://github.com/Qucs/qucs/pull/504
 [PR#87]: https://github.com/Qucs/qucs/pull/87
+[PR#530]: https://github.com/Qucs/qucs/pull/530
+[PR#508]: https://github.com/Qucs/qucs/pull/508
+[PR#561]: https://github.com/Qucs/qucs/pull/561
+[PR#524]: https://github.com/Qucs/qucs/pull/524
 [PR#85]: https://github.com/Qucs/qucs/pull/85
 [PR#274]: https://github.com/Qucs/qucs/pull/274
 [PR#203]: https://github.com/Qucs/qucs/pull/203