G/E.
Aimed 'our' C89 compiler at mod_brotli as much for interest as anything
technical) and get the following using release 0.5.2 of Brotli:
Calling NWGNUmod_brotli
CC mod_brotli.c
### mwccnlm Compiler:
# File: mod_brotli.c
# ---------------------
# 22: #include <brotli/encode.h>
# Error: ^
# the file 'brotli/encode.h' cannot be opened
# Too many errors printed, aborting program
User break, cancelled...
D:/Projects/svn/httpd-trunk/build/NWGNUtail.inc:125: recipe for target
'obj_release/mod_brotli.o' failed
make[3]: *** [obj_release/mod_brotli.o] Error 2
CC D:\Projects\srcs\brotli-0.5.2/enc/backward_references.c
### mwccnlm Compiler:
# File: D:\Projects\srcs\brotli-0.5.2\enc\backward_references.c
:> # Too many errors printed, aborting program
User break, cancelled...
D:/Projects/svn/httpd-trunk/build/NWGNUtail.inc:125: recipe for target
'obj_release/backward_references.o' failed
make[3]: *** [obj_release/backward_references.o] Error 2
CC D:\Projects\srcs\brotli-0.5.2/enc/bit_cost.c
CC D:\Projects\srcs\brotli-0.5.2/dec/bit_reader.c
CC D:\Projects\srcs\brotli-0.5.2/enc/block_splitter.c
CC D:\Projects\srcs\brotli-0.5.2/enc/brotli_bit_stream.c
CC D:\Projects\srcs\brotli-0.5.2/enc/cluster.c
CC D:\Projects\srcs\brotli-0.5.2/enc/compress_fragment.c
CC D:\Projects\srcs\brotli-0.5.2/enc/compress_fragment_two_pass.c
CC D:\Projects\srcs\brotli-0.5.2/dec/decode.c
CC D:\Projects\srcs\brotli-0.5.2/common/dictionary.c
CC D:\Projects\srcs\brotli-0.5.2/enc/encode.c
CC D:\Projects\srcs\brotli-0.5.2/enc/entropy_encode.c
CC D:\Projects\srcs\brotli-0.5.2/enc/histogram.c
CC D:\Projects\srcs\brotli-0.5.2/dec/huffman.c
CC D:\Projects\srcs\brotli-0.5.2/enc/literal_cost.c
CC D:\Projects\srcs\brotli-0.5.2/enc/memory.c
CC D:\Projects\srcs\brotli-0.5.2/enc/metablock.c
CC D:\Projects\srcs\brotli-0.5.2/dec/state.c
CC D:\Projects\srcs\brotli-0.5.2/enc/static_dict.c
CC D:\Projects\srcs\brotli-0.5.2/enc/utf8_util.c
make[3]: Target 'default' not remade because of errors.
Unclear if the ggit source has a <brotli/...> dir or this reference is
to the brotli source as a whole).
Changing this to <enc/encode.h> and adding a -I for the brotli source
top gets:
Calling NWGNUmod_brotli
GEN obj_release/mod_brotli_cc.opt
CC mod_brotli.c
### mwccnlm Compiler:
# File: mod_brotli.c
# ---------------------
# 240: output = BrotliEncoderTakeOutput(ctx->state,
&output_len);
# Error:
^
# illegal implicit conversion from 'int' to
# 'const unsigned char *'
Which I assume is either a C89-ism or CW-ism..
The
# ----------------------------------------------------------------
# 30: static const float kInfinity = INFINITY;
# Error: ^
# illegal constant expression
seems more like a C89-ism to me.
The build script and small tweak to use it follow.
Norm
NWGNUmod_brotli:
#
# Make sure all needed macro's are defined
#
#
# Get the 'head' of the build environment if necessary. This includes
default
# targets and paths to tools
#
ifndef EnvironmentDefined
include $(AP_WORK)/build/NWGNUhead.inc
endif
#
# These directories will be at the beginning of the include list,
followed by
# INCDIRS
#
XINCDIRS += \
$(APR)/include \
$(APRUTIL)/include \
$(SRC)/include \
$(NWOS) \
$(BROTLISRC)/common \
$(BROTLISRC)/dec \
$(BROTLISRC)/enc \
$(BROTLISRC) \
$(EOLIST)
#
# These flags will come after CFLAGS
#
XCFLAGS += \
$(EOLIST)
#
# These defines will come after DEFINES
#
XDEFINES += \
$(EOLIST)
#
# These flags will be added to the link.opt file
#
XLFLAGS += \
$(EOLIST)
#
# These values will be appended to the correct variables based on the
value of
# RELEASE
#
ifeq "$(RELEASE)" "debug"
XINCDIRS += \
$(EOLIST)
XCFLAGS += \
$(EOLIST)
XDEFINES += \
$(EOLIST)
XLFLAGS += \
$(EOLIST)
endif
ifeq "$(RELEASE)" "noopt"
XINCDIRS += \
$(EOLIST)
XCFLAGS += \
$(EOLIST)
XDEFINES += \
$(EOLIST)
XLFLAGS += \
$(EOLIST)
endif
ifeq "$(RELEASE)" "release"
XINCDIRS += \
$(EOLIST)
XCFLAGS += \
$(EOLIST)
XDEFINES += \
$(EOLIST)
XLFLAGS += \
$(EOLIST)
endif
#
# These are used by the link target if an NLM is being generated
# This is used by the link 'name' directive to name the nlm. If left blank
# TARGET_nlm (see below) will be used.
#
NLM_NAME = mod_brotli
#
# This is used by the link '-desc ' directive.
# If left blank, NLM_NAME will be used.
#
NLM_DESCRIPTION = Apache $(VERSION_STR) Brotli Compression Module
#
# This is used by the '-threadname' directive. If left blank,
# NLM_NAME Thread will be used.
#
NLM_THREAD_NAME = Brotli Module
#
# If this is specified, it will override VERSION value in
# $(AP_WORK)/build/NWGNUenvironment.inc
#
NLM_VERSION =
#
# If this is specified, it will override the default of 64K
#
NLM_STACK_SIZE = 8192
#
# If this is specified it will be used by the link '-entry' directive
#
NLM_ENTRY_SYM =
#
# If this is specified it will be used by the link '-exit' directive
#
NLM_EXIT_SYM =
#
# If this is specified it will be used by the link '-check' directive
#
NLM_CHECK_SYM =
#
# If these are specified it will be used by the link '-flags' directive
#
NLM_FLAGS =
#
# If this is specified it will be linked in with the XDCData option in
the def
# file instead of the default of $(NWOS)/apache.xdc. XDCData can be
disabled
# by setting APACHE_UNIPROC in the environment
#
XDCDATA =
#
# If there is an NLM target, put it here
#
TARGET_nlm = \
$(OBJDIR)/$(NLM_NAME).nlm \
$(EOLIST)
#
# If there is an LIB target, put it here
#
TARGET_lib = \
$(EOLIST)
#
# These are the OBJ files needed to create the NLM target above.
# Paths must all use the '/' character
#
FILES_nlm_objs = \
$(OBJDIR)/mod_brotli.o \
$(OBJDIR)/backward_references.o \
$(OBJDIR)/bit_cost.o \
$(OBJDIR)/bit_reader.o \
$(OBJDIR)/block_splitter.o \
$(OBJDIR)/brotli_bit_stream.o \
$(OBJDIR)/cluster.o \
$(OBJDIR)/compress_fragment.o \
$(OBJDIR)/compress_fragment_two_pass.o \
$(OBJDIR)/decode.o \
$(OBJDIR)/dictionary.o \
$(OBJDIR)/encode.o \
$(OBJDIR)/entropy_encode.o \
$(OBJDIR)/histogram.o \
$(OBJDIR)/huffman.o \
$(OBJDIR)/literal_cost.o \
$(OBJDIR)/memory.o \
$(OBJDIR)/metablock.o \
$(OBJDIR)/state.o \
$(OBJDIR)/static_dict.o \
$(OBJDIR)/utf8_util.o \
$(EOLIST)
#
# These are the LIB files needed to create the NLM target above.
# These will be added as a library command in the link.opt file.
#
FILES_nlm_libs = \
$(PRELUDE) \
$(EOLIST)
#
# These are the modules that the above NLM target depends on to load.
# These will be added as a module command in the link.opt file.
#
FILES_nlm_modules = \
aprlib \
libc \
$(EOLIST)
#
# If the nlm has a msg file, put it's path here
#
FILE_nlm_msg =
#
# If the nlm has a hlp file put it's path here
#
FILE_nlm_hlp =
#
# If this is specified, it will override $(NWOS)\copyright.txt.
#
FILE_nlm_copyright =
#
# Any additional imports go here
#
FILES_nlm_Ximports = \
@aprlib.imp \
@httpd.imp \
@libc.imp \
$(EOLIST)
#
# Any symbols exported to here
#
FILES_nlm_exports = \
brotli_module \
$(EOLIST)
#
# These are the OBJ files needed to create the LIB target above.
# Paths must all use the '/' character
#
FILES_lib_objs = \
$(EOLIST)
#
# implement targets and dependancies (leave this section alone)
#
libs :: $(OBJDIR) $(TARGET_lib)
nlms :: libs $(TARGET_nlm)
#
# Updated this target to create necessary directories and copy files to the
# correct place. (See $(AP_WORK)/build/NWGNUhead.inc for examples)
#
install :: nlms FORCE
#
# Any specialized rules here
#
vpath %.c $(BROTLISRC)/common:$(BROTLISRC)/dec:$(BROTLISRC)/enc
#
# Include the 'tail' makefile that has targets that depend on variables
defined
# in this makefile
#
include $(APBUILD)/NWGNUtail.inc
Index: modules/filters/NWGNUmakefile
===================================================================
--- modules/filters/NWGNUmakefile (revision 1762749)
+++ modules/filters/NWGNUmakefile (working copy)
@@ -154,6 +154,7 @@
TARGET_nlm = \
$(OBJDIR)/extfiltr.nlm \
$(OBJDIR)/charsetl.nlm \
+ $(OBJDIR)/mod_brotli.nlm \
$(OBJDIR)/mod_crypto.nlm \
$(OBJDIR)/mod_data.nlm \
$(OBJDIR)/mod_filter.nlm \
