Merge pull request #33 from ivoxavier/v1_2_optimizations

V1 2 optimizations
ivoxavier · Dec 12, 2022 · 9b8f003 · 9b8f003
2 parents 9ab6605 + 88aae73
commit 9b8f003
Show file tree

Hide file tree

Showing 31 changed files with 191 additions and 375 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -58,9 +58,21 @@ add_definitions(
 
 add_subdirectory(qzxing/src)
 include_directories(qzxing/src/zxing)
+include_directories("${PROJECT_BINARY_DIR}")
 
 set(SOURCES main.cpp)
 
+# Sets BUILD_VERSION: Either tag of the current git HEAD or devel build version with git hash
+execute_process(
+  COMMAND git describe --tags --abbrev=0
+  OUTPUT_VARIABLE BUILD_VERSION_RAW
+  OUTPUT_STRIP_TRAILING_WHITESPACE
+  ERROR_QUIET
+  )
+string(SUBSTRING ${BUILD_VERSION_RAW} 1 -1 BUILD_VERSION)
+configure_file(git_tag.h.in ${CMAKE_CURRENT_BINARY_DIR}/git_tag.h)
+message(STATUS "Build version is: ${BUILD_VERSION}")
+
 configure_file(manifest.json.in ${CMAKE_CURRENT_BINARY_DIR}/manifest.json)
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/manifest.json DESTINATION ${CMAKE_INSTALL_PREFIX})
 install(FILES ${PROJECT_NAME}.apparmor DESTINATION ${DATA_DIR})

diff --git a/click_build.sh b/click_build.sh
diff --git a/git_tag.h.in b/git_tag.h.in
@@ -0,0 +1 @@
+#define BUILD_VERSION "@BUILD_VERSION@"
diff --git a/js/ControlCreateStorage.js b/js/ControlCreateStorage.js
diff --git a/js/ControlDateNavigationPopup.js b/js/ControlDateNavigationPopup.js
diff --git a/js/ControlFoodsSearchTimer.js b/js/ControlFoodsSearchTimer.js
diff --git a/js/ControlIconUpAnimation.js b/js/ControlIconUpAnimation.js
diff --git a/js/ControlIngestionStoredDialog.js b/js/ControlIngestionStoredDialog.js
diff --git a/js/ControlSetActivitySelection.js b/js/ControlSetActivitySelection.js
diff --git a/js/ControlSetAge.js b/js/ControlSetAge.js
diff --git a/js/ControlSetHeight.js b/js/ControlSetHeight.js
diff --git a/js/ControlSetPlanSelection.js b/js/ControlSetPlanSelection.js
diff --git a/js/ControlSetSexSelection.js b/js/ControlSetSexSelection.js
diff --git a/js/ControlSetWeight.js b/js/ControlSetWeight.js
diff --git a/js/ControlSlotDashboardPlan.js b/js/ControlSlotDashboardPlan.js