diff --git a/CMakeLists.txt b/CMakeLists.txt index c48ff3c9..92cd7550 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,6 +7,7 @@ set(BUILD_CXX_LANGUAGE_PACKAGE OFF CACHE BOOL "Add C and C++ support to the Sour set(BUILD_JAVA_LANGUAGE_PACKAGE OFF CACHE BOOL "Add Java support to the Sourcetrail indexer.") set(BUILD_PYTHON_LANGUAGE_PACKAGE OFF CACHE BOOL "Add Python support to the Sourcetrail indexer.") set(DOCKER_BUILD OFF CACHE BOOL "Build runs in Docker") +set(CONFIGURE_WINDOWS_DEBUG ON CACHE BOOL "Configure Debug Build for Windows") #set (CMAKE_VERBOSE_MAKEFILE ON) @@ -137,9 +138,6 @@ endif() # Setup --------------------------------------------------------------------------- if (WIN32) - get_filename_component(QT_BINARY_DIR "${QT_MOC_EXECUTABLE}" PATH) - set(QT_PLUGINS_DIR "${QT_BINARY_DIR}/../plugins") - function(COPY_QT_BINARIES IS_DEBUG IS_APP) set(SUFFIX "") if (IS_DEBUG) @@ -168,33 +166,70 @@ if (WIN32) endif() - configure_file("${QT_BINARY_DIR}/Qt5Core${SUFFIX}.dll" "${CMAKE_BINARY_DIR}/${CONFIGURATION}/${TARGET}/Qt5Core${SUFFIX}.dll" COPYONLY) - configure_file("${QT_BINARY_DIR}/Qt5Gui${SUFFIX}.dll" "${CMAKE_BINARY_DIR}/${CONFIGURATION}/${TARGET}/Qt5Gui${SUFFIX}.dll" COPYONLY) - configure_file("${QT_BINARY_DIR}/Qt5Network${SUFFIX}.dll" "${CMAKE_BINARY_DIR}/${CONFIGURATION}/${TARGET}/Qt5Network${SUFFIX}.dll" COPYONLY) - configure_file("${QT_BINARY_DIR}/Qt5Svg${SUFFIX}.dll" "${CMAKE_BINARY_DIR}/${CONFIGURATION}/${TARGET}/Qt5Svg${SUFFIX}.dll" COPYONLY) - configure_file("${QT_BINARY_DIR}/Qt5Widgets${SUFFIX}.dll" "${CMAKE_BINARY_DIR}/${CONFIGURATION}/${TARGET}/Qt5Widgets${SUFFIX}.dll" COPYONLY) - configure_file("${QT_BINARY_DIR}/Qt5WinExtras${SUFFIX}.dll" "${CMAKE_BINARY_DIR}/${CONFIGURATION}/${TARGET}/Qt5WinExtras${SUFFIX}.dll" COPYONLY) + configure_file("${_qt5Core_install_prefix}/bin/Qt5Core${SUFFIX}.dll" "${CMAKE_BINARY_DIR}/${CONFIGURATION}/${TARGET}/Qt5Core${SUFFIX}.dll" COPYONLY) + configure_file("${_qt5Gui_install_prefix}/bin/Qt5Gui${SUFFIX}.dll" "${CMAKE_BINARY_DIR}/${CONFIGURATION}/${TARGET}/Qt5Gui${SUFFIX}.dll" COPYONLY) + configure_file("${_qt5Network_install_prefix}/bin/Qt5Network${SUFFIX}.dll" "${CMAKE_BINARY_DIR}/${CONFIGURATION}/${TARGET}/Qt5Network${SUFFIX}.dll" COPYONLY) + configure_file("${_qt5Svg_install_prefix}/bin/Qt5Svg${SUFFIX}.dll" "${CMAKE_BINARY_DIR}/${CONFIGURATION}/${TARGET}/Qt5Svg${SUFFIX}.dll" COPYONLY) + configure_file("${_qt5Widgets_install_prefix}/bin/Qt5Widgets${SUFFIX}.dll" "${CMAKE_BINARY_DIR}/${CONFIGURATION}/${TARGET}/Qt5Widgets${SUFFIX}.dll" COPYONLY) + configure_file("${_qt5WinExtras_install_prefix}/bin/Qt5WinExtras${SUFFIX}.dll" "${CMAKE_BINARY_DIR}/${CONFIGURATION}/${TARGET}/Qt5WinExtras${SUFFIX}.dll" COPYONLY) - configure_file("${QT_PLUGINS_DIR}/platforms/qwindows${SUFFIX}.dll" "${CMAKE_BINARY_DIR}/${CONFIGURATION}/${TARGET}/platforms/qwindows${SUFFIX}.dll" COPYONLY) + configure_file("${_qt5Core_install_prefix}/plugins/platforms/qwindows${SUFFIX}.dll" "${CMAKE_BINARY_DIR}/${CONFIGURATION}/${TARGET}/platforms/qwindows${SUFFIX}.dll" COPYONLY) - configure_file("${QT_PLUGINS_DIR}/styles/qwindowsvistastyle${SUFFIX}.dll" "${CMAKE_BINARY_DIR}/${CONFIGURATION}/${TARGET}/styles/qwindowsvistastyle${SUFFIX}.dll" COPYONLY) + configure_file("${_qt5Core_install_prefix}/plugins/styles/qwindowsvistastyle${SUFFIX}.dll" "${CMAKE_BINARY_DIR}/${CONFIGURATION}/${TARGET}/styles/qwindowsvistastyle${SUFFIX}.dll" COPYONLY) - configure_file("${QT_PLUGINS_DIR}/imageformats/qgif${SUFFIX}.dll" "${CMAKE_BINARY_DIR}/${CONFIGURATION}/${TARGET}/imageformats/qgif${SUFFIX}.dll" COPYONLY) - configure_file("${QT_PLUGINS_DIR}/imageformats/qicns${SUFFIX}.dll" "${CMAKE_BINARY_DIR}/${CONFIGURATION}/${TARGET}/imageformats/qicns${SUFFIX}.dll" COPYONLY) - configure_file("${QT_PLUGINS_DIR}/imageformats/qico${SUFFIX}.dll" "${CMAKE_BINARY_DIR}/${CONFIGURATION}/${TARGET}/imageformats/qico${SUFFIX}.dll" COPYONLY) - configure_file("${QT_PLUGINS_DIR}/imageformats/qjpeg${SUFFIX}.dll" "${CMAKE_BINARY_DIR}/${CONFIGURATION}/${TARGET}/imageformats/qjpeg${SUFFIX}.dll" COPYONLY) - configure_file("${QT_PLUGINS_DIR}/imageformats/qsvg${SUFFIX}.dll" "${CMAKE_BINARY_DIR}/${CONFIGURATION}/${TARGET}/imageformats/qsvg${SUFFIX}.dll" COPYONLY) - configure_file("${QT_PLUGINS_DIR}/imageformats/qtga${SUFFIX}.dll" "${CMAKE_BINARY_DIR}/${CONFIGURATION}/${TARGET}/imageformats/qtga${SUFFIX}.dll" COPYONLY) - configure_file("${QT_PLUGINS_DIR}/imageformats/qtiff${SUFFIX}.dll" "${CMAKE_BINARY_DIR}/${CONFIGURATION}/${TARGET}/imageformats/qtiff${SUFFIX}.dll" COPYONLY) - configure_file("${QT_PLUGINS_DIR}/imageformats/qwbmp${SUFFIX}.dll" "${CMAKE_BINARY_DIR}/${CONFIGURATION}/${TARGET}/imageformats/qwbmp${SUFFIX}.dll" COPYONLY) - configure_file("${QT_PLUGINS_DIR}/imageformats/qwebp${SUFFIX}.dll" "${CMAKE_BINARY_DIR}/${CONFIGURATION}/${TARGET}/imageformats/qwebp${SUFFIX}.dll" COPYONLY) + configure_file("${_qt5Core_install_prefix}/plugins/imageformats/qgif${SUFFIX}.dll" "${CMAKE_BINARY_DIR}/${CONFIGURATION}/${TARGET}/imageformats/qgif${SUFFIX}.dll" COPYONLY) + configure_file("${_qt5Core_install_prefix}/plugins/imageformats/qico${SUFFIX}.dll" "${CMAKE_BINARY_DIR}/${CONFIGURATION}/${TARGET}/imageformats/qico${SUFFIX}.dll" COPYONLY) + configure_file("${_qt5Core_install_prefix}/plugins/imageformats/qjpeg${SUFFIX}.dll" "${CMAKE_BINARY_DIR}/${CONFIGURATION}/${TARGET}/imageformats/qjpeg${SUFFIX}.dll" COPYONLY) + configure_file("${_qt5Svg_install_prefix}/plugins/imageformats/qsvg${SUFFIX}.dll" "${CMAKE_BINARY_DIR}/${CONFIGURATION}/${TARGET}/imageformats/qsvg${SUFFIX}.dll" COPYONLY) + + + if (EXISTS "${_qt5Core_install_prefix}/plugins/imageformats/qtga${SUFFIX}.dll") + SET(QT_IMAGEFORMATS_PREFIX "${_qt5Core_install_prefix}/plugins/imageformats") + else() + SET(QT_IMAGEFORMATS_PREFIX "${_qt5Core_install_prefix}/../qtimageformats/plugins/imageformats") + endif() + + configure_file("${QT_IMAGEFORMATS_PREFIX}/qicns${SUFFIX}.dll" "${CMAKE_BINARY_DIR}/${CONFIGURATION}/${TARGET}/imageformats/qicns${SUFFIX}.dll" COPYONLY) + configure_file("${QT_IMAGEFORMATS_PREFIX}/qtga${SUFFIX}.dll" "${CMAKE_BINARY_DIR}/${CONFIGURATION}/${TARGET}/imageformats/qtga${SUFFIX}.dll" COPYONLY) + configure_file("${QT_IMAGEFORMATS_PREFIX}/qtiff${SUFFIX}.dll" "${CMAKE_BINARY_DIR}/${CONFIGURATION}/${TARGET}/imageformats/qtiff${SUFFIX}.dll" COPYONLY) + configure_file("${QT_IMAGEFORMATS_PREFIX}/qwbmp${SUFFIX}.dll" "${CMAKE_BINARY_DIR}/${CONFIGURATION}/${TARGET}/imageformats/qwbmp${SUFFIX}.dll" COPYONLY) + configure_file("${QT_IMAGEFORMATS_PREFIX}/qwebp${SUFFIX}.dll" "${CMAKE_BINARY_DIR}/${CONFIGURATION}/${TARGET}/imageformats/qwebp${SUFFIX}.dll" COPYONLY) endfunction(COPY_QT_BINARIES) - COPY_QT_BINARIES(True True) - COPY_QT_BINARIES(True False) + if (CONFIGURE_WINDOWS_DEBUG) + COPY_QT_BINARIES(True True) + COPY_QT_BINARIES(True False) + endif() COPY_QT_BINARIES(False True) COPY_QT_BINARIES(False False) + + string(REGEX REPLACE "/" "\\\\" BACKSLASHED_CMAKE_BINARY_DIR ${CMAKE_BINARY_DIR}) + string(REGEX REPLACE "/" "\\\\" BACKSLASHED_CMAKE_SOURCE_DIR ${CMAKE_SOURCE_DIR}) + + EXECUTE_PROCESS( + COMMAND "cmd.exe" "/K" "rmdir" "${BACKSLASHED_CMAKE_BINARY_DIR}\\Release\\app\\data" "&" "exit" + COMMAND "cmd.exe" "/K" "rmdir" "${BACKSLASHED_CMAKE_BINARY_DIR}\\Release\\app\\user" "&" "exit" + COMMAND "cmd.exe" "/K" "rmdir" "${BACKSLASHED_CMAKE_BINARY_DIR}\\Release\\test\\data" "&" "exit" + ) + EXECUTE_PROCESS( + COMMAND "cmd.exe" "/K" "mklink" "/d" "/j" "${BACKSLASHED_CMAKE_BINARY_DIR}\\Release\\app\\data" "${BACKSLASHED_CMAKE_SOURCE_DIR}\\bin\\app\\data" "&" "exit" + COMMAND "cmd.exe" "/K" "mklink" "/d" "/j" "${BACKSLASHED_CMAKE_BINARY_DIR}\\Release\\app\\user" "${BACKSLASHED_CMAKE_SOURCE_DIR}\\bin\\app\\user" "&" "exit" + COMMAND "cmd.exe" "/K" "mklink" "/d" "/j" "${BACKSLASHED_CMAKE_BINARY_DIR}\\Release\\test\\data" "${BACKSLASHED_CMAKE_SOURCE_DIR}\\bin\\test\\data" "&" "exit" + ) + if (CONFIGURE_WINDOWS_DEBUG) + EXECUTE_PROCESS( + COMMAND "cmd.exe" "/K" "rmdir" "${BACKSLASHED_CMAKE_BINARY_DIR}\\Debug\\app\\data" "&" "exit" + COMMAND "cmd.exe" "/K" "rmdir" "${BACKSLASHED_CMAKE_BINARY_DIR}\\Debug\\app\\user" "&" "exit" + COMMAND "cmd.exe" "/K" "rmdir" "${BACKSLASHED_CMAKE_BINARY_DIR}\\Debug\\test\\data" "&" "exit" + ) + EXECUTE_PROCESS( + COMMAND "cmd.exe" "/K" "mklink" "/d" "/j" "${BACKSLASHED_CMAKE_BINARY_DIR}\\Debug\\app\\data" "${BACKSLASHED_CMAKE_SOURCE_DIR}\\bin\\app\\data" "&" "exit" + COMMAND "cmd.exe" "/K" "mklink" "/d" "/j" "${BACKSLASHED_CMAKE_BINARY_DIR}\\Debug\\app\\user" "${BACKSLASHED_CMAKE_SOURCE_DIR}\\bin\\app\\user" "&" "exit" + COMMAND "cmd.exe" "/K" "mklink" "/d" "/j" "${BACKSLASHED_CMAKE_BINARY_DIR}\\Debug\\test\\data" "${BACKSLASHED_CMAKE_SOURCE_DIR}\\bin\\test\\data" "&" "exit" + ) + endif() + configure_file("${CMAKE_SOURCE_DIR}/setup/icon/windows/sourcetrail.ico" "${CMAKE_BINARY_DIR}/${CONFIGURATION}/sourcetrail.ico" COPYONLY) endif() @@ -596,19 +631,6 @@ if (WIN32) # generate pdb for release build set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Zi") - - string(REGEX REPLACE "/" "\\\\" BACKSLASHED_CMAKE_BINARY_DIR ${CMAKE_BINARY_DIR}) - string(REGEX REPLACE "/" "\\\\" BACKSLASHED_CMAKE_SOURCE_DIR ${CMAKE_SOURCE_DIR}) - - add_custom_command( - TARGET ${APP_PROJECT_NAME} - POST_BUILD - COMMAND rmdir "${BACKSLASHED_CMAKE_BINARY_DIR}\\Debug\\app\\data" & mklink /d /j "${BACKSLASHED_CMAKE_BINARY_DIR}\\Debug\\app\\data" "${BACKSLASHED_CMAKE_SOURCE_DIR}\\bin\\app\\data" - COMMAND rmdir "${BACKSLASHED_CMAKE_BINARY_DIR}\\Debug\\app\\user" & mklink /d /j "${BACKSLASHED_CMAKE_BINARY_DIR}\\Debug\\app\\user" "${BACKSLASHED_CMAKE_SOURCE_DIR}\\bin\\app\\user" - COMMAND rmdir "${BACKSLASHED_CMAKE_BINARY_DIR}\\Release\\app\\data" & mklink /d /j "${BACKSLASHED_CMAKE_BINARY_DIR}\\Release\\app\\data" "${BACKSLASHED_CMAKE_SOURCE_DIR}\\bin\\app\\data" - COMMAND rmdir "${BACKSLASHED_CMAKE_BINARY_DIR}\\Release\\app\\user" & mklink /d /j "${BACKSLASHED_CMAKE_BINARY_DIR}\\Release\\app\\user" "${BACKSLASHED_CMAKE_SOURCE_DIR}\\bin\\app\\user" - COMMENT "create symbolic links for data" - ) else () add_executable(${APP_PROJECT_NAME} ${APP_FILES}) endif () diff --git a/bin/test/data/SourceGroupTestSuite/cxx_c_empty/expected_output/output_windows.txt b/bin/test/data/SourceGroupTestSuite/cxx_c_empty/expected_output/output_windows.txt index b1c49a6c..00dd4b55 100644 --- a/bin/test/data/SourceGroupTestSuite/cxx_c_empty/expected_output/output_windows.txt +++ b/bin/test/data/SourceGroupTestSuite/cxx_c_empty/expected_output/output_windows.txt @@ -1,4 +1,4 @@ -SourceFilePath: "src/Test.c" +SourceFilePath: "src/test.c" IndexedPath: "src" CompilerFlag: "--target=test_arch-test_vendor-test_sys-test_abi" CompilerFlag: "-std=c11" @@ -15,5 +15,5 @@ SourceFilePath: "src/Test.c" CompilerFlag: "-iframework" CompilerFlag: "test/framework/search/path" CompilerFlag: "-local-flag" - CompilerFlag: "src/Test.c" + CompilerFlag: "src/test.c" ExcludeFilter: "**/excluded/**" diff --git a/bin/test/data/SourceGroupTestSuite/cxx_cdb/expected_output/output_windows.txt b/bin/test/data/SourceGroupTestSuite/cxx_cdb/expected_output/output_windows.txt index 902b2ad3..988310f9 100644 --- a/bin/test/data/SourceGroupTestSuite/cxx_cdb/expected_output/output_windows.txt +++ b/bin/test/data/SourceGroupTestSuite/cxx_cdb/expected_output/output_windows.txt @@ -1,5 +1,5 @@ -SourceFilePath: "src/Test.cpp" - IndexedPath: "src/Test.cpp" +SourceFilePath: "src/test.cpp" + IndexedPath: "src/test.cpp" IndexedPath: "test/indexed/header/path" CompilerFlag: "clang-tool" CompilerFlag: "-fms-extensions" diff --git a/bin/test/data/SourceGroupTestSuite/cxx_codeblocks/expected_output/output_windows.txt b/bin/test/data/SourceGroupTestSuite/cxx_codeblocks/expected_output/output_windows.txt index db5e6b46..4676db2c 100644 --- a/bin/test/data/SourceGroupTestSuite/cxx_codeblocks/expected_output/output_windows.txt +++ b/bin/test/data/SourceGroupTestSuite/cxx_codeblocks/expected_output/output_windows.txt @@ -1,5 +1,5 @@ -SourceFilePath: "src/Test.cpp" - IndexedPath: "src/Test.cpp" +SourceFilePath: "src/test.cpp" + IndexedPath: "src/test.cpp" IndexedPath: "test/indexed/header/path" CompilerFlag: "-isystem" CompilerFlag: "data/cxx/include/" @@ -18,5 +18,5 @@ SourceFilePath: "src/Test.cpp" CompilerFlag: "test/framework/search/path" CompilerFlag: "-local-flag" CompilerFlag: "-std=c++11" - CompilerFlag: "src/Test.cpp" + CompilerFlag: "src/test.cpp" ExcludeFilter: "**/excluded/**" diff --git a/bin/test/data/SourceGroupTestSuite/cxx_cpp_empty/expected_output/output_windows.txt b/bin/test/data/SourceGroupTestSuite/cxx_cpp_empty/expected_output/output_windows.txt index a06cf22e..7f4815ab 100644 --- a/bin/test/data/SourceGroupTestSuite/cxx_cpp_empty/expected_output/output_windows.txt +++ b/bin/test/data/SourceGroupTestSuite/cxx_cpp_empty/expected_output/output_windows.txt @@ -1,4 +1,4 @@ -SourceFilePath: "src/Test.cpp" +SourceFilePath: "src/test.cpp" IndexedPath: "src" CompilerFlag: "--target=test_arch-test_vendor-test_sys-test_abi" CompilerFlag: "-std=c++11" @@ -17,5 +17,5 @@ SourceFilePath: "src/Test.cpp" CompilerFlag: "-iframework" CompilerFlag: "test/framework/search/path" CompilerFlag: "-local-flag" - CompilerFlag: "src/Test.cpp" + CompilerFlag: "src/test.cpp" ExcludeFilter: "**/excluded/**" diff --git a/bin/test/data/SourceGroupTestSuite/java_empty/expected_output/output_windows.txt b/bin/test/data/SourceGroupTestSuite/java_empty/expected_output/output_windows.txt index 01d786b5..90620585 100644 --- a/bin/test/data/SourceGroupTestSuite/java_empty/expected_output/output_windows.txt +++ b/bin/test/data/SourceGroupTestSuite/java_empty/expected_output/output_windows.txt @@ -1,16 +1,16 @@ -SourceFilePath: "src/foo/Bar.java" +SourceFilePath: "src/foo/bar.java" LanguageStandard: "10" ClassPathItem: "lib/dependency.jar" ClassPathItem: "classpath_dir" ClassPathItem: "test/jre/system/library/path.jar" ClassPathItem: "src" -SourceFilePath: "src/foo/FooBar.java" +SourceFilePath: "src/foo/foobar.java" LanguageStandard: "10" ClassPathItem: "lib/dependency.jar" ClassPathItem: "classpath_dir" ClassPathItem: "test/jre/system/library/path.jar" ClassPathItem: "src" -SourceFilePath: "src/foo/Main.java" +SourceFilePath: "src/foo/main.java" LanguageStandard: "10" ClassPathItem: "lib/dependency.jar" ClassPathItem: "classpath_dir" diff --git a/bin/test/data/SourceGroupTestSuite/java_gradle/expected_output/output_windows.txt b/bin/test/data/SourceGroupTestSuite/java_gradle/expected_output/output_windows.txt index 15caa0e9..0e79d221 100644 --- a/bin/test/data/SourceGroupTestSuite/java_gradle/expected_output/output_windows.txt +++ b/bin/test/data/SourceGroupTestSuite/java_gradle/expected_output/output_windows.txt @@ -1,9 +1,9 @@ -SourceFilePath: "src/main/java/hello/Greeter.java" +SourceFilePath: "src/main/java/hello/greeter.java" LanguageStandard: "10" ClassPathItem: "test/jre/system/library/path.jar" ClassPathItem: "src/main/java" ClassPathItem: "src/test/java" -SourceFilePath: "src/test/java/hello/HelloWorldTests.java" +SourceFilePath: "src/test/java/hello/helloworldtests.java" LanguageStandard: "10" ClassPathItem: "test/jre/system/library/path.jar" ClassPathItem: "src/main/java" diff --git a/bin/test/data/SourceGroupTestSuite/java_maven/expected_output/output_windows.txt b/bin/test/data/SourceGroupTestSuite/java_maven/expected_output/output_windows.txt index 0c293c48..8857953f 100644 --- a/bin/test/data/SourceGroupTestSuite/java_maven/expected_output/output_windows.txt +++ b/bin/test/data/SourceGroupTestSuite/java_maven/expected_output/output_windows.txt @@ -1,19 +1,19 @@ -SourceFilePath: "my-app/src/main/java/com/mycompany/app/Bar.java" +SourceFilePath: "my-app/src/main/java/com/mycompany/app/bar.java" LanguageStandard: "10" ClassPathItem: "test/jre/system/library/path.jar" ClassPathItem: "my-app/src/main/java" ClassPathItem: "my-app/src/test/java" -SourceFilePath: "my-app/src/main/java/com/mycompany/app/FooBar.java" +SourceFilePath: "my-app/src/main/java/com/mycompany/app/foobar.java" LanguageStandard: "10" ClassPathItem: "test/jre/system/library/path.jar" ClassPathItem: "my-app/src/main/java" ClassPathItem: "my-app/src/test/java" -SourceFilePath: "my-app/src/main/java/com/mycompany/app/Main.java" +SourceFilePath: "my-app/src/main/java/com/mycompany/app/main.java" LanguageStandard: "10" ClassPathItem: "test/jre/system/library/path.jar" ClassPathItem: "my-app/src/main/java" ClassPathItem: "my-app/src/test/java" -SourceFilePath: "my-app/src/test/java/com/mycompany/app/AppTest.java" +SourceFilePath: "my-app/src/test/java/com/mycompany/app/apptest.java" LanguageStandard: "10" ClassPathItem: "test/jre/system/library/path.jar" ClassPathItem: "my-app/src/main/java" diff --git a/script/download_python_indexer.sh b/script/download_python_indexer.sh index 5cc612f8..5a5e77de 100755 --- a/script/download_python_indexer.sh +++ b/script/download_python_indexer.sh @@ -87,7 +87,8 @@ if [ $PLATFORM == "linux" ]; then elif [ $PLATFORM == "osx" ]; then unzip -d $TEMP_PATH $TEMP_PATH/$PACKAGE_FILE_NAME elif [ $PLATFORM == "windows" ]; then - winrar x $TEMP_PATH/$PACKAGE_FILE_NAME $TEMP_PATH + echo -e $INFO "extracting file: $TEMP_PATH/$PACKAGE_FILE_NAME to $TEMP_PATH" + 7z.exe x -o$TEMP_PATH $TEMP_PATH/$PACKAGE_FILE_NAME fi diff --git a/src/lib_gui/qt/network/QtRequest.cpp b/src/lib_gui/qt/network/QtRequest.cpp index b668f537..c222ca7a 100644 --- a/src/lib_gui/qt/network/QtRequest.cpp +++ b/src/lib_gui/qt/network/QtRequest.cpp @@ -2,6 +2,7 @@ #include #include +#include #include "logging.h" diff --git a/src/test/SourceGroupTestSuite.cpp b/src/test/SourceGroupTestSuite.cpp index 72cc3f05..f565b9cc 100644 --- a/src/test/SourceGroupTestSuite.cpp +++ b/src/test/SourceGroupTestSuite.cpp @@ -105,17 +105,23 @@ std::wstring indexerCommandCxxToString( { std::wstring result; result += L"SourceFilePath: \"" + - indexerCommand->getSourceFilePath().getRelativeTo(baseDirectory).wstr() + L"\"\n"; + FilePath(utility::toLowerCase(indexerCommand->getSourceFilePath().wstr())) + .getRelativeTo(baseDirectory) + .wstr() + + L"\"\n"; for (const FilePath& indexedPath: indexerCommand->getIndexedPaths()) { - result += L"\tIndexedPath: \"" + indexedPath.getRelativeTo(baseDirectory).wstr() + L"\"\n"; + result += L"\tIndexedPath: \"" + + FilePath(utility::toLowerCase(indexedPath.wstr())).getRelativeTo(baseDirectory).wstr() + + L"\"\n"; } for (std::wstring compilerFlag: indexerCommand->getCompilerFlags()) { FilePath flagAsPath(compilerFlag); if (flagAsPath.exists()) { - compilerFlag = flagAsPath.getRelativeTo(baseDirectory).wstr(); + compilerFlag = + FilePath(utility::toLowerCase(flagAsPath.wstr())).getRelativeTo(baseDirectory).wstr(); } result += L"\tCompilerFlag: \"" + compilerFlag + L"\"\n"; } @@ -133,11 +139,15 @@ std::wstring indexerCommandJavaToString( { std::wstring result; result += L"SourceFilePath: \"" + - indexerCommand->getSourceFilePath().getRelativeTo(baseDirectory).wstr() + L"\"\n"; + FilePath(utility::toLowerCase(indexerCommand->getSourceFilePath().wstr())) + .getRelativeTo(baseDirectory) + .wstr() + + L"\"\n"; result += L"\tLanguageStandard: \"" + indexerCommand->getLanguageStandard() + L"\"\n"; for (const FilePath& classPathItem: indexerCommand->getClassPath()) { - result += L"\tClassPathItem: \"" + classPathItem.getRelativeTo(baseDirectory).wstr() + + result += L"\tClassPathItem: \"" + + FilePath(utility::toLowerCase(classPathItem.wstr())).getRelativeTo(baseDirectory).wstr() + L"\"\n"; } return result; @@ -149,14 +159,17 @@ std::wstring indexerCommandCustomToString( { std::wstring result; result += L"SourceFilePath: \"" + - indexerCommand->getSourceFilePath().getRelativeTo(baseDirectory).wstr() + L"\"\n"; + FilePath(utility::toLowerCase(indexerCommand->getSourceFilePath().wstr())) + .getRelativeTo(baseDirectory) + .wstr() + + L"\"\n"; result += L"\tCustom Command: \"" + indexerCommand->getCustomCommand() + L"\"\n"; return result; } -std::wstring indexerCommandToString( - std::shared_ptr indexerCommand, const FilePath& baseDirectory) +std::wstring indexerCommandToString(std::shared_ptr indexerCommand, FilePath baseDirectory) { + baseDirectory = FilePath(utility::toLowerCase(baseDirectory.wstr())); if (indexerCommand) { #if BUILD_CXX_LANGUAGE_PACKAGE