Revert "Update makeDist.sh to handle submodules."

This reverts commit 1c27a63.

3rdparty/CMakeLists.txt

@@ -0,0 +1,84 @@
+
+set( CMAKE_AUTOMOC OFF )
+set( CMAKE_AUTOUIC OFF )
+set( CMAKE_AUTORCC OFF )
+
+# minigzip: mini gzip implementation
+add_library( minigzip "minigzip/minigzip.c" )
+target_link_libraries( minigzip ZLIB::ZLIB )
+
+if (Qt5Gui_FOUND)
+  get_target_property(QT_INCLUDE_DIR Qt5::Gui INTERFACE_INCLUDE_DIRECTORIES)
+  message( STATUS "Qt5 GUI found ${QT_INCLUDE_DIR}" )
+else()
+  message( STATUS Qt5 GUI not found )
+endif ()
+
+# Qwt5
+option( BUILD_QWT "Build Qwt using own code" OFF )
+
+if( NOT BUILD_QWT )
+  find_library ( QWT_LIBRARY
+    NAMES qwt5-qt5 qwt-qt5
+    HINTS ${QT_LIBRARY_DIR} /usr/lib64
+  )
+  if( NOT QWT_LIBRARY )
+    set( BUILD_QWT ON CACHE BOOL "Build Qwt using own code" FORCE )
+  endif()
+endif()
+
+if( NOT BUILD_QWT )
+  find_path ( QWT_INCLUDE_DIR
+    NAMES qwt_plot.h
+    HINTS ${QT_INCLUDE_DIR}
+    PATH_SUFFIXES qwt5 qwt5-qt5
+    REQUIRED
+  )
+  message( STATUS "Found Qwt5: ${QWT_LIBRARY}, with include: ${QWT_INCLUDE_DIR}" )
+else()
+  # Build Qwt5
+  message( STATUS "Qwt5: using own code" )
+  set(QWT_DESIGNER off)
+  add_subdirectory( qwt5-qt5 )
+endif()
+
+# QwtPlot3D
+option( BUILD_QWTPLOT3D "Build QwtPlot3D using own code" OFF )
+
+if( NOT BUILD_QWTPLOT3D )
+  find_library ( QWTPLOT3D_LIBRARY
+    NAMES qwtplot3d-qt5
+    HINTS ${QT_LIBRARY_DIR}
+  )
+  if( NOT QWTPLOT3D_LIBRARY )
+    set( BUILD_QWTPLOT3D ON CACHE BOOL "Build QwtPlot3D using own code" FORCE )
+  endif()
+endif()
+
+if( NOT BUILD_QWTPLOT3D )
+  find_path ( QWTPLOT3D_INCLUDE_DIR
+    NAMES qwt3d_plot.h
+    HINTS ${QT_INCLUDE_DIR}
+    PATH_SUFFIXES qwtplot3d qwtplot3d-qt5
+    REQUIRED
+  )
+  message( STATUS "Found QwtPlot3D: ${QWTPLOT3D_LIBRARY}, with include: ${QWTPLOT3D_INCLUDE_DIR}" )
+else()
+  # Build QwtPlot3D
+  message( STATUS "QwtPlot3D: using own code" )
+  add_subdirectory( qwtplot3d )
+endif()
+
+# liborigin
+if( ORIGIN_IMPORT )
+  find_package( PkgConfig )
+  if( PkgConfig_FOUND )
+    pkg_search_module( LIBORIGIN liborigin>=3.0.0 IMPORTED_TARGET GLOBAL )
+  endif()
+  if( NOT PkgConfig_FOUND OR NOT LIBORIGIN_FOUND )
+    message( STATUS "liborigin: using own code" )
+    add_subdirectory( liborigin )
+  endif()
+else()
+  message( STATUS "liborigin not enabled" )
+endif()

3rdparty/config.h

