Revert "test"

This reverts commit 21d2520b31.
test
2020-02-05 20:20:32 +01:00 · 2020-02-05 19:55:45 +01:00 · 2020-02-05 07:35:39 +01:00 · 2020-02-05 07:20:02 +01:00 · 2020-02-05 07:20:02 +01:00
15 changed files with 116 additions and 104 deletions
@@ -1,12 +1,18 @@
 language: bash

+os:
+  - linux
+  - windows
+
 services: docker

 install:
-  - chmod 777 deployment/dockerfiles/linux/travis_ci/entrypoint.sh
-  - docker build -t coatisoftware/local deployment/dockerfiles/linux/travis_ci
+  - echo "$TRAVIS_OS_NAME" 
+  - if [ "$TRAVIS_OS_NAME" = "windows" ]; then docker build -t coatisoftware/local deployment/dockerfiles/windows/travis_ci; fi

 script:
  - COMMIT_HASH=$(git rev-parse HEAD)
-  - docker run --name builder coatisoftware/local ${COMMIT_HASH}
+  - if [ "$TRAVIS_OS_NAME" = "windows" ]; then docker run --name builder coatisoftware/local ${COMMIT_HASH}; fi
+
+

@@ -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 ()
@@ -1,39 +0,0 @@
-version: 0.0.0.{build}
-image: Visual Studio 2017
-
-install:
-  ############################################################################
-  # Install Ninja
-  ############################################################################
-  - set NINJA_URL="https://github.com/ninja-build/ninja/releases/download/v1.9.0/ninja-win.zip"
-  - appveyor DownloadFile %NINJA_URL% -FileName ninja.zip
-  - 7z x ninja.zip -oC:\projects\deps\ninja > nul
-  - set PATH=C:\projects\deps\ninja;%PATH%
-  - ninja --version
-
-before_build:
-    - choco install winrar -y
-    - SET "PATH=%PATH%;C:\Program Files\WinRAR"
-    - mkdir build
-    - cd build
-    - mkdir temp
-    - cd ../
-    - cd script
-    - cmd: "\"C:/Program Files/Git/usr/bin/bash.exe\" download_python_indexer.sh" 
-    - cd ../
-    - cd build
-    - mkdir win64
-    - cd win64
-    - call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64
-    - cmake -G "Ninja" -DBOOST_ROOT=C:/Libraries/boost_1_69_0 -DQt5_DIR=C:/Qt/5.12.6/msvc2017_64/lib/cmake/Qt5 -DBUILD_PYTHON_LANGUAGE_PACKAGE=ON -DCMAKE_BUILD_TYPE=Release ../../
-    - cd ../../
-
-build_script:
-    - cd build/win64
-    - ninja
-    - cd ../../
-
-test_script:
-    - cd bin/test
-    - ..\..\build\win64\Release\test\Sourcetrail_test.exe
-    - cd ../../
@@ -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/**"
@@ -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"
@@ -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/**"
@@ -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/**"
@@ -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"
@@ -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"
@@ -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"
@@ -0,0 +1,5 @@
+FROM coatisoftware/windows_64_qt_llvm:qt5123-llvm900
+
+COPY entrypoint.bat /entrypoint.bat
+
+ENTRYPOINT ["/entrypoint.bat"]
@@ -0,0 +1,3 @@
+
+echo "building commit: $1"
+
@@ -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


@@ -2,6 +2,7 @@

 #include <QNetworkAccessManager>
 #include <QNetworkReply>
+#include <qsslconfiguration.h>

 #include "logging.h"

@@ -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> indexerCommand, const FilePath& baseDirectory)
+std::wstring indexerCommandToString(std::shared_ptr<IndexerCommand> indexerCommand, FilePath baseDirectory)
 {
+	baseDirectory = FilePath(utility::toLowerCase(baseDirectory.wstr()));
 	if (indexerCommand)
 	{
 #if BUILD_CXX_LANGUAGE_PACKAGE
Author	SHA1	Message	Date
mlangkabel	8618c0b01f	Revert "test" This reverts commit `21d2520b31`.	2020-02-05 20:20:32 +01:00
mlangkabel	21d2520b31	test	2020-02-05 19:55:45 +01:00
mlangkabel	560c44ae9b	test	2020-02-05 07:35:39 +01:00
mlangkabel	cff407eb54	test travis	2020-02-05 07:20:02 +01:00
mlangkabel	10ba052ea1	Some fixes * make qt configuration in CMake more flexible * move creating of symlinks on windows from post build event to cmake * create symlinks for test data in cmake on windows * switch to 7zip for extraction python indexer * make results of sourcegrouptests case insensitive	2020-02-05 07:20:02 +01:00