Imported upstream 3.0.8HEADsubmit/trunk/20191101.102136submit/trunk/20191030.112603submit/trunk/20191017.233826submit/trunk/20191017.111201submit/trunk/20190927.012842accepted/tools/devbase/tools/legacy/20240424.050617accepted/tools/devbase/tools/legacy/20240423.040635accepted/tools/devbase/tools/legacy/20240422.110744accepted/tizen/devbase/tools/20190927.044910spin-release-latestrelease-20161231release-20160930release-20160615release-20160531masterdevel_psk_20160727develaccepted/tools_devbase_tools_legacyaccepted/tizen_devbase_tools

Change-Id: I8423a2e4bed8a15b862b6b1ab6f6371c92e78b3f

1 files changed, 13 insertions, 64 deletions

diff --git a/Makefile.am b/Makefile.am
index 2280083..dd2f2d5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,10 +1,7 @@
 ACLOCAL_AMFLAGS = -I m4
-AUTOMAKE_OPTIONS = subdir-objects
 
 bin_PROGRAMS = xdelta3
-noinst_PROGRAMS = xdelta3regtest xdelta3decode xdelta3checksum
-
-export AFL_HARDEN
+noinst_PROGRAMS = xdelta3regtest xdelta3decode
 
 common_SOURCES = \
 	  xdelta3-blkcache.h \
@@ -38,67 +35,39 @@ xdelta3regtest_SOURCES = $(common_SOURCES) \
 	testing/sizes.h \
 	testing/test.h
 
-xdelta3checksum_SOURCES = $(common_SOURCES) \
-	testing/checksum_test.cc \
-	testing/checksum_test_c.c
-
-# These sources constitute a regression test written in Go, that is
-# not automatically built or run.  Install Go-1.5.x or later, add
-# `pwd`/go in $GOPATH, and (cd go/src && go run regtest.go).
-# TODO(jmacd): replace hard-coded path names in regtest.go w/ flags.
-GOLANG_SOURCES = \
-	go/src/xdelta/test.go \
-	go/src/xdelta/rstream.go \
-	go/src/xdelta/tgroup.go \
-	go/src/xdelta/run.go \
-	go/src/regtest.go
-
 # Note: for extra sanity checks, enable -Wconversion. Note there
 # are a lot of false positives.
 WFLAGS = -Wall -Wshadow -fno-builtin -Wextra -Wsign-compare \
-	 -Wformat=2 -Wno-format-nonliteral \
-	 -Wno-unused-parameter -Wno-unused-function
-
- # -Weverything \
- # -Wc++11-compat-reserved-user-defined-literal \
- # -Wno-padded \
- # -Wno-format-nonliteral \
- # -Wno-cast-align \
- # -Wno-unused-parameter \
- # -Wno-sign-conversion \
- # -Wno-conversion \
- # -Wno-switch-enum \
- # -Wno-covered-switch-default \
- # -Wno-disabled-macro-expansion \
- # -Wno-variadic-macros \
- # -Wno-c++98-compat-pedantic
+	 -Wextra -Wno-unused-parameter
 
 C_WFLAGS = $(WFLAGS) -pedantic -std=c99
-CXX_WFLAGS = $(WFLAGS) -pedantic -std=c++11
+CXX_WFLAGS = $(WFLAGS)
 
 common_CFLAGS = \
+	      -DGENERIC_ENCODE_TABLES=0 \
 	      -DREGRESSION_TEST=1 \
 	      -DSECONDARY_DJW=1 \
 	      -DSECONDARY_FGK=1 \
+	      -DXD3_POSIX=1 \
+	      -DXD3_USE_LARGEFILE64=1 \
 	      -DXD3_MAIN=1
 
 if DEBUG_SYMBOLS
   common_CFLAGS += -g
 endif
 
-#common_CFLAGS += -fsanitize=address -fno-omit-frame-pointer
-#common_CFLAGS += -O2
-
 # For additional debugging, add -DXD3_DEBUG=1, 2, 3, ...
 xdelta3_CFLAGS = $(C_WFLAGS) $(common_CFLAGS) -DXD3_DEBUG=0
 xdelta3_LDADD = -lm
 
 xdelta3decode_CFLAGS = \
 	$(C_WFLAGS) \
+	-DGENERIC_ENCODE_TABLES=0 \
 	-DREGRESSION_TEST=0 \
 	-DSECONDARY_DJW=0 \
 	-DSECONDARY_FGK=0 \
 	-DSECONDARY_LZMA=0 \
+	-DXD3_USE_LARGEFILE64=1 \
 	-DXD3_MAIN=1 \
 	-DXD3_ENCODER=0 \
 	-DXD3_STDIO=1 \
@@ -111,21 +80,14 @@ xdelta3regtest_CFLAGS = \
 	$(C_WFLAGS) $(common_CFLAGS) -DNOT_MAIN=1 -DXD3_DEBUG=1
 xdelta3regtest_LDADD = -lm
 
-xdelta3checksum_CXXFLAGS = \
-	$(CXX_WFLAGS) $(common_CFLAGS) -DNOT_MAIN=1 -DXD3_MAIN=1 -std=c++11
-xdelta3checksum_CFLAGS = \
-	$(C_WFLAGS) $(common_CFLAGS) -DNOT_MAIN=1 -DXD3_MAIN=1
-
-
 man1_MANS = xdelta3.1
 
 EXTRA_DIST = \
-	README.md \
-	run_release.sh \
 	draft-korn-vcdiff.txt \
-	$(GOLANG_SOURCES) \
+	README \
 	examples/Makefile \
-	examples/README.md \
+	examples/README \
+	examples/checksum_test.cc \
 	examples/compare_test.c \
 	examples/encode_decode_test.c \
 	examples/small_page_test.c \
@@ -145,21 +107,8 @@ EXTRA_DIST = \
 	examples/iOS/xdelta3-ios-test/xdelta3-ios-test/main.m \
 	examples/iOS/xdelta3-ios-test/xdelta3-ios-test/xdelta3-ios-test-Info.plist \
 	examples/iOS/xdelta3-ios-test/xdelta3-ios-test/xdelta3-ios-test-Prefix.pch \
-	cpp-btree/CMakeLists.txt \
-	cpp-btree/COPYING \
-	cpp-btree/README \
-	cpp-btree/btree.h \
-	cpp-btree/btree_bench.cc \
-	cpp-btree/btree_container.h \
-	cpp-btree/btree_map.h \
-	cpp-btree/btree_set.h \
-	cpp-btree/btree_test.cc \
-	cpp-btree/btree_test.h \
-	cpp-btree/btree_test_flags.cc \
-	cpp-btree/safe_btree.h \
-	cpp-btree/safe_btree_map.h \
-	cpp-btree/safe_btree_set.h \
-	cpp-btree/safe_btree_test.cc \
+	Makefile.mingw \
+	Makefile.orig \
 	testing/xdelta3-regtest.py \
 	testing/xdelta3-test.py \
 	xdelta3.1 \