]> git.pld-linux.org Git - packages/domoticz.git/blame - no-git.patch
macros for %systemd*
[packages/domoticz.git] / no-git.patch
CommitLineData
d051ba14
JR
1--- domoticz-2020.2/CMakeLists.txt.orig 2020-06-06 12:02:05.000000000 +0200
2+++ domoticz-2020.2/CMakeLists.txt 2020-06-06 12:19:29.867654435 +0200
3@@ -88,40 +88,13 @@
4 ENDIF(EXISTS ${CMAKE_SOURCE_DIR}/History.txt)
5 ENDMACRO(History_GET_REVISION)
6
7-MACRO(Gitversion_GET_REVISION dir variable)
8- EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} --git-dir ./.git rev-list HEAD --count
9- WORKING_DIRECTORY ${dir}
10- OUTPUT_VARIABLE ${variable}
11- OUTPUT_STRIP_TRAILING_WHITESPACE)
12-ENDMACRO(Gitversion_GET_REVISION)
13-
14 find_package(Git QUIET)
15
16-Gitversion_GET_REVISION("${CMAKE_SOURCE_DIR}" ProjectRevision)
17-IF(NOT ProjectRevision)
18- MESSAGE(STATUS "Failed to get ProjectRevision from git")
19- History_GET_REVISION(ProjectRevision)
20-ELSE(NOT ProjectRevision)
21- MATH(EXPR ProjectRevision "${ProjectRevision}+2107")
22-ENDIF(NOT ProjectRevision)
23-
24+History_GET_REVISION(ProjectRevision)
25
26 ### SUBMODULE / BUNDLED SOFTWARE
27 #
28 #
29-if(GIT_FOUND AND EXISTS "${PROJECT_SOURCE_DIR}/.git")
30-# Update submodules as needed
31- if(GIT_SUBMODULE)
32- message(STATUS "Submodule update")
33- execute_process(COMMAND ${GIT_EXECUTABLE} submodule update --init --recursive
34- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
35- RESULT_VARIABLE GIT_SUBMOD_RESULT)
36- if(NOT GIT_SUBMOD_RESULT EQUAL "0")
37- message(FATAL_ERROR "git submodule update --init failed with ${GIT_SUBMOD_RESULT}, please checkout submodules")
38- endif()
39- endif()
40-endif()
41-
42 if(USE_BUILTIN_JSONCPP AND NOT EXISTS "${PROJECT_SOURCE_DIR}/extern/jsoncpp/CMakeLists.txt")
43 message(FATAL_ERROR "The submodules were not downloaded! GIT_SUBMODULE was turned off or failed. Please update submodules and try again.")
44 endif()
45--- domoticz-2020.2/getgit.cmake.orig 2020-04-26 15:49:25.000000000 +0200
46+++ domoticz-2020.2/getgit.cmake 2020-06-06 12:19:42.567678153 +0200
080c2844
JR
47@@ -2,11 +2,6 @@
48 # please take into account, that the variable 'SOURCE_DIR' has been defined by the caller
49
50 # the git.cmake module is part of the standard distribution
51-find_package(Git)
52-if(NOT GIT_FOUND)
53- MESSAGE(FATAL_ERROR "Git not found!.")
54-endif()
55-
56 MACRO(History_GET_REVISION variable)
57 IF(EXISTS ${CMAKE_SOURCE_DIR}/History.txt)
58 MESSAGE(STATUS "Read ProjectRevision from History.txt")
59@@ -23,55 +18,11 @@
d051ba14
JR
60 ENDIF(EXISTS ${CMAKE_SOURCE_DIR}/History.txt)
61 ENDMACRO(History_GET_REVISION)
62
63-MACRO(Gitversion_GET_REVISION dir variable)
64- EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} --git-dir ./.git rev-list HEAD --count
65- WORKING_DIRECTORY ${dir}
66- OUTPUT_VARIABLE ${variable}
67- OUTPUT_STRIP_TRAILING_WHITESPACE)
68-ENDMACRO(Gitversion_GET_REVISION)
69-
70-MACRO(Gitversion_GET_HASH dir variable)
71- EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} --git-dir ./.git rev-parse --short HEAD
72- WORKING_DIRECTORY ${dir}
73- OUTPUT_VARIABLE ${variable}
74- OUTPUT_STRIP_TRAILING_WHITESPACE)
75-ENDMACRO(Gitversion_GET_HASH)
76-
77-MACRO(Gitversion_GET_DATE dir variable)
78- EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} --git-dir ./.git show -s --format=%ct
79- WORKING_DIRECTORY ${dir}
80- OUTPUT_VARIABLE ${variable}
81- OUTPUT_STRIP_TRAILING_WHITESPACE)
82-ENDMACRO(Gitversion_GET_DATE)
83-
84-MACRO(Gitversion_CHECK_DIRTY dir variable)
85- EXECUTE_PROCESS(COMMAND ${GIT_EXECUTABLE} --git-dir ./.git diff-index -m --name-only HEAD
86- WORKING_DIRECTORY ${dir}
87- OUTPUT_VARIABLE ${variable}
88- OUTPUT_STRIP_TRAILING_WHITESPACE)
89-ENDMACRO(Gitversion_CHECK_DIRTY)
90-
91-Gitversion_GET_REVISION("${SOURCE_DIR}" ProjectRevision)
92-IF(NOT ProjectRevision)
93- History_GET_REVISION(ProjectRevision)
94-ELSE(NOT ProjectRevision)
95- MATH(EXPR ProjectRevision "${ProjectRevision}+2107")
96-ENDIF(NOT ProjectRevision)
97-Gitversion_GET_HASH("${SOURCE_DIR}" ProjectHash)
98-IF(NOT ProjectHash)
99- MESSAGE(STATUS "Failed to get ProjectHash from git, set it to 0")
100- set (ProjectHash 0)
101-ENDIF(NOT ProjectHash)
102-Gitversion_GET_DATE("${SOURCE_DIR}" ProjectDate)
103-IF(NOT ProjectDate)
104- MESSAGE(STATUS "Failed to get ProjectDate from git, set it to 0")
105- set (ProjectDate 0)
106-ENDIF(NOT ProjectDate)
107-Gitversion_CHECK_DIRTY("${SOURCE_DIR}" ProjectDirty)
108-IF(ProjectDirty)
109- MESSAGE(STATUS "domoticz has been modified locally: adding \"-modified\" to hash")
110- set (ProjectHash "${ProjectHash}-modified")
111-ENDIF(ProjectDirty)
112+History_GET_REVISION(ProjectRevision)
113+MESSAGE(STATUS "Failed to get ProjectHash from git, set it to 0")
114+set (ProjectHash 0)
115+MESSAGE(STATUS "Failed to get ProjectDate from git, set it to 0")
116+set (ProjectDate 0)
117
118 # write a file with the APPVERSION define
119 file(WRITE ${SOURCE_DIR}/appversion.h.txt "#define APPVERSION ${ProjectRevision}\n#define APPHASH \"${ProjectHash}\"\n#define APPDATE ${ProjectDate}\n")
This page took 0.320033 seconds and 4 git commands to generate.