YourWishes/jerryscript
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Generating version info without header file.

Browse Source
This commit is contained in:
Ruben Ayrapetyan
2014-07-30 15:08:02 +04:00
parent c6baf89035
commit 52495b2cc1
4 changed files with 15 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile.mak
+7 -1
View File
@@ -193,8 +193,15 @@ endif
# Jerry part sources, headers, includes, cflags, ldflags
#
GIT_BRANCH=$(shell git symbolic-ref -q HEAD)
GIT_HASH=$(shell git rev-parse HEAD)
BUILD_DATE=$(shell date +'%d/%m/%Y')
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
DEFINES_JERRY += -DJERRY_BUILD_DATE="\"$(BUILD_DATE)\"" \
-DJERRY_COMMIT_HASH="\"$(GIT_HASH)\"" \
-DJERRY_BRANCH_NAME="\"$(GIT_BRANCH)\""
SOURCES_JERRY = \
$(sort \
@@ -288,7 +295,6 @@ $(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 \
src/main.c
+8 -6
View File
@@ -26,7 +26,6 @@
#include "serializer.h"
#include "deserializer.h"
#include "optimizer-passes.h"
#include "version.h"
#define MAX_STRINGS 100
#define MAX_NUMS 25
@@ -144,13 +143,16 @@ main (int argc __unused,
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]))
if (!__strcmp ("-v", argv[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);
__printf("\n");
}
else if (!__strcmp ("--parse-only", argv[i]))
{
parse_only = true;
}
src/version.h
-23
View File
@@ -1,23 +0,0 @@
/* 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 */
tools/jerry_gen_version_h.sh
-31
View File
@@ -1,31 +0,0 @@
# 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