Commit 16d3aa90 authored by sm's avatar sm

Minutia

parent 23dbb778
...@@ -13,10 +13,10 @@ include(FindPkgConfig) ...@@ -13,10 +13,10 @@ include(FindPkgConfig)
find_package(PkgConfig) find_package(PkgConfig)
# Version # Version
set(SPINN_VERSION "0.2.0") set(SPINN_VERSION "0.5.0")
# Required libraries # Required libraries
pkg_check_modules(STMMINPUTGTKDM REQUIRED stmm-input-gtk-dm>=0.5.0) pkg_check_modules(STMMINPUTGTKDM REQUIRED stmm-input-gtk-dm>=0.5)
list(APPEND SPINN_EXTRA_INCLUDE_DIRS ${STMMINPUTGTKDM_INCLUDE_DIRS}) list(APPEND SPINN_EXTRA_INCLUDE_DIRS ${STMMINPUTGTKDM_INCLUDE_DIRS})
list(APPEND SPINN_EXTRA_LIBS ${STMMINPUTGTKDM_LIBRARIES}) list(APPEND SPINN_EXTRA_LIBS ${STMMINPUTGTKDM_LIBRARIES})
......
...@@ -14,10 +14,10 @@ if (NOT PKG_CONFIG_FOUND) ...@@ -14,10 +14,10 @@ if (NOT PKG_CONFIG_FOUND)
endif() endif()
# Version # Version
set(BARE_APP_VERSION "0.2.0") set(BARE_APP_VERSION "0.5.0")
# Required libraries # Required libraries
pkg_check_modules(STMMINPUTGTKDM REQUIRED stmm-input-gtk-dm>=0.5.0) pkg_check_modules(STMMINPUTGTKDM REQUIRED stmm-input-gtk-dm>=0.5)
list(APPEND BARE_APP_EXTRA_INCLUDE_DIRS ${STMMINPUTGTKDM_INCLUDE_DIRS}) list(APPEND BARE_APP_EXTRA_INCLUDE_DIRS ${STMMINPUTGTKDM_INCLUDE_DIRS})
list(APPEND BARE_APP_EXTRA_LIBS ${STMMINPUTGTKDM_LIBRARIES}) list(APPEND BARE_APP_EXTRA_LIBS ${STMMINPUTGTKDM_LIBRARIES})
......
...@@ -12,10 +12,10 @@ include(FindPkgConfig) ...@@ -12,10 +12,10 @@ include(FindPkgConfig)
find_package(PkgConfig) find_package(PkgConfig)
# Version # Version
set(SHOWEVS_VERSION "0.2.0") set(SHOWEVS_VERSION "0.5.0")
# Required libraries # Required libraries
pkg_check_modules(STMMINPUTGTKDM REQUIRED stmm-input-gtk-dm>=0.5.0) pkg_check_modules(STMMINPUTGTKDM REQUIRED stmm-input-gtk-dm>=0.5)
list(APPEND SHOWEVS_EXTRA_INCLUDE_DIRS ${STMMINPUTGTKDM_INCLUDE_DIRS}) list(APPEND SHOWEVS_EXTRA_INCLUDE_DIRS ${STMMINPUTGTKDM_INCLUDE_DIRS})
list(APPEND SHOWEVS_EXTRA_LIBS ${STMMINPUTGTKDM_LIBRARIES}) list(APPEND SHOWEVS_EXTRA_LIBS ${STMMINPUTGTKDM_LIBRARIES})
......
...@@ -51,7 +51,7 @@ public: ...@@ -51,7 +51,7 @@ public:
static std::pair<unique_ptr<GtkBackend>, std::string> create(JsGtkDeviceManager* p0Owner, const JsDeviceFiles& oDeviceFiles, bool bCreateDefault) noexcept; static std::pair<unique_ptr<GtkBackend>, std::string> create(JsGtkDeviceManager* p0Owner, const JsDeviceFiles& oDeviceFiles, bool bCreateDefault) noexcept;
virtual ~GtkBackend() = default; virtual ~GtkBackend() = default;
protected: protected:
GtkBackend(JsGtkDeviceManager* p0Owner) noexcept; explicit GtkBackend(JsGtkDeviceManager* p0Owner) noexcept;
std::string init(const JsDeviceFiles& oDeviceFiles, bool bCreateDefault) noexcept; std::string init(const JsDeviceFiles& oDeviceFiles, bool bCreateDefault) noexcept;
// For FakeGtkBackend // For FakeGtkBackend
void onDeviceRemoved(int32_t nId) noexcept void onDeviceRemoved(int32_t nId) noexcept
......
...@@ -156,6 +156,8 @@ def getLastVersionAndDateFromChanged(sPrjName, sChangedFilePath, nSkip): ...@@ -156,6 +156,8 @@ def getLastVersionAndDateFromChanged(sPrjName, sChangedFilePath, nSkip):
for sLine in oF: for sLine in oF:
oMatch = oChangeEntryPatt.search(sLine) oMatch = oChangeEntryPatt.search(sLine)
if oMatch: if oMatch:
if bWithinEntry:
raise RuntimeError("Changes file '" + sChangedFilePath + "' faulty: entry start without end")
if nSkip < 0: if nSkip < 0:
raise RuntimeError("Changes file '" + sChangedFilePath + "' faulty: entry start without end") raise RuntimeError("Changes file '" + sChangedFilePath + "' faulty: entry start without end")
sLastVersion = oMatch.group(1); sLastVersion = oMatch.group(1);
......
...@@ -172,6 +172,8 @@ def getLastVersionAndDateFromChanged(sPrjName, sChangedFilePath, nSkip): ...@@ -172,6 +172,8 @@ def getLastVersionAndDateFromChanged(sPrjName, sChangedFilePath, nSkip):
for sLine in oF: for sLine in oF:
oMatch = oChangeEntryPatt.search(sLine) oMatch = oChangeEntryPatt.search(sLine)
if oMatch: if oMatch:
if bWithinEntry:
raise RuntimeError("Changes file '" + sChangedFilePath + "' faulty: entry start without end")
if nSkip < 0: if nSkip < 0:
raise RuntimeError("Changes file '" + sChangedFilePath + "' faulty: entry start without end") raise RuntimeError("Changes file '" + sChangedFilePath + "' faulty: entry start without end")
sLastVersion = oMatch.group(1); sLastVersion = oMatch.group(1);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment