Unix line endings

ad-freiburg · Oct 17, 2023 · 8e0c3b2 · 8e0c3b2
1 parent a82183b
commit 8e0c3b2
Show file tree

Hide file tree

Showing 39 changed files with 7,791 additions and 7,791 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -1,90 +1,90 @@
-name: Build
-'on':
-  - push
-jobs:
-  ubuntu-20-04-build-gcc:
-    runs-on: ubuntu-20.04
-    steps:
-      - name: Checkout repository code
-        uses: actions/checkout@v2
-      - name: Checkout submodules
-        run: git submodule update --init --recursive
-      - name: install dependencies
-        run: sudo apt install -y cmake gcc g++ libpng-dev libcurl4-gnutls-dev
-      - name: cmake
-        run: mkdir build && cd build && cmake ..
-      - name: make
-        run: cd build && make
-  ubuntu-latest-build-gcc:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repository code
-        uses: actions/checkout@v2
-      - name: Checkout submodules
-        run: git submodule update --init --recursive
-      - name: install dependencies
-        run: sudo apt install -y cmake gcc g++ libpng-dev libcurl4-gnutls-dev
-      - name: cmake
-        run: mkdir build && cd build && cmake ..
-      - name: make
-        run: cd build && make
-  ubuntu-20-04-build-clang:
-    runs-on: ubuntu-20.04
-    steps:
-      - name: Checkout repository code
-        uses: actions/checkout@v2
-      - name: Checkout submodules
-        run: git submodule update --init --recursive
-      - name: install dependencies
-        run: sudo apt install -y cmake clang libomp-dev libpng-dev libcurl4-gnutls-dev
-      - name: cmake
-        run: mkdir build && cd build && cmake ..
-        shell: bash
-        env:
-          CC: clang
-          CXX: clang++
-      - name: make
-        run: cd build && make
-  ubuntu-latest-build-clang:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repository code
-        uses: actions/checkout@v2
-      - name: Checkout submodules
-        run: git submodule update --init --recursive
-      - name: install dependencies
-        run: sudo apt install -y cmake clang libomp-dev libpng-dev libcurl4-gnutls-dev
-      - name: cmake
-        run: mkdir build && cd build && cmake ..
-        shell: bash
-        env:
-          CC: clang
-          CXX: clang++
-      - name: make
-        run: cd build && make
-  macos-latest-build:
-    runs-on: macOS-latest
-    steps:
-      - name: Checkout repository code
-        uses: actions/checkout@v2
-      - name: Checkout submodules
-        run: git submodule update --init --recursive
-      - name: install dependencies
-        run: brew install cmake libpng curl
-      - name: cmake
-        run: mkdir build && cd build && cmake ..
-      - name: make
-        run: cd build && make
-  macos-12-build:
-    runs-on: macOS-12
-    steps:
-      - name: Checkout repository code
-        uses: actions/checkout@v2
-      - name: Checkout submodules
-        run: git submodule update --init --recursive
-      - name: install dependencies
-        run: brew install cmake libpng curl
-      - name: cmake
-        run: mkdir build && cd build && cmake ..
-      - name: make
-        run: cd build && make
+name: Build
+'on':
+  - push
+jobs:
+  ubuntu-20-04-build-gcc:
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Checkout repository code
+        uses: actions/checkout@v2
+      - name: Checkout submodules
+        run: git submodule update --init --recursive
+      - name: install dependencies
+        run: sudo apt install -y cmake gcc g++ libpng-dev libcurl4-gnutls-dev
+      - name: cmake
+        run: mkdir build && cd build && cmake ..
+      - name: make
+        run: cd build && make
+  ubuntu-latest-build-gcc:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository code
+        uses: actions/checkout@v2
+      - name: Checkout submodules
+        run: git submodule update --init --recursive
+      - name: install dependencies
+        run: sudo apt install -y cmake gcc g++ libpng-dev libcurl4-gnutls-dev
+      - name: cmake
+        run: mkdir build && cd build && cmake ..
+      - name: make
+        run: cd build && make
+  ubuntu-20-04-build-clang:
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Checkout repository code
+        uses: actions/checkout@v2
+      - name: Checkout submodules
+        run: git submodule update --init --recursive
+      - name: install dependencies
+        run: sudo apt install -y cmake clang libomp-dev libpng-dev libcurl4-gnutls-dev
+      - name: cmake
+        run: mkdir build && cd build && cmake ..
+        shell: bash
+        env:
+          CC: clang
+          CXX: clang++
+      - name: make
+        run: cd build && make
+  ubuntu-latest-build-clang:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository code
+        uses: actions/checkout@v2
+      - name: Checkout submodules
+        run: git submodule update --init --recursive
+      - name: install dependencies
+        run: sudo apt install -y cmake clang libomp-dev libpng-dev libcurl4-gnutls-dev
+      - name: cmake
+        run: mkdir build && cd build && cmake ..
+        shell: bash
+        env:
+          CC: clang
+          CXX: clang++
+      - name: make
+        run: cd build && make
+  macos-latest-build:
+    runs-on: macOS-latest
+    steps:
+      - name: Checkout repository code
+        uses: actions/checkout@v2
+      - name: Checkout submodules
+        run: git submodule update --init --recursive
+      - name: install dependencies
+        run: brew install cmake libpng curl
+      - name: cmake
+        run: mkdir build && cd build && cmake ..
+      - name: make
+        run: cd build && make
+  macos-12-build:
+    runs-on: macOS-12
+    steps:
+      - name: Checkout repository code
+        uses: actions/checkout@v2
+      - name: Checkout submodules
+        run: git submodule update --init --recursive
+      - name: install dependencies
+        run: brew install cmake libpng curl
+      - name: cmake
+        run: mkdir build && cd build && cmake ..
+      - name: make
+        run: cd build && make
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,4 @@
-build/
-*.log
-*.swp
-*.swo
+build/
+*.log
+*.swp
+*.swo
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,3 @@
-[submodule "src/util"]
-	path = src/util
-	url = https://github.com/ad-freiburg/util
+[submodule "src/util"]
+	path = src/util
+	url = https://github.com/ad-freiburg/util
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,81 +1,81 @@
-cmake_minimum_required (VERSION 2.8)
-
-project (qlever-petrimaps)
-
-# only change first char
-if (CMAKE_BUILD_TYPE)
-	string(SUBSTRING ${CMAKE_BUILD_TYPE} 0 1 FIRST_CHAR)
-	string(TOUPPER ${FIRST_CHAR} FIRST_CHAR)
-	string(REGEX REPLACE "^.(.*)" "${FIRST_CHAR}\\1" CMAKE_BUILD_TYPE "${CMAKE_BUILD_TYPE}")
-endif()
-
-# old solution
-#if (CMAKE_BUILD_TYPE)
-#	string(TOUPPER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE)
-#endif()
-
-enable_testing()
-
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/")
-set(EXECUTABLE_OUTPUT_PATH "${CMAKE_SOURCE_DIR}/build")
-
-
-find_package(OpenMP)
-
-# set compiler flags, see http://stackoverflow.com/questions/7724569/debug-vs-release-in-cmake
-set(CMAKE_CXX_FLAGS "-march=native -Ofast -fno-signed-zeros -fno-trapping-math -Wall -Wno-format-extra-args -Wextra -Wformat-nonliteral -Wformat-security -Wformat=2 -Wextra -Wno-implicit-fallthrough -Wno-narrowing -pedantic")
-set(CMAKE_C_FLAGS "-march=native -Ofast -fno-signed-zeros -fno-trapping-math -Wall -Wno-format-extra-args -Wextra -Wformat-nonliteral -Wformat-security -Wformat=2 -Wextra -Wno-implicit-fallthrough -Wno-narrowing -pedantic")
-
-if (OPENMP_FOUND)
-	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
-endif()
-
-if (PNG_FOUND)
-	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
-endif()
-
-set(CMAKE_CXX_FLAGS_DEBUG          "-Og -g -DLOGLEVEL=3")
-set(CMAKE_CXX_FLAGS_MINSIZEREL     "${CMAKE_CXX_FLAGS} -DLOGLEVEL=2")
-set(CMAKE_CXX_FLAGS_RELEASE        "${CMAKE_CXX_FLAGS} -DLOGLEVEL=2")
-set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS} -g -DLOGLEVEL=3")
-
-# export compile commands to tools like clang
-set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
-
-# Compiler-specific C++11 activation.
-if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU")
-	execute_process(
-		COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION)
-	if ((GCC_VERSION VERSION_GREATER 4.8 OR GCC_VERSION VERSION_EQUAL 4.8))
-		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-	else ()
-		message(FATAL_ERROR "${PROJECT_NAME} requires g++ 4.8 or greater!")
-	endif ()
-elseif ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
-	#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++ -std=c++11")
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-else ()
-	message(FATAL_ERROR "Your C++ compiler does not support C++11.")
-endif ()
-
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-
-# http://brianmilco.blogspot.de/2012/11/cmake-automatically-use-git-tags-as.html
-include(GetGitRevisionDescription)
-git_get_tag(VERSION_GIT)
-get_git_is_dirty(VERSION_GIT_IS_DIRTY)
-if ("${VERSION_GIT_IS_DIRTY}" STREQUAL "")
-	set(VERSION_GIT_FULL "${VERSION_GIT}")
-else()
-	set(VERSION_GIT_FULL "${VERSION_GIT}-${VERSION_GIT_IS_DIRTY}")
-endif()
-
-add_subdirectory(src)
-
-# install target
-install(
-  FILES build/qlever-mapui DESTINATION bin
-  PERMISSIONS OWNER_EXECUTE GROUP_EXECUTE WORLD_EXECUTE
-)
+cmake_minimum_required (VERSION 2.8)
+
+project (qlever-petrimaps)
+
+# only change first char
+if (CMAKE_BUILD_TYPE)
+	string(SUBSTRING ${CMAKE_BUILD_TYPE} 0 1 FIRST_CHAR)
+	string(TOUPPER ${FIRST_CHAR} FIRST_CHAR)
+	string(REGEX REPLACE "^.(.*)" "${FIRST_CHAR}\\1" CMAKE_BUILD_TYPE "${CMAKE_BUILD_TYPE}")
+endif()
+
+# old solution
+#if (CMAKE_BUILD_TYPE)
+#	string(TOUPPER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE)
+#endif()
+
+enable_testing()
+
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/")
+set(EXECUTABLE_OUTPUT_PATH "${CMAKE_SOURCE_DIR}/build")
+
+
+find_package(OpenMP)
+
+# set compiler flags, see http://stackoverflow.com/questions/7724569/debug-vs-release-in-cmake
+set(CMAKE_CXX_FLAGS "-march=native -Ofast -fno-signed-zeros -fno-trapping-math -Wall -Wno-format-extra-args -Wextra -Wformat-nonliteral -Wformat-security -Wformat=2 -Wextra -Wno-implicit-fallthrough -Wno-narrowing -pedantic")
+set(CMAKE_C_FLAGS "-march=native -Ofast -fno-signed-zeros -fno-trapping-math -Wall -Wno-format-extra-args -Wextra -Wformat-nonliteral -Wformat-security -Wformat=2 -Wextra -Wno-implicit-fallthrough -Wno-narrowing -pedantic")
+
+if (OPENMP_FOUND)
+	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
+endif()
+
+if (PNG_FOUND)
+	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
+endif()
+
+set(CMAKE_CXX_FLAGS_DEBUG          "-Og -g -DLOGLEVEL=3")
+set(CMAKE_CXX_FLAGS_MINSIZEREL     "${CMAKE_CXX_FLAGS} -DLOGLEVEL=2")
+set(CMAKE_CXX_FLAGS_RELEASE        "${CMAKE_CXX_FLAGS} -DLOGLEVEL=2")
+set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS} -g -DLOGLEVEL=3")
+
+# export compile commands to tools like clang
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+
+# Compiler-specific C++11 activation.
+if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU")
+	execute_process(
+		COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION)
+	if ((GCC_VERSION VERSION_GREATER 4.8 OR GCC_VERSION VERSION_EQUAL 4.8))
+		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+	else ()
+		message(FATAL_ERROR "${PROJECT_NAME} requires g++ 4.8 or greater!")
+	endif ()
+elseif ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
+	#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++ -std=c++11")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+else ()
+	message(FATAL_ERROR "Your C++ compiler does not support C++11.")
+endif ()
+
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+
+# http://brianmilco.blogspot.de/2012/11/cmake-automatically-use-git-tags-as.html
+include(GetGitRevisionDescription)
+git_get_tag(VERSION_GIT)
+get_git_is_dirty(VERSION_GIT_IS_DIRTY)
+if ("${VERSION_GIT_IS_DIRTY}" STREQUAL "")
+	set(VERSION_GIT_FULL "${VERSION_GIT}")
+else()
+	set(VERSION_GIT_FULL "${VERSION_GIT}-${VERSION_GIT_IS_DIRTY}")
+endif()
+
+add_subdirectory(src)
+
+# install target
+install(
+  FILES build/qlever-mapui DESTINATION bin
+  PERMISSIONS OWNER_EXECUTE GROUP_EXECUTE WORLD_EXECUTE
+)
-Original file line number
+Diff line change
@@ -1,4 +1,4 @@
-    build/
-    *.log
-    *.swp
-    *.swo
+    build/
+    *.log
+    *.swp
+    *.swo