Browse Source

cleanup the makefiles and add osx-debug target

master
Jaromil 4 years ago
parent
commit
144b543623
  1. 4
      .travis.yml
  2. 8
      Makefile
  3. 5
      build/linux.mk
  4. 3
      build/osx.mk

4
.travis.yml

@ -33,7 +33,9 @@ before_install:
script:
- mkdir -p build
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then make osx && make check-osx; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then make osx-debug && make check-osx; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then make clean && cd lib/milagro-crypto-c && git clean -fd && cd - ;fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then make osx; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then make osx-python2 && make osx-python3; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then make clean && cd lib/milagro-crypto-c && git clean -fd && cd - ;fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then make ios-armv7; fi

8
Makefile

@ -106,11 +106,15 @@ include ${pwd}/build/tests.mk
clean:
make clean -C ${pwd}/lib/lua53/src
make clean -C ${pwd}/lib/milagro-crypto-c && \
rm -f ${pwd}/lib/milagro-crypto-c/CMakeCache.txt
make clean -C ${pwd}/lib/milagro-crypto-c
rm -f ${pwd}/lib/milagro-crypto-c/CMakeCache.txt
rm -rf ${pwd}/lib/milagro-crypto-c/CMakeFiles
make clean -C ${pwd}/lib/lpeglabel
make clean -C src
rm -f ${extras}/index.*
clean-src:
make clean -C src
distclean:
rm -rf ${musl}

5
build/linux.mk

@ -23,14 +23,15 @@ android: apply-patches lua53 milagro embed-lua lpeglabel
LD="${ld}" RANLIB="${ranlib}" AR="${ar}" \
make -C src android
linux-debug: cflags := -O1 -ggdb -D'ARCH=\"LINUX\"' ${cflags_protection} -DARCH_LINUX -DDEBUG=1
linux-debug: cflags := -O1 -ggdb ${cflags_protection} -DDEBUG=1
linux-debug: linux
linux-clang: gcc := clang
linux-clang: linux
linux-sanitizer: gcc := clang
linux-sanitizer: cflags := -O1 -ggdb -D'ARCH=\"LINUX\"' ${cflags_protection} -DARCH_LINUX -DDEBUG=1 -fsanitize=address -fno-omit-frame-pointer
linux-sanitizer: cflags := -O1 -ggdb ${cflags_protection} -DDEBUG=1
linux-sanitizer: cflags += -fsanitize=address -fno-omit-frame-pointer
linux-sanitizer: linux
ASAN_OPTIONS=verbosity=1:log_threads=1 \
ASAN_SYMBOLIZER_PATH=/usr/bin/asan_symbolizer \

3
build/osx.mk

@ -3,6 +3,9 @@ osx: apply-patches lua53 milagro embed-lua lpeglabel
make -C src osx
@cp -v ${pwd}/src/zenroom.command ${pwd}/build
osx-debug: cflags := -O1 -ggdb ${cflags_protection} -DDEBUG=1
osx-debug: osx
osx-python2: apply-patches lua53 milagro embed-lua lpeglabel
swig -python ${pwd}/build/swig.i
${gcc} ${cflags} -c ${pwd}/build/swig_wrap.c \

Loading…
Cancel
Save