Merge pull request #5 from kpeeters/master

Sync with upstream

Author: cbehan

README.rst

@@ -388,7 +388,7 @@ warned, it can easily take several hours, but at least it's automatic)::
   
     vcpkg install mpir:x64-windows glibmm:x64-windows   (go have a coffee)
     vcpkg install sqlite3:x64-windows boost:x64-windows (go for dinner)
-    vcpkg install gtkmm:x64-windows                     (run overnight)
+    vcpkg install gtkmm:x64-windows  (run overnight)
     vcpkg integrate install
 
 boost-system:x64-windows

client_server/Server.cc

@@ -159,7 +159,7 @@ std::string Server::run_string(const std::string& blk, bool handle_output)
 	std::string result;
 
 	// Preparse input block.
-	auto newblk = cadabra::cdb2python(blk, true);
+	auto newblk = cadabra::cdb2python_string(blk, true);
 
 	//	std::cerr << "PREPARSED:\n" << newblk << std::endl;
 	// snoop::log("preparsed") << newblk << snoop::flush;

client_server/cadabra-server.cc

@@ -8,16 +8,52 @@
 #include <Windows.h>
 #endif
 
+#ifdef _WIN32
+
+std::string getRegKey(const std::string& location, const std::string& name, bool system)
+	{
+	HKEY key;
+	TCHAR value[1024]; 
+	DWORD bufLen = 1024*sizeof(TCHAR);
+	long ret;
+	ret = RegOpenKeyExA(system?HKEY_LOCAL_MACHINE:HKEY_CURRENT_USER, location.c_str(), 0, KEY_QUERY_VALUE, &key);
+	if( ret != ERROR_SUCCESS ){
+		return std::string();
+		}
+	ret = RegQueryValueExA(key, name.c_str(), 0, 0, (LPBYTE) value, &bufLen);
+	RegCloseKey(key);
+	if ( (ret != ERROR_SUCCESS) || (bufLen > 1024*sizeof(TCHAR)) ){
+		return std::string();
+		}
+	std::string stringValue = std::string(value, (size_t)bufLen - 1);
+	size_t i = stringValue.length();
+	while( i > 0 && stringValue[i-1] == '\0' ){
+		--i;
+		}
+	return stringValue.substr(0,i); 
+	}
+
+#endif
+
 // Run a simple Cadabra server on a local port.
 
 int main()
 	{
 #ifdef _WIN32
 	// The Anaconda people _really_ do not understand packaging...
+	// We are going to find out the installation path for Anaconda/Miniconda
+	// by querying a registry key.
 	std::string pythonhome=Glib::getenv("PYTHONHOME");
-	std::string pythonpath=Glib::getenv("PYTHONPATH");	
-	Glib::setenv("PYTHONHOME", (pythonhome.size()>0)?(pythonhome+":"):"" + Glib::get_home_dir()+"/Anaconda3");
-	Glib::setenv("PYTHONPATH", (pythonpath.size()>0)?(pythonpath+":"):"" + Glib::get_home_dir()+"/Anaconda3");
+	std::string pythonpath=Glib::getenv("PYTHONPATH");
+
+	std::string s = getRegKey("SOFTWARE\\Python\\PythonCore\\3.7", "", false);
+	if(s=="")
+		s = getRegKey("SOFTWARE\\Python\\PythonCore\\3.7", "", true);
+	
+//	Glib::setenv("PYTHONHOME", (pythonhome.size()>0)?(pythonhome+":"):"" + Glib::get_home_dir()+"/Anaconda3");
+//	Glib::setenv("PYTHONPATH", (pythonpath.size()>0)?(pythonpath+":"):"" + Glib::get_home_dir()+"/Anaconda3");
+	Glib::setenv("PYTHONHOME", (pythonhome.size()>0)?(pythonhome+":"):"" + s);
+	Glib::setenv("PYTHONPATH", (pythonpath.size()>0)?(pythonpath+":"):"" + s);
 //	std::cerr << "Server::init: using PYTHONPATH = " << Glib::getenv("PYTHONPATH")
 //				 << " and PYTHONHOME = " << Glib::getenv("PYTHONHOME") << "." << std::endl;
 #endif

cmake/packaging.cmake

@@ -1,6 +1,11 @@
 # Logic to build packages (RPM/DEB) using CPack; see https://cmake.org/Wiki/CMake:Packaging_With_CPack
 # 
 
+if(MSVC)
+  set(CPACK_GENERATOR "NSIS")
+  message("-- This is a Windows system")
+endif()
+
 set(LINUX_NAME "")
 if(EXISTS "/etc/redhat-release")
    file(READ "/etc/redhat-release" LINUX_ISSUE)
@@ -149,7 +154,15 @@ else()
    endif()
 endif()
 
+# Ensure that on Windows we also install the libraries provided
+# by Visual Studio, e.g. MSVCnnn.DLL. This does mean that the installer
+# will now contain both the normal and the debug libraries, but better
+# to have both than to have none.
+#   set(CMAKE_INSTALL_DEBUG_LIBRARIES TRUE)
+# That didn't work... Commented out for future reference.
+
 include (InstallRequiredSystemLibraries)
+
 set(CPACK_SET_DESTDIR true)
 set(CPACK_INSTALL_PREFIX /usr)
 set(CPACK_PACKAGE_NAME           "cadabra2")

config/install_script.iss

@@ -2,9 +2,9 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "Cadabra2"
-#define MyAppVersion "2.1.9"
+#define MyAppVersion "2.2.7"
 #define MyAppPublisher "Kasper Peeters"
-#define MyAppURL "http://www.cadabra.science/"
+#define MyAppURL "https://www.cadabra.science/"
 #define MyAppExeName "cadabra2-gtk.exe"
 
 [Setup]
@@ -46,6 +46,35 @@ Source: "C:\Cadabra\bin\cadabra2-gtk.exe"; DestDir: "{app}\bin"; Flags: ignoreve
 Source: "C:\Cadabra\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
 ; Source: "C:\Users\kasper\Anaconda3\DLLs\sqlite3.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
+; VC++ redistributable runtime. Extracted by VC2019RedistNeedsInstall(), if needed.
+Source: "vcredist_x64.exe"; DestDir: {tmp}; Flags: dontcopy
+
+[Run]
+Filename: "{tmp}\vcredist_x64.exe"; StatusMsg: "Installing VC++ redistributables..."; Parameters: "/quiet"; Check: VC2019RedistNeedsInstall ; Flags: waituntilterminated
+
+; https://stackoverflow.com/questions/24574035/how-to-install-microsoft-vc-redistributables-silently-in-inno-setup
+[Code]
+function VC2019RedistNeedsInstall: Boolean;
+var 
+  Version: String;
+begin
+  if (RegQueryStringValue(HKEY_LOCAL_MACHINE, 'SOFTWARE\Microsoft\VisualStudio\14.0\VC\Runtimes\x64', 'Version', Version)) then
+  begin
+    // Is the installed version at least 14.23 ? 
+    Log('VC Redist Version check : found ' + Version);
+    Result := (CompareStr(Version, 'v14.23.27820.00')<0);
+  end
+  else 
+  begin
+    // Not even an old version installed
+    Result := True;
+  end;
+  if (Result) then
+  begin
+    ExtractTemporaryFile('vcredist_x64.exe');
+  end;
+end;
+
 
 [Icons]
 Name: "{commonprograms}\{#MyAppName}"; Filename: "{app}\bin\{#MyAppExeName}"

config/pre_install.rtf

@@ -1,8 +1,8 @@
 Before installing Cadabra, you must make sure that you have installed the following:
 
-* Anaconda Python 3.x (64 bit)
+* Anaconda Python 3.7 (64 bit)
 
-You must have Anaconda Python installed on your system. This is available from https://www.anaconda.com/download/ . The Cadabra binary you are about to install does not work with other types of Python installations.
+You must have Anaconda or Miniconda Python 3.7 installed on your system. This is available from https://www.anaconda.com/download/ . The Cadabra binary you are about to install does not work with other types of Python installations.
 
 * A working LaTeX distribution
 

core/CMakeLists.txt

@@ -420,13 +420,17 @@ if (MSVC AND NOT INSTALL_TARGETS_ONLY)
 	install_dlls_from("core")
 endif()
 
+if(NOT MSVC)
 add_custom_target(deduplicate
                   COMMAND rm -f "\$(DESTDIR)${CMAKE_INSTALL_PREFIX}/man/man1/cadabra2.1"
                   COMMAND rm -f "\$(DESTDIR)${CMAKE_INSTALL_PREFIX}/man/man1/cadabra2cadabra.1"
                   COMMAND rm -f "\$(DESTDIR)${CMAKE_INSTALL_PREFIX}/man/man1/cadabra2html.1"
                   COMMAND rm -f "\$(DESTDIR)${CMAKE_INSTALL_PREFIX}/man/man1/cadabra2python.1"
                   COMMAND rm -f "\$(DESTDIR)${CMAKE_INSTALL_PREFIX}/man/man1/cadabra2-gtk.1"
-                  COMMAND rm -f "\$(DESTDIR)${CMAKE_INSTALL_PREFIX}/man/man1/cadabra-server.1")
+                  COMMAND rm -f "\$(DESTDIR)${CMAKE_INSTALL_PREFIX}/man/man1/cadabra-server.1"
+                  COMMENT "Removing manual pages from old location."
+                  )
+endif()             
 
 # manual pages
 if(NOT MSVC)

