You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by za...@apache.org on 2014/12/15 14:33:20 UTC
[31/37] cordova-ubuntu git commit: CB-5655: make visible cordova
version(native)
CB-5655: make visible cordova version(native)
Project: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/commit/7e279a61
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/tree/7e279a61
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/diff/7e279a61
Branch: refs/heads/master
Commit: 7e279a61215e8f4c1c7e2ae2c6a8650b3f1033e2
Parents: b442e85
Author: Maxim Ermilov <ma...@canonical.com>
Authored: Mon Dec 1 09:15:38 2014 +0300
Committer: Maxim Ermilov <ma...@canonical.com>
Committed: Mon Dec 1 09:15:38 2014 +0300
----------------------------------------------------------------------
CMakeLists.txt | 8 ++++----
main.cpp | 6 +++---
2 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/blob/7e279a61/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/CMakeLists.txt b/CMakeLists.txt
index bf286fe..e544495 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -26,9 +26,9 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
set(CMAKE_AUTOMOC ON)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}")
-file (STRINGS "VERSION" tmp)
-STRING(REGEX MATCH "^[0-9]+\\.[0-9]+" VERSION ${tmp})
-STRING(REGEX MATCH "^[0-9]+" MAJOR_VERSION ${tmp})
+file (STRINGS "VERSION" CORDOVA_VERSION)
+STRING(REGEX MATCH "^[0-9]+\\.[0-9]+" VERSION ${CORDOVA_VERSION})
+STRING(REGEX MATCH "^[0-9]+" MAJOR_VERSION ${VERSION})
STRING(REGEX MATCH "[0-9]+$" MINOR_VERSION ${VERSION})
configure_file (
@@ -40,7 +40,7 @@ configure_file (
"${PROJECT_BINARY_DIR}/CordovaView.qml"
)
-SET(CMAKE_CXX_FLAGS "-std=c++11 -fno-omit-frame-pointer -Wall -Wextra -DCORDOVA_UBUNTU_VERSION=\\\"${VERSION}\\\" -DCORDOVA_UBUNTU_MAJOR_VERSION=${MAJOR_VERSION} -DCORDOVA_UBUNTU_MINOR_VERSION=${MINOR_VERSION} -I ${PROJECT_SOURCE_DIR}/src")
+SET(CMAKE_CXX_FLAGS "-std=c++11 -fno-omit-frame-pointer -Wall -Wextra -DCORDOVA_UBUNTU_VERSION=\\\"${CORDOVA_VERSION}\\\" -DCORDOVA_UBUNTU_MAJOR_VERSION=${MAJOR_VERSION} -DCORDOVA_UBUNTU_MINOR_VERSION=${MINOR_VERSION} -I ${PROJECT_SOURCE_DIR}/src")
if(UBUNTU_TOUCH STREQUAL "1")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DUBUNTU_TOUCH")
http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/blob/7e279a61/main.cpp
----------------------------------------------------------------------
diff --git a/main.cpp b/main.cpp
index 57d9728..b12aa84 100644
--- a/main.cpp
+++ b/main.cpp
@@ -39,9 +39,9 @@ static void customMessageOutput(QtMsgType type, const QMessageLogContext &, cons
}
int main(int argc, char *argv[]) {
-#ifndef NDEBUG
- qputenv("QTWEBKIT_INSPECTOR_SERVER", "9222");
-#endif
+ printf("\nApache Cordova native platform version %s is starting\n\n", CORDOVA_UBUNTU_VERSION);
+ fflush(stdout);
+
qInstallMessageHandler(customMessageOutput);
QApplication app(argc, argv);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org