add to installer and file type support

jasp-stats · Aug 24, 2024 · 3bf0660 · 3bf0660
1 parent 291ac41
commit 3bf0660
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 14 deletions.
diff --git a/Desktop/data/importers/excelimporter.h b/Desktop/data/importers/excelimporter.h
@@ -30,9 +30,6 @@ class ExcelImporter : public Importer
 	ExcelImporter();
 	virtual ~ExcelImporter() {}
 
-
-	bool importerDeliversLabels() const override { return false; }
-
 protected:
 	ImportDataSet* loadFile(const std::string &locator, std::function<void(int)> progressCallback) override;
 

diff --git a/Engine/CMakeLists.txt b/Engine/CMakeLists.txt
@@ -107,16 +107,16 @@ if(WINDOWS)
     POST_BUILD DEPENDS ${CMAKE_BINARY_DIR}/R-Interface/libR-Interface.dll
     COMMAND ${CMAKE_COMMAND} -E copy_if_different ${RTOOLS_LIBGCC_S_SEH_DLL}
             ${CMAKE_BINARY_DIR}
-	COMMAND ${CMAKE_COMMAND} -E copy_if_different ${RTOOLS_LIBSTDCPP_DLL}
-			${CMAKE_BINARY_DIR}
-	COMMAND ${CMAKE_COMMAND} -E copy_if_different ${RTOOLS_MSYS_DLL}
-			${CMAKE_BINARY_DIR}
+    COMMAND ${CMAKE_COMMAND} -E copy_if_different ${RTOOLS_LIBSTDCPP_DLL}
+            ${CMAKE_BINARY_DIR}
+    COMMAND ${CMAKE_COMMAND} -E copy_if_different ${RTOOLS_MSYS_DLL}
+            ${CMAKE_BINARY_DIR}
     COMMAND ${CMAKE_COMMAND} -E copy_if_different ${RTOOLS_LIBWINPTHREAD_DLL}
             ${CMAKE_BINARY_DIR}
-			#COMMAND ${CMAKE_COMMAND} -E copy_if_different ${RTOOLS_LIBJSONCPP_DLL}
-	#        ${CMAKE_BINARY_DIR}
-	COMMAND ${CMAKE_COMMAND} -E copy_if_different ${RTOOLS_LIBREADSTAT_DLL}
-			${CMAKE_BINARY_DIR}
+    COMMAND ${CMAKE_COMMAND} -E copy_if_different ${RTOOLS_LIBREADSTAT_DLL}
+            ${CMAKE_BINARY_DIR}
+    COMMAND ${CMAKE_COMMAND} -E copy_if_different ${RTOOLS_LIBFREEXL_DLL}
+            ${CMAKE_BINARY_DIR}
     COMMAND ${CMAKE_COMMAND} -E copy_if_different ${RTOOLS_ZLIB_DLL}
             ${CMAKE_BINARY_DIR}
     COMMAND ${CMAKE_COMMAND} -E copy_if_different ${RTOOLS_LIBICONV_DLL}

diff --git a/Tools/CMake/Install.cmake b/Tools/CMake/Install.cmake
@@ -384,10 +384,11 @@ if(WIN32)
   install(
     FILES ${RTOOLS_LIBGCC_S_SEH_DLL}
           ${RTOOLS_LIBSTDCPP_DLL}
-		  ${RTOOLS_MSYS_DLL}
+          ${RTOOLS_MSYS_DLL}
           ${RTOOLS_LIBWINPTHREAD_DLL}
-		  #${RTOOLS_LIBJSONCPP_DLL}
-		  ${RTOOLS_LIBREADSTAT_DLL}
+          #${RTOOLS_LIBJSONCPP_DLL}
+          ${RTOOLS_LIBREADSTAT_DLL}
+          ${RTOOLS_LIBFREEXL_DLL}
           ${RTOOLS_ZLIB_DLL}
           ${RTOOLS_LIBICONV_DLL}
           ${_LIB_R_INTERFACE_DLL}

diff --git a/Tools/windows/msix/AppxManifest-nightly.xml.in b/Tools/windows/msix/AppxManifest-nightly.xml.in
@@ -55,6 +55,8 @@
             <uap:FileType>.csv</uap:FileType>
             <uap:FileType>.sav</uap:FileType>
             <uap:FileType>.ods</uap:FileType>
+            <uap:FileType>.xls</uap:FileType>
+            <uap:FileType>.xlsx</uap:FileType>
             <uap:FileType>.zsav</uap:FileType>
             <uap:FileType>.xpt</uap:FileType>
             <uap:FileType>.por</uap:FileType>

diff --git a/Tools/windows/msix/AppxManifest-sideload.xml.in b/Tools/windows/msix/AppxManifest-sideload.xml.in
@@ -55,6 +55,8 @@
             <uap:FileType>.csv</uap:FileType>
             <uap:FileType>.sav</uap:FileType>
             <uap:FileType>.ods</uap:FileType>
+            <uap:FileType>.xls</uap:FileType>
+            <uap:FileType>.xlsx</uap:FileType>
             <uap:FileType>.zsav</uap:FileType>
             <uap:FileType>.xpt</uap:FileType>
             <uap:FileType>.por</uap:FileType>

diff --git a/Tools/windows/msix/AppxManifest-store-beta.xml.in b/Tools/windows/msix/AppxManifest-store-beta.xml.in
@@ -55,6 +55,8 @@
             <uap:FileType>.csv</uap:FileType>
             <uap:FileType>.sav</uap:FileType>
             <uap:FileType>.ods</uap:FileType>
+            <uap:FileType>.xls</uap:FileType>
+            <uap:FileType>.xlsx</uap:FileType>
             <uap:FileType>.zsav</uap:FileType>
             <uap:FileType>.xpt</uap:FileType>
             <uap:FileType>.por</uap:FileType>

diff --git a/Tools/windows/msix/AppxManifest-store.xml.in b/Tools/windows/msix/AppxManifest-store.xml.in
@@ -55,6 +55,8 @@
             <uap:FileType>.csv</uap:FileType>
             <uap:FileType>.sav</uap:FileType>
             <uap:FileType>.ods</uap:FileType>
+            <uap:FileType>.xls</uap:FileType>
+            <uap:FileType>.xlsx</uap:FileType>
             <uap:FileType>.zsav</uap:FileType>
             <uap:FileType>.xpt</uap:FileType>
             <uap:FileType>.por</uap:FileType>