core/CdbPython.cc

@@ -15,8 +15,34 @@ std::string cadabra::escape_quotes(const std::string& line)
 	//	return ret;
 	}
 
+std::string cadabra::cdb2python(const std::string& in_name, bool display)
+	{
+	// Read the file into a string.
+	std::ifstream ifs(in_name);
+	std::stringstream buffer;
+	buffer << ifs.rdbuf();
+
+	std::time_t t = std::time(nullptr);
+	std::tm tm = *std::localtime(&t);
+
+	std::ostringstream ofs;
+	ofs << "# cadabra2 package, auto-compiled " << std::put_time(&tm, "%F %T") << '\n'
+	    << "# Do not modify - changing the timestamp of this file may cause import errors\n"
+	    << "# Original file location: " << in_name << '\n'
+	    << "import cadabra2\n"
+	    << "import imp\n"
+	    << "from cadabra2 import *\n"
+		 << "from cadabra2_defaults import *\n"
+	    << "__cdbkernel__ = cadabra2.__cdbkernel__\n"
+	    << "temp__all__ = dir() + ['temp__all__']\n\n"
+	    << "def display(ex):\n"
+	    << "   pass\n\n";
+
+	ofs << cdb2python_string(buffer.str(), display);
+	return ofs.str();
+	}
 
-std::string cadabra::cdb2python(const std::string& blk, bool display)
+std::string cadabra::cdb2python_string(const std::string& blk, bool display)
 	{
 	std::stringstream str(blk);
 	std::string line;

core/CdbPython.hh

@@ -16,6 +16,8 @@ namespace cadabra {
 
 	std::string cdb2python(const std::string&, bool display);
 
+	std::string cdb2python_string(const std::string&, bool display);	
+
 	/// \ingroup files
 	/// As above, but for a single line; for private use only.
 	/// If display is false, this will not make ';' characters