From ab4e59700f9945f674eb840d57c0652162ebb9ef Mon Sep 17 00:00:00 2001 From: "e.gavrin" Date: Wed, 30 Jul 2014 14:43:02 +0400 Subject: [PATCH] add message on top main with info about branch/revision data --- Makefile.mak | 3 +-- src/main.c | 7 ++++++- src/version.h | 23 +++++++++++++++++++++++ tools/jerry_gen_version_h.sh | 31 +++++++++++++++++++++++++++++++ 4 files changed, 61 insertions(+), 3 deletions(-) create mode 100644 src/version.h create mode 100755 tools/jerry_gen_version_h.sh diff --git a/Makefile.mak b/Makefile.mak index 527335660..f8a5c0ef7 100644 --- a/Makefile.mak +++ b/Makefile.mak @@ -196,8 +196,6 @@ endif CFLAGS_JERRY = $(CFLAGS_WARNINGS) $(CFLAGS_WERROR) $(CFLAGS_WFATAL_ERRORS) DEFINES_JERRY = -DMEM_HEAP_CHUNK_SIZE=$$((64)) -DMEM_HEAP_AREA_SIZE=$$((2 * 1024 + 512)) -DMEM_STATS -# FIXME: -# Add common-io.c and sensors.c SOURCES_JERRY = \ $(sort \ $(wildcard ./src/libruntime/*.c) \ @@ -288,6 +286,7 @@ $(JERRY_TARGETS): @rm -rf $(TARGET_DIR) @mkdir -p $(TARGET_DIR) @mkdir -p $(TARGET_DIR)/obj + @ ./tools/jerry_gen_version_h.sh ./src/version.h @source_index=0; \ for jerry_src in $(SOURCES_JERRY) $(MAIN_MODULE_SRC); do \ cmd="$(CC) -c $(DEFINES_JERRY) $(CFLAGS_COMMON) $(CFLAGS_JERRY) $(INCLUDES_JERRY) $(INCLUDES_THIRDPARTY) $$jerry_src \ diff --git a/src/main.c b/src/main.c index 52ccd1f2f..b7088fa13 100644 --- a/src/main.c +++ b/src/main.c @@ -26,6 +26,7 @@ #include "serializer.h" #include "deserializer.h" #include "optimizer-passes.h" +#include "version.h" #define MAX_STRINGS 100 #define MAX_NUMS 25 @@ -142,7 +143,11 @@ main (int argc __unused, const char *file_name = NULL; bool parse_only = false; int i; - + + __printf("Build date: \t%s\n", jerry_build_date); + __printf("Commit hash:\t%s\n", jerry_commit_hash); + __printf("Branch name:\t%s\n", jerry_branch_name); + for (i = 1; i < argc; i++) { if (!__strcmp ("--parse-only", argv[i])) diff --git a/src/version.h b/src/version.h new file mode 100644 index 000000000..a1878dd1f --- /dev/null +++ b/src/version.h @@ -0,0 +1,23 @@ +/* Copyright 2014 Samsung Electronics Co., Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef VERSION_H +#define VERSION_H + +static const char *jerry_build_date = "30/07/2014"; +static const char *jerry_commit_hash = "d309ab13d00abe21a83862e5983b12e7b766fe5a"; +static const char *jerry_branch_name = "refs/heads/master"; + +#endif /* VERSION_H */ diff --git a/tools/jerry_gen_version_h.sh b/tools/jerry_gen_version_h.sh new file mode 100755 index 000000000..b790c6f0f --- /dev/null +++ b/tools/jerry_gen_version_h.sh @@ -0,0 +1,31 @@ +# Copyright 2014 Samsung Electronics Co., Ltd. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +#!/bin/bash + +OUT_FILE=$1 + +GIT_BRANCH=$(git symbolic-ref -q HEAD) +GIT_HASH=$(git rev-parse HEAD) +BUILD_DATE=$(date +'%d/%m/%Y') + +echo "#ifndef VERSION_H" > $OUT_FILE +echo "#define VERSION_H" >> $OUT_FILE +echo "" >> $OUT_FILE +echo "static const char *jerry_build_date = \"$BUILD_DATE\";" >> $OUT_FILE +echo "static const char *jerry_commit_hash = \"$GIT_HASH\";" >> $OUT_FILE +echo "static const char *jerry_branch_name = \"$GIT_BRANCH\";" >> $OUT_FILE +echo "" >> $OUT_FILE +echo "#endif /* VERSION_H */" >> $OUT_FILE +