gfwleak/zhangyang-libzt
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Build tweaks for Jenkins

Browse Source
This commit is contained in:
Joseph Henry
2017-08-14 16:59:44 -07:00
parent 5db48e6da3
commit f8af949dd4
2 changed files with 37 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
Jenkinsfile vendored
View File

@@ -14,7 +14,7 @@ parallel 'centos7': {
checkout scm checkout scm
sh 'git submodule update --init' sh 'git submodule update --init'
stage('linux lwIP, ipv4') { stage('linux lwIP, ipv4') {
sh 'make -f make-liblwip.mk liblwip.a IPV4=1' sh 'make -j4 -f make-liblwip.mk liblwip.a IPV4=1'
} }
} }
catch (err) { catch (err) {
@@ -27,8 +27,7 @@ parallel 'centos7': {
checkout scm checkout scm
sh 'git submodule update --init' sh 'git submodule update --init'
stage('linux lwIP, ipv6') { stage('linux lwIP, ipv6') {
sh 'rm -rf .depend' sh 'make -j4 -f make-liblwip.mk liblwip.a IPV6=1'
sh 'make -f make-liblwip.mk liblwip.a IPV6=1'
} }
} }
catch (err) { catch (err) {
@@ -45,7 +44,7 @@ parallel 'centos7': {
checkout scm checkout scm
sh 'git submodule update --init' sh 'git submodule update --init'
stage('linux picoTCP, ipv4') { stage('linux picoTCP, ipv4') {
sh 'cd ext/picotcp; make lib ARCH=shared IPV4=1' sh 'cd ext/picotcp; make -j4 lib ARCH=shared IPV4=1'
} }
} }
catch (err) { catch (err) {
@@ -58,7 +57,7 @@ parallel 'centos7': {
checkout scm checkout scm
sh 'git submodule update --init' sh 'git submodule update --init'
stage('linux picoTCP, ipv6') { stage('linux picoTCP, ipv6') {
sh 'cd ext/picotcp; make lib ARCH=shared IPV6=1' sh 'cd ext/picotcp; make -j4 lib ARCH=shared IPV6=1'
} }
} }
catch (err) { catch (err) {
@@ -71,7 +70,7 @@ parallel 'centos7': {
checkout scm checkout scm
sh 'git submodule update --init' sh 'git submodule update --init'
stage('linux picoTCP, ipv4, ipv6') { stage('linux picoTCP, ipv4, ipv6') {
sh 'cd ext/picotcp; make lib ARCH=shared IPV4=1 IPV6=1' sh 'cd ext/picotcp; make -j4 lib ARCH=shared IPV4=1 IPV6=1'
} }
} }
catch (err) { catch (err) {
@@ -90,7 +89,7 @@ parallel 'centos7': {
checkout scm checkout scm
sh 'git submodule update --init' sh 'git submodule update --init'
stage('linux static lib, no stack') { stage('linux static lib, no stack') {
sh 'make clean; make static_lib NO_STACK=1; make tests' sh 'make clean; make -j4 static_lib NO_STACK=1; make tests'
} }
} }
catch (err) { catch (err) {
@@ -104,7 +103,7 @@ parallel 'centos7': {
checkout scm checkout scm
sh 'git submodule update --init' sh 'git submodule update --init'
stage('linux static lib, no stack, ipv4') { stage('linux static lib, no stack, ipv4') {
sh 'make clean; make static_lib NO_STACK=1 LIBZT_IPV4=1; make tests' sh 'make clean; make -j4 static_lib NO_STACK=1 LIBZT_IPV4=1; make tests'
} }
} }
catch (err) { catch (err) {
@@ -118,7 +117,7 @@ parallel 'centos7': {
checkout scm checkout scm
sh 'git submodule update --init' sh 'git submodule update --init'
stage('linux static lib, no stack, ipv6') { stage('linux static lib, no stack, ipv6') {
sh 'make clean; make static_lib NO_STACK=1 LIBZT_IPV6=1; make tests' sh 'make clean; make -j4 static_lib NO_STACK=1 LIBZT_IPV6=1; make tests'
} }
} }
catch (err) { catch (err) {
@@ -132,7 +131,7 @@ parallel 'centos7': {
checkout scm checkout scm
sh 'git submodule update --init' sh 'git submodule update --init'
stage('linux static lib, no stack, ipv4, ipv6') { stage('linux static lib, no stack, ipv4, ipv6') {
sh 'make clean; make static_lib NO_STACK=1 LIBZT_IPV4=1 LIBZT_IPV6=1; make tests' sh 'make clean; make -j4 static_lib NO_STACK=1 LIBZT_IPV4=1 LIBZT_IPV6=1; make tests'
} }
} }
catch (err) { catch (err) {
@@ -148,7 +147,7 @@ parallel 'centos7': {
checkout scm checkout scm
sh 'git submodule update --init' sh 'git submodule update --init'
stage('linux static lib, picoTCP') { stage('linux static lib, picoTCP') {
sh 'make clean; make static_lib STACK_PICO=1; make tests' sh 'make clean; make -j4 static_lib STACK_PICO=1; make tests'
} }
} }
catch (err) { catch (err) {
@@ -162,7 +161,7 @@ parallel 'centos7': {
checkout scm checkout scm
sh 'git submodule update --init' sh 'git submodule update --init'
stage('linux static lib, picoTCP, ipv4') { stage('linux static lib, picoTCP, ipv4') {
sh 'make clean; make static_lib STACK_PICO=1 LIBZT_IPV4=1; make tests' sh 'make clean; make -j4 static_lib STACK_PICO=1 LIBZT_IPV4=1; make tests'
} }
} }
catch (err) { catch (err) {
@@ -176,7 +175,7 @@ parallel 'centos7': {
checkout scm checkout scm
sh 'git submodule update --init' sh 'git submodule update --init'
stage('linux static lib, picoTCP, ipv6') { stage('linux static lib, picoTCP, ipv6') {
sh 'make clean; make static_lib STACK_PICO=1 LIBZT_IPV6=1; make tests' sh 'make clean; make -j4 static_lib STACK_PICO=1 LIBZT_IPV6=1; make tests'
} }
} }
catch (err) { catch (err) {
@@ -190,7 +189,7 @@ parallel 'centos7': {
checkout scm checkout scm
sh 'git submodule update --init' sh 'git submodule update --init'
stage('linux static lib, picoTCP, ipv4, ipv6') { stage('linux static lib, picoTCP, ipv4, ipv6') {
sh 'make clean; make static_lib STACK_PICO=1 LIBZT_IPV4=1 LIBZT_IPV6=1; make tests' sh 'make clean; make -j4 static_lib STACK_PICO=1 LIBZT_IPV4=1 LIBZT_IPV6=1; make tests'
} }
} }
catch (err) { catch (err) {
@@ -207,7 +206,7 @@ parallel 'centos7': {
checkout scm checkout scm
sh 'git submodule update --init' sh 'git submodule update --init'
stage('linux static lib lwIP') { stage('linux static lib lwIP') {
sh 'make clean; make static_lib STACK_LWIP=1; make tests' sh 'make clean; make -j4 static_lib STACK_LWIP=1; make tests'
} }
} }
catch (err) { catch (err) {
@@ -222,7 +221,7 @@ parallel 'centos7': {
checkout scm checkout scm
sh 'git submodule update --init' sh 'git submodule update --init'
stage('linux static lib lwIP, ipv4') { stage('linux static lib lwIP, ipv4') {
sh 'make clean; make static_lib STACK_LWIP=1 LIBZT_IPV4=1; make tests' sh 'make clean; make -j4 static_lib STACK_LWIP=1 LIBZT_IPV4=1; make tests'
} }
} }
catch (err) { catch (err) {
@@ -237,7 +236,7 @@ parallel 'centos7': {
checkout scm checkout scm
sh 'git submodule update --init' sh 'git submodule update --init'
stage('linux static lib lwIP, ipv6') { stage('linux static lib lwIP, ipv6') {
sh 'make clean; make static_lib STACK_LWIP=1 LIBZT_IPV6=1; make tests' sh 'make clean; make -j4 static_lib STACK_LWIP=1 LIBZT_IPV6=1; make tests'
} }
} }
catch (err) { catch (err) {
@@ -252,7 +251,7 @@ parallel 'centos7': {
checkout scm checkout scm
sh 'git submodule update --init' sh 'git submodule update --init'
stage('linux static lib lwIP, ipv4, ipv6') { stage('linux static lib lwIP, ipv4, ipv6') {
sh 'make clean; make clean; make static_lib STACK_LWIP=1 LIBZT_IPV4=1 LIBZT_IPV6=1; make tests' sh 'make clean; make clean; make -j4 static_lib STACK_LWIP=1 LIBZT_IPV4=1 LIBZT_IPV6=1; make tests'
} }
} }
catch (err) { catch (err) {
@@ -274,7 +273,7 @@ parallel 'centos7': {
checkout scm checkout scm
sh 'git submodule update --init' sh 'git submodule update --init'
stage('macOS lwIP, ipv4') { stage('macOS lwIP, ipv4') {
sh 'make -f make-liblwip.mk liblwip.a IPV4=1' sh 'make -j4 -f make-liblwip.mk liblwip.a IPV4=1'
} }
} }
catch (err) { catch (err) {
@@ -287,8 +286,7 @@ parallel 'centos7': {
checkout scm checkout scm
sh 'git submodule update --init' sh 'git submodule update --init'
stage('macOS lwIP, ipv6') { stage('macOS lwIP, ipv6') {
sh 'rm -rf .depend' sh 'make -j4 -f make-liblwip.mk liblwip.a IPV6=1'
sh 'make -f make-liblwip.mk liblwip.a IPV6=1'
} }
} }
catch (err) { catch (err) {
@@ -306,7 +304,7 @@ parallel 'centos7': {
checkout scm checkout scm
sh 'git submodule update --init' sh 'git submodule update --init'
stage('macOS picoTCP, ipv4') { stage('macOS picoTCP, ipv4') {
sh 'cd ext/picotcp; make lib ARCH=shared IPV4=1' sh 'cd ext/picotcp; make -j4 lib ARCH=shared IPV4=1'
} }
} }
catch (err) { catch (err) {
@@ -319,7 +317,7 @@ parallel 'centos7': {
checkout scm checkout scm
sh 'git submodule update --init' sh 'git submodule update --init'
stage('macOS picoTCP, ipv6') { stage('macOS picoTCP, ipv6') {
sh 'cd ext/picotcp; make lib ARCH=shared IPV6=1' sh 'cd ext/picotcp; make -j4 lib ARCH=shared IPV6=1'
} }
} }
catch (err) { catch (err) {
@@ -332,7 +330,7 @@ parallel 'centos7': {
checkout scm checkout scm
sh 'git submodule update --init' sh 'git submodule update --init'
stage('macOS picoTCP, ipv4, ipv6') { stage('macOS picoTCP, ipv4, ipv6') {
sh 'cd ext/picotcp; make lib ARCH=shared IPV4=1 IPV6=1' sh 'cd ext/picotcp; make -j4 lib ARCH=shared IPV4=1 IPV6=1'
} }
} }
catch (err) { catch (err) {
@@ -363,7 +361,7 @@ parallel 'centos7': {
checkout scm checkout scm
sh 'git submodule update --init' sh 'git submodule update --init'
stage('macOS static lib, no stack') { stage('macOS static lib, no stack') {
sh 'make clean; make static_lib NO_STACK=1; make tests' sh 'make clean; make -j4 static_lib NO_STACK=1; make tests'
} }
} }
catch (err) { catch (err) {
@@ -377,7 +375,7 @@ parallel 'centos7': {
checkout scm checkout scm
sh 'git submodule update --init' sh 'git submodule update --init'
stage('macOS static lib, no stack, ipv4') { stage('macOS static lib, no stack, ipv4') {
sh 'make clean; make static_lib NO_STACK=1 LIBZT_IPV4=1; make tests' sh 'make clean; make -j4 static_lib NO_STACK=1 LIBZT_IPV4=1; make tests'
} }
} }
catch (err) { catch (err) {
@@ -391,7 +389,7 @@ parallel 'centos7': {
checkout scm checkout scm
sh 'git submodule update --init' sh 'git submodule update --init'
stage('macOS static lib, no stack, ipv6') { stage('macOS static lib, no stack, ipv6') {
sh 'make clean; make static_lib NO_STACK=1 LIBZT_IPV6=1'; make tests sh 'make clean; make -j4 static_lib NO_STACK=1 LIBZT_IPV6=1'; make tests
} }
} }
catch (err) { catch (err) {
@@ -405,7 +403,7 @@ parallel 'centos7': {
checkout scm checkout scm
sh 'git submodule update --init' sh 'git submodule update --init'
stage('macOS static lib, no stack, ipv4, ipv6') { stage('macOS static lib, no stack, ipv4, ipv6') {
sh 'make clean; make static_lib NO_STACK=1 LIBZT_IPV4=1 LIBZT_IPV6=1; make tests' sh 'make clean; make -j4 static_lib NO_STACK=1 LIBZT_IPV4=1 LIBZT_IPV6=1; make tests'
} }
} }
catch (err) { catch (err) {
@@ -420,7 +418,7 @@ parallel 'centos7': {
checkout scm checkout scm
sh 'git submodule update --init' sh 'git submodule update --init'
stage('macOS static lib, picoTCP') { stage('macOS static lib, picoTCP') {
sh 'make clean; make static_lib STACK_PICO=1; make tests' sh 'make clean; make -j4 static_lib STACK_PICO=1; make tests'
} }
} }
catch (err) { catch (err) {
@@ -434,7 +432,7 @@ parallel 'centos7': {
checkout scm checkout scm
sh 'git submodule update --init' sh 'git submodule update --init'
stage('macOS static lib, picoTCP, ipv4') { stage('macOS static lib, picoTCP, ipv4') {
sh 'make clean; make static_lib STACK_PICO=1 LIBZT_IPV4=1; make tests' sh 'make clean; make -j4 static_lib STACK_PICO=1 LIBZT_IPV4=1; make tests'
} }
} }
catch (err) { catch (err) {
@@ -448,7 +446,7 @@ parallel 'centos7': {
checkout scm checkout scm
sh 'git submodule update --init' sh 'git submodule update --init'
stage('macOS static lib, picoTCP, ipv6') { stage('macOS static lib, picoTCP, ipv6') {
sh 'make clean; make static_lib STACK_PICO=1 LIBZT_IPV6=1; make tests' sh 'make clean; make -j4 static_lib STACK_PICO=1 LIBZT_IPV6=1; make tests'
} }
} }
catch (err) { catch (err) {
@@ -462,7 +460,7 @@ parallel 'centos7': {
checkout scm checkout scm
sh 'git submodule update --init' sh 'git submodule update --init'
stage('macOS static lib, picoTCP, ipv4, ipv6') { stage('macOS static lib, picoTCP, ipv4, ipv6') {
sh 'make clean; make static_lib STACK_PICO=1 LIBZT_IPV4=1 LIBZT_IPV6=1'; make tests sh 'make clean; make -j4 static_lib STACK_PICO=1 LIBZT_IPV4=1 LIBZT_IPV6=1'; make tests
} }
} }
catch (err) { catch (err) {
@@ -479,7 +477,7 @@ parallel 'centos7': {
checkout scm checkout scm
sh 'git submodule update --init' sh 'git submodule update --init'
stage('macOS static lib, lwIP') { stage('macOS static lib, lwIP') {
sh 'make clean; make static_lib STACK_LWIP=1; make tests' sh 'make clean; make -j4 static_lib STACK_LWIP=1; make tests'
} }
} }
catch (err) { catch (err) {
@@ -493,7 +491,7 @@ parallel 'centos7': {
checkout scm checkout scm
sh 'git submodule update --init' sh 'git submodule update --init'
stage('macOS static lib, lwIP, ipv4') { stage('macOS static lib, lwIP, ipv4') {
sh 'make clean; make static_lib STACK_LWIP=1 LIBZT_IPV4=1; make tests' sh 'make clean; make -j4 static_lib STACK_LWIP=1 LIBZT_IPV4=1; make tests'
} }
} }
catch (err) { catch (err) {
@@ -507,7 +505,7 @@ parallel 'centos7': {
checkout scm checkout scm
sh 'git submodule update --init' sh 'git submodule update --init'
stage('macOS static lib, lwIP, ipv6') { stage('macOS static lib, lwIP, ipv6') {
sh 'make clean; make static_lib STACK_LWIP=1 LIBZT_IPV6=1; make tests' sh 'make clean; make -j4 static_lib STACK_LWIP=1 LIBZT_IPV6=1; make tests'
} }
} }
catch (err) { catch (err) {
@@ -521,7 +519,7 @@ parallel 'centos7': {
checkout scm checkout scm
sh 'git submodule update --init' sh 'git submodule update --init'
stage('macOS static lib, lwIP, ipv4, ipv6') { stage('macOS static lib, lwIP, ipv4, ipv6') {
sh 'make clean; make static_lib STACK_LWIP=1 LIBZT_IPV4=1 LIBZT_IPV6=1; make tests' sh 'make clean; make -j4 static_lib STACK_LWIP=1 LIBZT_IPV4=1 LIBZT_IPV6=1; make tests'
} }
} }
catch (err) { catch (err) {

5
make-liblwip.mk
View File

@@ -103,7 +103,7 @@ LWIPFILES=$(COREFILES) $(APIFILES) $(NETIFFILES) $(ARCHFILES)
ifeq ($(LIBZT_IPV4),1) ifeq ($(LIBZT_IPV4),1)
LWIPFILES+=$(CORE4FILES) LWIPFILES+=$(CORE4FILES)
CFLAGS+=-DLIBZT_IPV4=1 -DLWIP_IPV4 -DDLWIP_IPV6=0 -DIPv4 CFLAGS+=-DLIBZT_IPV4=1 -DLWIP_IPV4 -DLWIP_IPV6=0 -DIPv4
endif endif
ifeq ($(LIBZT_IPV6),1) ifeq ($(LIBZT_IPV6),1)
LWIPFILES+=$(CORE6FILES) LWIPFILES+=$(CORE6FILES)
@@ -120,12 +120,13 @@ all:
.PHONY: all .PHONY: all
clean: clean:
rm -rf .depend
rm -f *.o *.s .depend* *.core core rm -f *.o *.s .depend* *.core core
depend dep: .depend depend dep: .depend
include .depend include .depend
liblwip.a: $(LWIPOBJS) liblwip.a: clean $(LWIPOBJS)
#libtool -static -o $@ $^ #libtool -static -o $@ $^
.depend: $(LWIPFILES) .depend: $(LWIPFILES)