@@ -0,0 +1,40 @@
+/***************************************************************************
+    File                 : config.h.in
+    --------------------------------------------------------------------
+    Copyright            : (C) 2010 Knut Franke
+    Email (use @ for *)  : knut.franke*gmx.de
+    Description          : compile-time configuration defines
+
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *  This program is free software; you can redistribute it and/or modify   *
+ *  it under the terms of the GNU General Public License as published by   *
+ *  the Free Software Foundation; either version 2 of the License, or      *
+ *  (at your option) any later version.                                    *
+ *                                                                         *
+ *  This program is distributed in the hope that it will be useful,        *
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of         *
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the          *
+ *  GNU General Public License for more details.                           *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the Free Software           *
+ *   Foundation, Inc., 51 Franklin Street, Fifth Floor,                    *
+ *   Boston, MA  02110-1301  USA                                           *
+ *                                                                         *
+ ***************************************************************************/
+
+#ifndef CONFIG_H
+#define CONFIG_H
+
+#define LIBORIGIN_VERSION_MAJOR 3
+#define LIBORIGIN_VERSION_MINOR 0
+#define LIBORIGIN_VERSION_BUGFIX 0
+#define LIBORIGIN_VERSION ((LIBORIGIN_VERSION_MAJOR << 24) | \
+                           (LIBORIGIN_VERSION_MINOR << 16) | \
+                           (LIBORIGIN_VERSION_BUGFIX << 8) )
+#define LIBORIGIN_VERSION_STRING "3.0.0"
+
+#endif // ifndef CONFIG_H

3rdparty/liborigin.pro

@@ -0,0 +1,36 @@
+# this file is not part of the liborigin library, which uses the cmake
+# system, but must be maintained separately of liborigin
+
+include(../../config.pri)
+
+TEMPLATE = lib
+CONFIG += staticlib
+TARGET = origin
+QMAKE_CLEAN+=${TARGET}
+
+LIBORIGIN_VERSION_MAJOR = 3
+LIBORIGIN_VERSION_MINOR = 0
+LIBORIGIN_VERSION_BUGFIX = 0
+
+# logging of parse process is disabled by default
+# to enable it uncomment following line
+# DEFINES += GENERATE_CODE_FOR_LOG
+QMAKE_CXXFLAGS += -std=c++11
+
+HEADERS  += \
+        config.h \
+	OriginObj.h\
+	OriginFile.h\
+	OriginParser.h\
+	tree.hh
+
+SOURCES += \
+	OriginFile.cpp\
+	OriginParser.cpp\
+	OriginAnyParser.cpp
+
+# for converage testing
+gcov {
+   QMAKE_CXXFLAGS+=-fprofile-arcs -ftest-coverage
+}
+

3rdparty/liborigin2/FORMAT

@@ -0,0 +1,77 @@
+Origin 7.5 column value display
+###############################
+Numeric, Text&Numeric:
+	Decimal:1000            = 0
+	Scientific:1E3          = 1
+	Engeneering:1k          = 2
+	Decimal:1,000           = 3
+
+Time:
+	hh:mm                   = 0
+	hh                      = 1
+	hh:mm:ss                = 2
+	hh:mm:ss.zz             = 3
+	hh ap                   = 4
+	hh:mm ap                = 5
+	mm:ss                   = 6
+	mm:ss.zz                = 7
+	hhmm                    = 8
+	hhmmss                  = 9
+	hh:mm:ss.zzz            = 10
+
+Date:
+    dd/MM/yyyy              = -128
+    dd/MM/yyyy HH:mm        = -119
+    dd/MM/yyyy HH:mm:ss     = -118
+	dd.MM.yyyy              = 0
+	y.                      = 1  (year abbreviation - for instance, '�.' in russian)
+	MMM d                   = 2
+	M/d                     = 3
+	d                       = 4
+	ddd                     = 5
+	F                       = 6	 (first letter of day of week)
+	yyyy                    = 7
+	yy                      = 8
+	dd.MM.yyyy hh:mm        = 9
+	dd.MM.yyyy hh:mm:ss     = 10
+	yyMMdd                  = 11
+	yyMMdd hh:mm            = 12
+	yyMMdd hh:mm:ss         = 13
+	yyMMdd hhmm             = 14
+	yyMMdd hhmmss           = 15
+	MMM                     = 16
+	J                       = 17 (first letter of month)
+	Q1                      = 18 (quartal)
+	M-d-yyyy (Custom1)      = 19
+	hh:mm:ss.zzzz (Custom2) = 20
+
+Month:
+	MMM                     = 0
+	MMMM                    = 1
+	J                       = 2	 (first letter of month)
+
+Day of Week:
+	ddd                     = 0
+	dddd                    = 1
+	F                       = 2	 (first letter of day of week)
+
+Fill Area Patterns
+	none = 0
+	///  = 1
+	/ /  = 2
+	 /   = 3
+	\\\  = 4
+	\ \  = 5
+	 \   = 6
+	xxx  = 7
+	x x  = 8
+	 x   = 9
+	---  = 10
+	- -  = 11
+	 -   = 12
+	|||  = 13
+	| |  = 14
+	 |   = 15
+	+++  = 16
+	+ +  = 17
+	 +   = 18