summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Kutsan <AKutsan@luxoft.com>2014-10-09 09:43:37 +0300
committerAlexander Kutsan <AKutsan@luxoft.com>2014-10-09 09:50:01 +0300
commit0c32436701b271239e9dd4ed16735a569aec63bf (patch)
tree527864a31d4936f0ebe90736b818e689c3de94d9
parentbee21a3ddc9a44910fa1d250152161c6144441de (diff)
downloadsmartdevicelink-0c32436701b271239e9dd4ed16735a569aec63bf.tar.gz
APPLINK-8466 reviev notesSNAPSHOT_PASA09102014
-rw-r--r--CMakeLists.txt2
-rw-r--r--customer-specific/pasa.conf14
-rw-r--r--src/components/include/utils/timer_thread.h10
3 files changed, 13 insertions, 13 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a1433ba9e..782e39d3a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -63,7 +63,7 @@ set(ARCH_TYPE_OPTION "$ENV{ARCH_TYPE}")
add_custom_target(pasa-tarball
COMMAND ${CMAKE_SOURCE_DIR}/tools/Utils/export-customer-specific.sh ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} pasa
- COMMAND tar -czv -C /tmp/PASA -f ${CMAKE_BINARY_DIR}/pasa.tar.gz . > /dev/null
+ COMMAND tar -cz -C /tmp/PASA -f ${CMAKE_BINARY_DIR}/pasa.tar.gz .
DEPENDS HMI_API MOBILE_API v4_protocol_v1_2_no_extra
)
diff --git a/customer-specific/pasa.conf b/customer-specific/pasa.conf
index 90fb7802d..b87a9faaa 100644
--- a/customer-specific/pasa.conf
+++ b/customer-specific/pasa.conf
@@ -50,12 +50,12 @@ function snapshot_tag() {
}
function last_commit {
- git --git-dir=$srcdir'/.git' log origin/develop| head -n 1|cut -f 2 -d ' '
+ git --git-dir=$srcdir/.git rev-parse HEAD
}
-function chech_valid() {
- res=$(find /tmp/PASA -type f -exec grep -H CUSTOMER_PASA {} \;)
- if [[ res=="" ]] ; then
+function check_valid() {
+ res=$(grep -R CUSTOMER_PASA /tmp/PASA)
+ if [ -z "$res" ] ; then
echo "Sources are valid";
else
echo "There are some problems during parsing some headers: ";
@@ -64,11 +64,11 @@ function chech_valid() {
}
function post_install {
- sed 's/{TAG}/'$(snapshot_tag)'/g' -i $export_dir/src/appMain/SmartDeviceLinkMainApp.cpp
- sed 's/{GIT_COMMIT}/'$(last_commit)'/g' -i $export_dir/src/appMain/SmartDeviceLinkMainApp.cpp
+ sed 's/{TAG}/'$(snapshot_tag)'/g' -i $export_dir/src/appMain/SmartDeviceLinkMainApp.cpp
+ sed 's/{GIT_COMMIT}/'$(last_commit)'/g' -i $export_dir/src/appMain/SmartDeviceLinkMainApp.cpp
find $export_dir \
-regex '.*\.\(cc\|h\|cpp\|hpp\)' \
-exec unix2dos {} \;
echo "Snapshoted on :"$(last_commit)
- chech_valid
+ check_valid
}
diff --git a/src/components/include/utils/timer_thread.h b/src/components/include/utils/timer_thread.h
index 3c36786a2..ea529f2b0 100644
--- a/src/components/include/utils/timer_thread.h
+++ b/src/components/include/utils/timer_thread.h
@@ -202,11 +202,11 @@ class TimerThread {
DISALLOW_COPY_AND_ASSIGN(TimerLooperDelegate);
};
void (T::*callback_)();
- T* callee_;
- TimerDelegate* delegate_;
- //threads::Thread* thread_;
- mutable bool is_running_;
- mutable bool is_looper_;
+ T* callee_;
+ TimerDelegate* delegate_;
+ //threads::Thread* thread_;
+ mutable bool is_running_;
+ bool is_looper_;
DISALLOW_COPY_AND_ASSIGN(TimerThread);