ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-02-01 08:48:09 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #476 from dicej/werror

Browse Source 
disable -Werror by default (but still use it for continuous integration)
This commit is contained in:
Joshua Warner 2016-02-15 23:38:46 +00:00
commit 3b83277d5e
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
makefile
View File

@ -46,8 +46,8 @@ endif
ifeq ($(bootimage),true) ifeq ($(bootimage),true)
options := $(options)-bootimage options := $(options)-bootimage
ifeq ($(bootimage-test),true) ifeq ($(bootimage-test),true)
# this option indicates that we should AOT-compile the test # this option indicates that we should AOT-compile the test
# classes as well as the class library # classes as well as the class library
options := $(options)-test options := $(options)-test
endif endif
endif endif
@ -126,6 +126,10 @@ ifeq ($(bootimage-test),true)
bootimage-classpath = $(classpath-build):$(test-build) bootimage-classpath = $(classpath-build):$(test-build)
endif endif
ifeq ($(use-werror),true)
werror = -Werror
endif
test-executable = $(shell pwd)/$(executable) test-executable = $(shell pwd)/$(executable)
boot-classpath = $(classpath-build) boot-classpath = $(classpath-build)
embed-prefix = /avian-embedded embed-prefix = /avian-embedded
@ -464,7 +468,7 @@ endif
# note that we suppress the non-virtual-dtor warning because we never # note that we suppress the non-virtual-dtor warning because we never
# use the delete operator, which means we don't need virtual # use the delete operator, which means we don't need virtual
# destructors: # destructors:
warnings = -Wall -Wextra -Werror -Wunused-parameter -Winit-self \ warnings = -Wall -Wextra $(werror) -Wunused-parameter -Winit-self \
-Wno-non-virtual-dtor -Wno-non-virtual-dtor
target-cflags = -DTARGET_BYTES_PER_WORD=$(pointer-size) target-cflags = -DTARGET_BYTES_PER_WORD=$(pointer-size)
@ -492,7 +496,7 @@ converter-cflags = -D__STDC_CONSTANT_MACROS -std=c++0x -Iinclude/ -Isrc/ \
-fno-rtti -fno-exceptions \ -fno-rtti -fno-exceptions \
-DAVIAN_TARGET_ARCH=AVIAN_ARCH_UNKNOWN \ -DAVIAN_TARGET_ARCH=AVIAN_ARCH_UNKNOWN \
-DAVIAN_TARGET_FORMAT=AVIAN_FORMAT_UNKNOWN \ -DAVIAN_TARGET_FORMAT=AVIAN_FORMAT_UNKNOWN \
-Wall -Wextra -Werror -Wunused-parameter -Winit-self -Wno-non-virtual-dtor -Wall -Wextra $(werror) -Wunused-parameter -Winit-self -Wno-non-virtual-dtor
cflags = $(build-cflags) cflags = $(build-cflags)
@ -736,7 +740,7 @@ ifeq ($(kernel),darwin)
sdk-dir = $(platform-dir)/Developer/SDKs sdk-dir = $(platform-dir)/Developer/SDKs
mac-version := $(shell \ mac-version := $(shell \
if test -d $(sdk-dir)/MacOSX10.11.sdk; then echo 10.11; \ if test -d $(sdk-dir)/MacOSX10.11.sdk; then echo 10.11; \
elif test -d $(sdk-dir)/MacOSX10.10.sdk; then echo 10.10; \ elif test -d $(sdk-dir)/MacOSX10.10.sdk; then echo 10.10; \
elif test -d $(sdk-dir)/MacOSX10.9.sdk; then echo 10.9; \ elif test -d $(sdk-dir)/MacOSX10.9.sdk; then echo 10.9; \
elif test -d $(sdk-dir)/MacOSX10.8.sdk; then echo 10.8; \ elif test -d $(sdk-dir)/MacOSX10.8.sdk; then echo 10.8; \

2
test/ci.sh
View File

@ -4,7 +4,7 @@ set -eo pipefail
root_dir=$(pwd) root_dir=$(pwd)
flags="${@}" flags="use-werror=true ${@}"
is-mac() { is-mac() {
if [[ $(uname -s) == "Darwin" || ${TRAVIS_OS_NAME} == "osx" ]]; then if [[ $(uname -s) == "Darwin" || ${TRAVIS_OS_NAME} == "osx" ]]; then