Misc genconfig changes: Makefile, README, dist

svaarala · svaarala · commit fc55a592bdd4 · 2015-07-22T23:42:57.000+03:00
diff --git a/Makefile b/Makefile
@@ -137,6 +137,8 @@ DUKTAPE_SOURCES_SEPARATE =	\
 	$(DISTSRCSEP)/duk_bi_array.c \
 	$(DISTSRCSEP)/duk_bi_boolean.c \
 	$(DISTSRCSEP)/duk_bi_date.c \
+	$(DISTSRCSEP)/duk_bi_date_unix.c \
+	$(DISTSRCSEP)/duk_bi_date_windows.c \
 	$(DISTSRCSEP)/duk_bi_error.c \
 	$(DISTSRCSEP)/duk_bi_function.c \
 	$(DISTSRCSEP)/duk_bi_global.c \
@@ -183,6 +185,7 @@ CCOPTS_FEATURES =
 #CCOPTS_FEATURES += -DDUK_OPT_NO_VOLUNTARY_GC
 CCOPTS_FEATURES += -DDUK_OPT_SEGFAULT_ON_PANIC       # segfault on panic allows valgrind to show stack trace on panic
 CCOPTS_FEATURES += -DDUK_OPT_DPRINT_COLORS
+CCOPTS_FEATURES += -DDUK_OPT_DPRINT_RDTSC
 #CCOPTS_FEATURES += -DDUK_OPT_NO_FILE_IO
 #CCOPTS_FEATURES += '-DDUK_OPT_PANIC_HANDLER(code,msg)={printf("*** %d:%s\n",(code),(msg));abort();}'
 CCOPTS_FEATURES += -DDUK_OPT_SELF_TESTS
