[models] install unconditionally

Summary: Since D20891116 (224e0b7c52), java models are not installed at all if the C analyzers are not enabled.  The recent move of models into Sqlite (D23191601 (1db53f43b5)) makes this a fatal error instead of a silent one.

Reviewed By: artempyanykh

Differential Revision: D23565074

fbshipit-source-id: 3816ac797
master
Nikos Gorogiannis 4 years ago committed by Facebook GitHub Bot
parent 30fcdc7d29
commit ee70a80f70

@ -642,6 +642,8 @@ endif
test -d '$(DESTDIR)$(libdir)/infer/infer/bin/' || \ test -d '$(DESTDIR)$(libdir)/infer/infer/bin/' || \
$(MKDIR_P) '$(DESTDIR)$(libdir)/infer/infer/bin/' $(MKDIR_P) '$(DESTDIR)$(libdir)/infer/infer/bin/'
# copy files # copy files
$(INSTALL_DATA) -C 'infer/lib/models.sql' \
'$(DESTDIR)$(libdir)/infer/infer/lib/models.sql'
ifeq ($(BUILD_C_ANALYZERS),yes) ifeq ($(BUILD_C_ANALYZERS),yes)
$(INSTALL_DATA) -C 'facebook-clang-plugins/libtooling/build/FacebookClangPlugin.dylib' \ $(INSTALL_DATA) -C 'facebook-clang-plugins/libtooling/build/FacebookClangPlugin.dylib' \
'$(DESTDIR)$(libdir)/infer/facebook-clang-plugins/libtooling/build/FacebookClangPlugin.dylib' '$(DESTDIR)$(libdir)/infer/facebook-clang-plugins/libtooling/build/FacebookClangPlugin.dylib'
@ -659,8 +661,6 @@ ifeq ($(BUILD_C_ANALYZERS),yes)
[ $(cc) -ef '$(INFER_BIN)' ] && \ [ $(cc) -ef '$(INFER_BIN)' ] && \
$(REMOVE) '$(notdir $(cc))' && \ $(REMOVE) '$(notdir $(cc))' && \
$(LN_S) ../../bin/infer '$(notdir $(cc))';)) $(LN_S) ../../bin/infer '$(notdir $(cc))';))
$(INSTALL_DATA) -C 'infer/lib/models.sql' \
'$(DESTDIR)$(libdir)/infer/infer/lib/models.sql'
$(INSTALL_DATA) -C 'infer/lib/linter_rules/linters.al' \ $(INSTALL_DATA) -C 'infer/lib/linter_rules/linters.al' \
'$(DESTDIR)$(libdir)/infer/infer/lib/linter_rules/linters.al' '$(DESTDIR)$(libdir)/infer/infer/lib/linter_rules/linters.al'
$(INSTALL_DATA) -C 'infer/etc/clang_ast.dict' \ $(INSTALL_DATA) -C 'infer/etc/clang_ast.dict' \

Loading…
Cancel
Save