fix checkbox saving

mjoppich · Feb 5, 2019 · fa811d6 · fa811d6
1 parent 8b80990
commit fa811d6
Show file tree

Hide file tree

Showing 105 changed files with 27,668 additions and 21,273 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -83,7 +83,7 @@ if (APPLE)
     set(Qt5_DIR "/Users/markus/Qt/5.12.0/clang_64/")
     #set(ENV{OPENSSL_ROOT_DIR} "/usr/local/opt/openssl")
     #set(ENV{LUA_DIR} "/usr/local/opt/lua")
-
+
     set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
     set(CMAKE_INSTALL_RPATH "./")
 
@@ -104,7 +104,7 @@ if (WIN32)
         message(STATUS "IN MINGW")
     endif()
 
-    set(Qt5_DIR "C:/Qt/5.11.1/mingw53_32")
+    set(Qt5_DIR "D:/Qt/5.12.0/mingw73_64")
     set(ENV{OPENSSL_ROOT_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/extlib/openssl/")
     set(OPENSSL_ROOT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/extlib/openssl/")
     message(STATUS $ENV{OPENSSL_ROOT_DIR})
@@ -139,14 +139,14 @@ endforeach()
 #set(CMAKE_FRAMEWORK_PATH "${Qt5_DIR}/lib/cmake")
 
 # Basic information about project
-project(bioGUI VERSION 1.0)
+project(bioGUI VERSION 1.1)
 
 # Set PROJECT_VERSION_PATCH and PROJECT_VERSION_TWEAK to 0 if not present, needed by add_project_meta
 fix_project_version()
 
 # Set additional project information
 set(COMPANY "LFE Bioinformatik")
-set(COPYRIGHT "Copyright (c) 2016 Markus Joppich. All rights reserved.")
+set(COPYRIGHT "Copyright (c) 2019 Markus Joppich. All rights reserved.")
 set(IDENTIFIER "de.lmu.ifi.bio.mjoppich")
 
 
@@ -174,11 +174,10 @@ message(STATUS "   *** Lua DLL dir: ${LUA_DLL_DIR}")
 set(CMAKE_FIND_LIBRARY_SUFFIXES ".so .a")
 
 # Search OpenSSL
-set(OPENSSL_USE_STATIC_LIBS True)
+set(OPENSSL_USE_STATIC_LIBS TRUE)
 find_package(OpenSSL)
 
 if( OPENSSL_FOUND )
-
     include_directories(${OPENSSL_INCLUDE_DIRS})
 
     message(STATUS "Using OpenSSL ${OPENSSL_VERSION}")
@@ -245,7 +244,7 @@ if (APPLE)
     LIST(APPEND META_FILES_TO_INCLUDE "${BIOGUI_NETOWRK_INI}")
 
     set(BIOGUI_INSTALL_TEMPLATES_GUI "${CMAKE_CURRENT_SOURCE_DIR}/templates/WSL_install.gui")
-    set_source_files_properties(${BIOGUI_INSTALL_TEMPLATES_GUI} PROPERTIES MACOSX_PACKAGE_LOCATION MacOS/templates/)
+    set_source_files_properties(${BIOGUI_INSTALL_TEMPLATES_GUI} PROPERTIES MACOSX_PACKAGE_LOCATION MacOS/templates/)
     set_source_files_properties(${BIOGUI_INSTALL_TEMPLATES_GUI} PROPERTIES MACOSX_PACKAGE_LOCATION MacOS/install_templates/)
 
     LIST(APPEND META_FILES_TO_INCLUDE "${BIOGUI_INSTALL_TEMPLATES_GUI}")
@@ -262,21 +261,19 @@ add_executable(${PROJECT_NAME} ${OS_BUNDLE} # Expands to WIN32 or MACOS_BUNDLE d
 )
 
 
-ADD_LIBRARY(mylibeay STATIC IMPORTED)
-SET_TARGET_PROPERTIES(mylibeay PROPERTIES IMPORTED_LOCATION "${OPENSSL_SSL_LIBRARY}")
+ADD_LIBRARY(openssl_crypto STATIC IMPORTED)
+SET_TARGET_PROPERTIES(openssl_crypto PROPERTIES IMPORTED_LOCATION "${OPENSSL_CRYPTO_LIBRARY}")
 
-ADD_LIBRARY(myssleay STATIC IMPORTED)
-SET_TARGET_PROPERTIES(myssleay PROPERTIES IMPORTED_LOCATION "${OPENSSL_CRYPTO_LIBRARY}")
+ADD_LIBRARY(openssl_ssl STATIC IMPORTED)
+SET_TARGET_PROPERTIES(openssl_ssl PROPERTIES IMPORTED_LOCATION "${OPENSSL_SSL_LIBRARY}")
 
-#ADD_LIBRARY(lualib STATIC IMPORTED IMPORTED_LOCATION "${LUA_LIBRARY}")
-#SET_TARGET_PROPERTIES(lualib PROPERTIES IMPORTED_LOCATION "${LUA_LIBRARY}")
+LINK_DIRECTORIES( ${LINK_DIRECTORIES} "${CMAKE_CURRENT_SOURCE_DIR}/extlib/ssl/")
 
 ADD_LIBRARY(lualib STATIC IMPORTED)
 SET_TARGET_PROPERTIES(lualib PROPERTIES IMPORTED_LOCATION "${LUA_LIBRARY}")
 
 target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
-TARGET_LINK_LIBRARIES(${PROJECT_NAME} mylibeay myssleay m lualib ${CMAKE_DL_LIBS})
-
+TARGET_LINK_LIBRARIES(${PROJECT_NAME} openssl_crypto openssl_ssl lualib ${CMAKE_DL_LIBS} )
 
 qt5_use_modules(${PROJECT_NAME} Core Gui Widgets Network Xml XmlPatterns)
 install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX} )
@@ -464,8 +461,8 @@ if (NOT APPLE)
     install(FILES $<$<CONFIG:Debug>:${Qt5_XmlLocation_Debug}>$<$<NOT:$<CONFIG:Debug>>:${Qt5_XmlLocation}> DESTINATION ${CMAKE_INSTALL_PREFIX} RENAME ${Qt5_XmlSOName})
     install(FILES $<$<CONFIG:Debug>:${Qt5_XmlPatternsLocation_Debug}>$<$<NOT:$<CONFIG:Debug>>:${Qt5_XmlPatternsLocation}> DESTINATION ${CMAKE_INSTALL_PREFIX} RENAME ${Qt5_XmlPatternsSOName})
     install(FILES $<$<CONFIG:Debug>:${Qt5_NetworkLocation_Debug}>$<$<NOT:$<CONFIG:Debug>>:${Qt5_NetworkLocation}> DESTINATION ${CMAKE_INSTALL_PREFIX} RENAME ${Qt5_NetworkSOName})
-    install(FILES $<$<CONFIG:Debug>:${Qt5_GuiLocation_Debug}>$<$<NOT:$<CONFIG:Debug>>:${Qt5_GuiLocation}> DESTINATION ${CMAKE_INSTALL_PREFIX} RENAME ${Qt5_GuiSOName})
-
+    install(FILES $<$<CONFIG:Debug>:${Qt5_GuiLocation_Debug}>$<$<NOT:$<CONFIG:Debug>>:${Qt5_GuiLocation}> DESTINATION ${CMAKE_INSTALL_PREFIX} RENAME ${Qt5_GuiSOName})
+
 get_filename_component(QT5GUI_DIR ${Qt5_GuiLocation} DIRECTORY)
 install(DIRECTORY ${QT5GUI_DIR}/../plugins/platforms/ DESTINATION platforms)
 endif()
@@ -476,22 +473,33 @@ endif()
 
             get_filename_component(MINGW_BUILD_BIN ${CMAKE_CXX_COMPILER} PATH)
 
-            add_custom_command( TARGET ${PROJECT_NAME} POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different ${MINGW_BUILD_BIN}/libgcc_s_dw2-1.dll ${PROJECT_BINARY_DIR})
+            add_custom_command( TARGET ${PROJECT_NAME} POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different ${MINGW_BUILD_BIN}/libgcc_s_seh-1.dll ${PROJECT_BINARY_DIR})
             add_custom_command( TARGET ${PROJECT_NAME} POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different ${MINGW_BUILD_BIN}/libstdc++-6.dll ${PROJECT_BINARY_DIR})
             add_custom_command( TARGET ${PROJECT_NAME} POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different ${MINGW_BUILD_BIN}/libwinpthread-1.dll ${PROJECT_BINARY_DIR})
+
+            add_custom_command( TARGET ${PROJECT_NAME} POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/extlib/openssl/libeay32.dll ${PROJECT_BINARY_DIR})
+            add_custom_command( TARGET ${PROJECT_NAME} POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/extlib/openssl/ssleay32.dll ${PROJECT_BINARY_DIR})
+            add_custom_command( TARGET ${PROJECT_NAME} POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/extlib/lua/lua53.dll ${PROJECT_BINARY_DIR})
 
-			    file(GLOB biogui_win_libs
-					${MINGW_BUILD_BIN}/libgcc_s_dw2-1.dll
-					${MINGW_BUILD_BIN}/libstdc++-6.dll
-					${MINGW_BUILD_BIN}/libwinpthread-1.dll
-					)
+
+            message(STATUS "CURRENT SOURCE DIR")
+            message(STATUS "${CMAKE_CURRENT_SOURCE_DIR}")
+
+            file(GLOB biogui_win_libs
+                        ${MINGW_BUILD_BIN}/libgcc_s_seh-1.dll
+                        ${MINGW_BUILD_BIN}/libstdc++-6.dll
+                        ${MINGW_BUILD_BIN}/libwinpthread-1.dll
+                        ${CMAKE_CURRENT_SOURCE_DIR}/extlib/openssl/libeay32.dll
+                        ${CMAKE_CURRENT_SOURCE_DIR}/extlib/openssl/ssleay32.dll
+                        ${CMAKE_CURRENT_SOURCE_DIR}/extlib/lua/lua53.dll
+                        )
 
             foreach (_file ${biogui_win_libs})
                 get_filename_component(_resolvedFile "${_file}" REALPATH)
                 get_filename_component(_originalName "${_file}" NAME)
                 get_filename_component(_originalExt "${_file}" EXT)
 
-                #message(STATUS "${_resolvedFile} ${_originalName} ${_originalExt}")
+                message(STATUS "${_resolvedFile} ${_originalName} ${_originalExt}")
 
                 install(FILES ${_resolvedFile} DESTINATION ${CMAKE_INSTALL_PREFIX} RENAME "${_originalName}")
             endforeach()

diff --git a/config.ini b/config.ini
@@ -2,4 +2,4 @@
 location=https://services.bio.ifi.lmu.de:1047/biogui/
 
 [bash]
-location=C:\\WINDOWS\\Sysnative\\wsl.exe
+location=C:\\Windows\\System32\\wsl.exe
diff --git a/extlib/lua/include/lauxlib.h b/extlib/lua/include/lauxlib.h
@@ -1,5 +1,5 @@
 /*
-** $Id: lauxlib.h,v 1.131 2016/12/06 14:54:31 roberto Exp $
+** $Id: lauxlib.h,v 1.131.1.1 2017/04/19 17:20:42 roberto Exp $
 ** Auxiliary functions for building Lua libraries
 ** See Copyright Notice in lua.h
 */

diff --git a/extlib/lua/include/lua.h b/extlib/lua/include/lua.h
@@ -1,5 +1,5 @@
 /*
-** $Id: lua.h,v 1.332 2016/12/22 15:51:20 roberto Exp $
+** $Id: lua.h,v 1.332.1.2 2018/06/13 16:58:17 roberto Exp $
 ** Lua - A Scripting Language
 ** Lua.org, PUC-Rio, Brazil (http://www.lua.org)
 ** See Copyright Notice at the end of this file
@@ -19,11 +19,11 @@
 #define LUA_VERSION_MAJOR	"5"
 #define LUA_VERSION_MINOR	"3"
 #define LUA_VERSION_NUM		503
-#define LUA_VERSION_RELEASE	"4"
+#define LUA_VERSION_RELEASE	"5"
 
 #define LUA_VERSION	"Lua " LUA_VERSION_MAJOR "." LUA_VERSION_MINOR
 #define LUA_RELEASE	LUA_VERSION "." LUA_VERSION_RELEASE
-#define LUA_COPYRIGHT	LUA_RELEASE "  Copyright (C) 1994-2017 Lua.org, PUC-Rio"
+#define LUA_COPYRIGHT	LUA_RELEASE "  Copyright (C) 1994-2018 Lua.org, PUC-Rio"
 #define LUA_AUTHORS	"R. Ierusalimschy, L. H. de Figueiredo, W. Celes"
 
 
@@ -460,7 +460,7 @@ struct lua_Debug {
 
 
 /******************************************************************************
-* Copyright (C) 1994-2017 Lua.org, PUC-Rio.
+* Copyright (C) 1994-2018 Lua.org, PUC-Rio.
 *
 * Permission is hereby granted, free of charge, to any person obtaining
 * a copy of this software and associated documentation files (the

diff --git a/extlib/lua/include/luaconf.h b/extlib/lua/include/luaconf.h
@@ -1,5 +1,5 @@
 /*
-** $Id: luaconf.h,v 1.259 2016/12/22 13:08:50 roberto Exp $
+** $Id: luaconf.h,v 1.259.1.1 2017/04/19 17:29:57 roberto Exp $
 ** Configuration file for Lua
 ** See Copyright Notice in lua.h
 */
@@ -622,6 +622,13 @@
 #endif
 
 
+/*
+@@ lua_pointer2str converts a pointer to a readable string in a
+** non-specified way.
+*/
+#define lua_pointer2str(buff,sz,p)	l_sprintf(buff,sz,"%p",p)
+
+
 /*
 @@ lua_number2strx converts a float to an hexadecimal numeric string.
 ** In C99, 'sprintf' (with format specifiers '%a'/'%A') does that.

diff --git a/extlib/lua/include/lualib.h b/extlib/lua/include/lualib.h
@@ -1,5 +1,5 @@
 /*
-** $Id: lualib.h,v 1.45 2017/01/12 17:14:26 roberto Exp $
+** $Id: lualib.h,v 1.45.1.1 2017/04/19 17:20:42 roberto Exp $
 ** Lua standard libraries
 ** See Copyright Notice in lua.h
 */

diff --git a/extlib/lua/liblua53.a b/extlib/lua/liblua53.a
diff --git a/extlib/openssl/BUILD-HOMEPAGE.url b/extlib/openssl/BUILD-HOMEPAGE.url
@@ -1,2 +1,2 @@
-[InternetShortcut]
-URL=https://github.com/vszakats/curl-for-win
+[InternetShortcut]
+URL=https://github.com/vszakats/harbour-deps
diff --git a/extlib/openssl/BUILD-README.txt b/extlib/openssl/BUILD-README.txt
@@ -1,3 +1,10 @@
-Visit the project page for details about these builds and the list of changes:
-
-   https://github.com/vszakats/curl-for-win
+Visit the project page for details about these builds and the list of changes:
+
+   https://github.com/vszakats/harbour-deps
+
+Please donate to support maintaining these builds:
+
+   PayPal:
+      https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=2DZM6WAGRJWT6
+
+Thank you!