diff --git a/README.md b/README.md
@@ -7,9 +7,9 @@ Introduction
 [Duktape](http://duktape.org/) is an **embeddable Javascript** engine,
 with a focus on **portability** and **compact** footprint.
 
-Duktape is easy to integrate into a C/C++ project: add `duktape.c` and
-`duktape.h` to your build, and use the Duktape API to call Ecmascript
-functions from C code and vice versa.
+Duktape is easy to integrate into a C/C++ project: add `duktape.c`,
+`duktape.h`, and `duk_config.h` to your build, and use the Duktape API
+to call Ecmascript functions from C code and vice versa.
 
 Main features:
 
@@ -75,7 +75,8 @@ the website, run test cases, etc:
 
     # Install required packages (exact packages depend on distribution)
     $ sudo apt-get install nodejs nodejs-legacy npm perl ant openjdk-7-jdk \
-          libreadline6-dev libncurses-dev python-rdflib python-bs4 clang llvm
+          libreadline6-dev libncurses-dev python-rdflib python-bs4 python-yaml \
+          clang llvm
 
     # Compile the command line tool ('duk')
     $ git clone https://github.com/svaarala/duktape.git
diff --git a/dist-files/Makefile.cmdline b/dist-files/Makefile.cmdline
@@ -10,7 +10,7 @@ DUKTAPE_CMDLINE_SOURCES = \
 
 CC	= gcc
 CCOPTS	= -Os -pedantic -std=c99 -Wall -fstrict-aliasing -fomit-frame-pointer
-CCOPTS += -I./src
+CCOPTS += -I./src   # duktape.h and duk_config.h must be in include path
 CCLIBS	= -lm
 
 # If you have readline, you may want to enable these.  On some platforms
diff --git a/dist-files/Makefile.hello b/dist-files/Makefile.hello
@@ -1,11 +1,11 @@
 #
 #  Example Makefile for building a program with embedded Duktape.
 #
-#  There are two source sets in the distribution: combined sources where
-#  you only need duktape.c and duktape.h, and separate sources where you
-#  have a bunch of source and header files.  Whichever you use, simply
-#  include the relevant sources into your C project.  This Makefile uses
-#  the combined source file.
+#  There are two source sets in the distribution: (1) combined sources where
+#  you only need duktape.c, duktape.h, and duk_config.h, and (2) separate
+#  sources where you have a bunch of source and header files.  Whichever
+#  you use, simply include the relevant sources into your C project.  This
+#  Makefile uses the combined source file.
 #
 
 DUKTAPE_SOURCES = src/duktape.c
diff --git a/dist-files/README.rst b/dist-files/README.rst
@@ -52,11 +52,14 @@ To build an example command line tool, use the following::
 
 This distributable contains:
 
-* ``src/``: main Duktape library in a "single file" format (duktape.c and
-  duktape.h)
+* ``src/``: main Duktape library in a "single file" format (duktape.c,
+  duktape.h, and duk_config.h).
 
 * ``src-separate/``: main Duktape library in multiple files format.
 
+* ``config/``: genconfig utility for creating duk_config.h configuration
+  files for non-mainline platforms, and some prebuilt config headers.
+
 * ``examples/``: further examples for using Duktape.  Although Duktape
   itself is widely portable, some of the examples are Linux only.
   For instance the ``eventloop`` example illustrates how ``setTimeout()``
diff --git a/util/check_code_policy.py b/util/check_code_policy.py
@@ -33,7 +33,7 @@ def __init__(self, filename, linenumber, line, reason):
 re_nonascii = re.compile(r'^.*?[\x80-\xff].*?$')
 re_func_decl_or_def = re.compile(r'^(\w+)\s+(?:\w+\s+)*(\w+)\(.*?.*?$')  # may not finish on same line
 
-# These identifiers are wrapped in duk_features.h.in, and should only be used
+# These identifiers are wrapped in duk_config.h, and should only be used
 # through the wrappers elsewhere.
 rejected_plain_identifiers_list = [
 	# math classification
@@ -254,8 +254,7 @@ def checkIdentifiers(lines, idx, filename):
 	line = lines[idx]
 	# XXX: this now executes for every line which is pointless
 	bn = os.path.basename(filename)
-	excludePlain = (bn == 'duk_features.h.in' or \
-	                bn[0:5] == 'test-')
+	excludePlain = (bn[0:5] == 'test-')
 
 	for m in re.finditer(re_identifier, line):
 		if rejected_plain_identifiers.has_key(m.group(0)):
@@ -296,9 +295,7 @@ def checkNoSymbolVisibility(lines, idx, filename):
 		return
 
 	# Special exceptions
-	if bn == 'duk_features.h.in' and 'static __inline__' in line:
-		# duk_rdtsc(), gcc specific
-		return
+	# (None now)
 
 	raise Exception('missing symbol visibility macro')
 
diff --git a/util/combine_src.py b/util/combine_src.py
@@ -136,9 +136,10 @@ def createCombined(files, extinc, intinc, duk_version, git_commit, git_describe,
 
 	emit_state = [ None, None ]  # curr_filename, curr_lineno
 
-	# Because duktape.c/duktape.h are often distributed or included in project
-	# sources as is, add a license reminder and Duktape version information
-	# to the duktape.c header (duktape.h already contains them).
+	# Because duktape.c/duktape.h/duk_config.h are often distributed or
+	# included in project sources as is, add a license reminder and
+	# Duktape version information to the duktape.c header (duktape.h
+	# already contains them).
 
 	duk_major = duk_version / 10000
 	duk_minor = duk_version / 100 % 100
diff --git a/util/make_dist.sh b/util/make_dist.sh
@@ -31,6 +31,7 @@ while [ $# -gt 0 ]; do
 	shift
 done
 
+ENTRYPWD=`pwd`
 DIST=`pwd`/dist
 DISTSRCSEP=$DIST/src-separate
 DISTSRCCOM=$DIST/src
@@ -56,6 +57,7 @@ rm -rf $DIST
 mkdir $DIST
 mkdir $DIST/src-separate
 mkdir $DIST/src
+mkdir $DIST/config
 mkdir $DIST/extras
 mkdir $DIST/polyfills
 #mkdir $DIST/doc
@@ -76,6 +78,7 @@ mkdir $DIST/examples/alloc-torture
 mkdir $DIST/examples/alloc-hybrid
 mkdir $DIST/examples/debug-trans-socket
 mkdir $DIST/examples/codepage-conv
+mkdir $DIST/examples/dummy-date-provider
 
 # Copy most files directly
 
@@ -98,6 +101,8 @@ for i in \
 	duk_bi_boolean.c	\
 	duk_bi_buffer.c		\
 	duk_bi_date.c		\
+	duk_bi_date_unix.c	\
+	duk_bi_date_windows.c	\
 	duk_bi_duktape.c	\
 	duk_bi_error.c		\
 	duk_bi_function.c	\
@@ -200,6 +205,21 @@ for i in \
 	cp src/$i $DISTSRCSEP/
 done
 
+cd $ENTRYPWD/config
+tar cfz $DIST/config/genconfig_metadata.tar.gz \
+	tags.yaml \
+	feature-options \
+	config-options \
+	header-snippets \
+	other-defines
+cd $ENTRYPWD
+for i in \
+	README.rst \
+	genconfig.py \
+	; do
+	cp config/$i $DIST/config/
+done
+
 for i in \
 	README.rst \
 	Makefile \
@@ -349,6 +369,13 @@ for i in \
 	cp examples/codepage-conv/$i $DIST/examples/codepage-conv/
 done
 
+for i in \
+	README.rst \
+	dummy_date_provider.c \
+	; do
+	cp examples/dummy-date-provider/$i $DIST/examples/dummy-date-provider/
+done
+
 cp extras/README.rst $DIST/extras/
 # XXX: copy extras
 
@@ -395,6 +422,23 @@ echo '/*' > $DIST/AUTHORS.rst.tmp
 cat AUTHORS.rst | python util/make_ascii.py | sed -e 's/^/ \*  /' >> $DIST/AUTHORS.rst.tmp
 echo ' */' >> $DIST/AUTHORS.rst.tmp
 
+# Build duk_config.h from snippets using genconfig.
+python config/genconfig.py --metadata config --output $DIST/duk_config.h.tmp \
+	generate-autodetect-header
+cp $DIST/duk_config.h.tmp $DISTSRCCOM/duk_config.h
+cp $DIST/duk_config.h.tmp $DISTSRCSEP/duk_config.h
+cp $DIST/duk_config.h.tmp $DIST/config/duk_config.h-autodetect
+
+# Generate a few barebones config examples
+python config/genconfig.py --metadata config --emit-legacy-feature-check --emit-config-sanity-check --omit-removed-config-options --omit-unused-config-options \
+	--output $DIST/config/duk_config.h-linux-gcc-x64 \
+	--platform linux --compiler gcc --architecture x64 \
+	generate-barebones-header
+python config/genconfig.py --metadata config --emit-legacy-feature-check --emit-config-sanity-check --omit-removed-config-options --omit-unused-config-options \
+	--output $DIST/config/duk_config.h-linux-gcc-x86 \
+	--platform linux --compiler gcc --architecture x86 \
+	generate-barebones-header
+
 # Build duktape.h from parts, with some git-related replacements.
 # The only difference between single and separate file duktape.h
 # is the internal DUK_SINGLE_FILE define.
@@ -415,18 +459,10 @@ cat src/duktape.h.in | sed -e '
     r dist/AUTHORS.rst.tmp
     d
 }
-/^@DUK_FEATURES_H@$/ {
-    r src/duk_features.h.in
-    d
-}
 /^@DUK_API_PUBLIC_H@$/ {
     r src/duk_api_public.h.in
     d
 }
-/^@DUK_FEATURES_SANITY_H@$/ {
-    r src/duk_features_sanity.h.in
-    d
-}
 /^@DUK_DBLUNION_H@$/ {
     r src/duk_dblunion.h.in
     d
@@ -737,13 +773,13 @@ done
 rm $DISTSRCSEP/caseconv.txt
 
 # Create a combined source file, duktape.c, into a separate combined source
-# directory.  This allows user to just include "duktape.c" and "duktape.h"
-# into a project and maximizes inlining and size optimization opportunities
-# even with older compilers.  Because some projects include these files into
-# their repository, the result should be deterministic and diffable.  Also,
-# it must retain __FILE__/__LINE__ behavior through preprocessor directives.
-# Whitespace and comments can be stripped as long as the other requirements
-# are met.
+# directory.  This allows user to just include "duktape.c", "duktape.h", and
+# "duk_config.h" into a project and maximizes inlining and size optimization
+# opportunities even with older compilers.  Because some projects include
+# these files into their repository, the result should be deterministic and
+# diffable.  Also, it must retain __FILE__/__LINE__ behavior through
+# preprocessor directives.  Whitespace and comments can be stripped as long
+# as the other requirements are met.
 
 python util/combine_src.py $DISTSRCSEP $DISTSRCCOM/duktape.c \
 	"$DUK_VERSION" "$GIT_COMMIT" "$GIT_DESCRIBE" \

Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,11 @@`
`1`	`1`	`#`
`2`	`2`	`# Example Makefile for building a program with embedded Duktape.`
`3`	`3`	`#`
`4`		`-# There are two source sets in the distribution: combined sources where`
`5`		`-# you only need duktape.c and duktape.h, and separate sources where you`
`6`		`-# have a bunch of source and header files. Whichever you use, simply`
`7`		`-# include the relevant sources into your C project. This Makefile uses`
`8`		`-# the combined source file.`
	`4`	`+# There are two source sets in the distribution: (1) combined sources where`
	`5`	`+# you only need duktape.c, duktape.h, and duk_config.h, and (2) separate`
	`6`	`+# sources where you have a bunch of source and header files. Whichever`
	`7`	`+# you use, simply include the relevant sources into your C project. This`
	`8`	`+# Makefile uses the combined source file.`
`9`	`9`	`#`
`10`	`10`
`11`	`11`	`DUKTAPE_SOURCES = src/duktape.c`