From fc10adb608841710db4f32efdc604b96af970a82 Mon Sep 17 00:00:00 2001 From: Bret Curtis Date: Tue, 11 Dec 2018 21:30:37 +0100 Subject: [PATCH 1/5] makes openmw.appdata.xml a template that accepts @OPENMW_VERSION@ so we do not have to update it all the time; fix deprecated warning for boost header; un-ignore openmw.appdata.xml --- .gitignore | 1 - CMakeLists.txt | 5 ++++- apps/launcher/graphicspage.cpp | 2 +- files/openmw.appdata.xml | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 827c0a0723..0ee4a63992 100644 --- a/.gitignore +++ b/.gitignore @@ -81,5 +81,4 @@ moc_*.cxx *ui_playpage.h *.[ao] *.so -openmw.appdata.xml venv/ diff --git a/CMakeLists.txt b/CMakeLists.txt index 7628e65eb6..8699ec91d0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -344,7 +344,10 @@ endif (APPLE) # Other files configure_resource_file(${OpenMW_SOURCE_DIR}/files/settings-default.cfg - "${OpenMW_BINARY_DIR}" "settings-default.cfg") + "${OpenMW_BINARY_DIR}" "settings-default.cfg") + +configure_resource_file(${OpenMW_SOURCE_DIR}/files/openmw.appdata.xml + "${OpenMW_BINARY_DIR}" "openmw.appdata.xml") if (NOT APPLE) configure_resource_file(${OpenMW_SOURCE_DIR}/files/openmw.cfg.local diff --git a/apps/launcher/graphicspage.cpp b/apps/launcher/graphicspage.cpp index 072f1f36f2..5d9d69edf9 100644 --- a/apps/launcher/graphicspage.cpp +++ b/apps/launcher/graphicspage.cpp @@ -1,6 +1,6 @@ #include "graphicspage.hpp" -#include +#include #include #include #include diff --git a/files/openmw.appdata.xml b/files/openmw.appdata.xml index 5c093e3c49..05654d9b91 100644 --- a/files/openmw.appdata.xml +++ b/files/openmw.appdata.xml @@ -43,7 +43,7 @@ Copyright 2017 Bret Curtis RolePlaying - + https://openmw.org https://bugs.openmw.org/ From 6596c400f355c42ea0e58c411b87023a0176217e Mon Sep 17 00:00:00 2001 From: Bret Curtis Date: Tue, 11 Dec 2018 21:34:11 +0100 Subject: [PATCH 2/5] indentation --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8699ec91d0..dbe00729d1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -344,10 +344,10 @@ endif (APPLE) # Other files configure_resource_file(${OpenMW_SOURCE_DIR}/files/settings-default.cfg - "${OpenMW_BINARY_DIR}" "settings-default.cfg") + "${OpenMW_BINARY_DIR}" "settings-default.cfg") configure_resource_file(${OpenMW_SOURCE_DIR}/files/openmw.appdata.xml - "${OpenMW_BINARY_DIR}" "openmw.appdata.xml") + "${OpenMW_BINARY_DIR}" "openmw.appdata.xml") if (NOT APPLE) configure_resource_file(${OpenMW_SOURCE_DIR}/files/openmw.cfg.local From b8b1a5221665c1fb32ffb0015ff50095270c82b9 Mon Sep 17 00:00:00 2001 From: Bret Curtis Date: Wed, 12 Dec 2018 10:27:09 +0100 Subject: [PATCH 3/5] add commit date; revert boost as we are not breaking anything yet --- CMakeLists.txt | 9 +++++++++ apps/launcher/graphicspage.cpp | 2 +- files/openmw.appdata.xml | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index dbe00729d1..4cfc7ed925 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -59,6 +59,7 @@ set(OPENMW_VERSION_RELEASE 0) set(OPENMW_VERSION_COMMITHASH "") set(OPENMW_VERSION_TAGHASH "") +set(OPENMW_VERSION_COMMITDATE "") set(OPENMW_VERSION "${OPENMW_VERSION_MAJOR}.${OPENMW_VERSION_MINOR}.${OPENMW_VERSION_RELEASE}") @@ -73,6 +74,14 @@ if(EXISTS ${PROJECT_SOURCE_DIR}/.git) endif(GIT_FOUND) endif(EXISTS ${PROJECT_SOURCE_DIR}/.git) +execute_process ( + COMMAND ${GIT_EXECUTABLE} log -1 --format='%aI' + WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} + RESULT_VARIABLE EXITCODE3 + OUTPUT_VARIABLE COMMITDATE + OUTPUT_STRIP_TRAILING_WHITESPACE) +string(SUBSTRING ${COMMITDATE} 1 10 OPENMW_VERSION_COMMITDATE) + # Macros include(OpenMWMacros) diff --git a/apps/launcher/graphicspage.cpp b/apps/launcher/graphicspage.cpp index 5d9d69edf9..54ddfd0c9e 100644 --- a/apps/launcher/graphicspage.cpp +++ b/apps/launcher/graphicspage.cpp @@ -1,6 +1,6 @@ #include "graphicspage.hpp" -#include +#include #include #include #include diff --git a/files/openmw.appdata.xml b/files/openmw.appdata.xml index 05654d9b91..fd8ad8176f 100644 --- a/files/openmw.appdata.xml +++ b/files/openmw.appdata.xml @@ -43,7 +43,7 @@ Copyright 2017 Bret Curtis RolePlaying - + https://openmw.org https://bugs.openmw.org/ From 83e346e1e624e806b0461ccb5f482d1fd0b55202 Mon Sep 17 00:00:00 2001 From: Bret Curtis Date: Wed, 12 Dec 2018 16:18:49 +0100 Subject: [PATCH 4/5] add new bugtracker --- files/openmw.appdata.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/files/openmw.appdata.xml b/files/openmw.appdata.xml index fd8ad8176f..39504070c6 100644 --- a/files/openmw.appdata.xml +++ b/files/openmw.appdata.xml @@ -1,7 +1,7 @@ org.openmw.desktop @@ -46,6 +46,6 @@ Copyright 2017 Bret Curtis https://openmw.org - https://bugs.openmw.org/ + https://gitlab.com/OpenMW/openmw/issues https://openmw.org/faq/ From f4c863a7300bc7ca1c66335e13b11f3cf45e1056 Mon Sep 17 00:00:00 2001 From: Bret Curtis Date: Wed, 12 Dec 2018 16:19:07 +0100 Subject: [PATCH 5/5] Update graphicspage.cpp --- apps/launcher/graphicspage.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/launcher/graphicspage.cpp b/apps/launcher/graphicspage.cpp index 54ddfd0c9e..072f1f36f2 100644 --- a/apps/launcher/graphicspage.cpp +++ b/apps/launcher/graphicspage.cpp @@ -1,6 +1,6 @@ #include "graphicspage.hpp" -#include +#include #include #include #include