Feature serial cherry pick from parallel

5 files changed, 74 insertions, 10 deletions

diff --git a/dealpkt/CMakeLists.txt b/dealpkt/CMakeLists.txt
index 51ef9f4..9398e50 100644
--- a/dealpkt/CMakeLists.txt
+++ b/dealpkt/CMakeLists.txt
@@ -10,8 +10,8 @@ include_directories(${CMAKE_SOURCE_DIR}/include/stream_inc)
 include_directories(${CMAKE_SOURCE_DIR}/include/support)
 include_directories(${CMAKE_SOURCE_DIR}/dealpkt)
 
-if(OPT_IOMODE_MARSIO)
-	include_directories(${MARSIO_SDK_PREFIX}/include)
+if(CAPTURE_MODE MATCHES "MARSIO")
+    include_directories(${MARSIO_SDK_PREFIX}/include)
 endif()
 
 add_definitions(-D_BSD_SOURCE -D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD -DHAVE_NET_ETHERNET_H)
diff --git a/gitlab-ci.yml b/gitlab-ci.yml
new file mode 100644
index 0000000..9e6d19a
--- /dev/null
+++ b/gitlab-ci.yml
@@ -0,0 +1,63 @@
+image: "docker:stable"
+stages:
+- build
+#- test
+#- package
+- release
+- docker
+
+variables:
+  ARTIFACTS_JOB: "build"
+  DOCKER_HOST: tcp://docker:2375
+  DOCKER_DRIVER: overlay2
+  IMAGE_TAG: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
+
+build:
+  image: "git.mesalab.cn:7443/mesa_framework/framework:master"
+  stage: build
+  script:
+    - source //etc/profile.d/MESA.sh
+    - mkdir -p build
+    - cd build
+    - cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_PREFIX_PATH=$BUILD_PREFIX
+    - make
+    - make package
+  tags:
+    - share
+  variables:
+    BUILD_TYPE: "Debug"
+    BUILD_PREFIX: "/opt/MESA/"
+  only:
+    - pushes
+    - tags
+    - master
+  artifacts:
+    name: "$CI_JOB_NAME-$CI_COMMIT_SHORT_SHA"
+    paths:
+      -  ./build/*.rpm
+
+release:
+  image: "git.mesalab.cn:7443/mesa_framework/framework:master"
+  stage: release
+  tags:
+    - share
+  only:
+    - tags
+    - master
+  script:
+     - /bin/bash -x ./autorelease.sh $CI_API_V4_URL $CI_PROJECT_URL $CI_PROJECT_ID $CI_TOKEN $CI_COMMIT_TAG $ARTIFACTS_JOB $CI_PROJECT_NAME $CI_COMMIT_SHORT_SHA
+     
+docker:
+  stage: docker
+  services:
+    - docker:dind
+  tags:
+    - share
+  only:
+    - master
+  script:
+     - ls -l build
+     - ls -l /tmp/
+     - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
+     - docker build -t $IMAGE_TAG .
+     - docker push $IMAGE_TAG
\ No newline at end of file
diff --git a/inner_plug/CMakeLists.txt b/inner_plug/CMakeLists.txt
index b6d7d0f..4ff01b2 100644
--- a/inner_plug/CMakeLists.txt
+++ b/inner_plug/CMakeLists.txt
@@ -10,7 +10,7 @@ include_directories(${CMAKE_SOURCE_DIR}/include/support)
 include_directories(${CMAKE_SOURCE_DIR}/include/stream_inc)
 include_directories(${CMAKE_SOURCE_DIR}/dealpkt)
 
-if(OPT_IOMODE_MARSIO)
+if(CAPTURE_MODE MATCHES "MARSIO")
     include_directories(${MARSIO_SDK_PREFIX}/include)
 endif()
 
diff --git a/packet_io/CMakeLists.txt b/packet_io/CMakeLists.txt
index 4024fcd..83b89d6 100644
--- a/packet_io/CMakeLists.txt
+++ b/packet_io/CMakeLists.txt
@@ -11,7 +11,7 @@ include_directories(${CMAKE_SOURCE_DIR}/include/support)
 include_directories(${CMAKE_SOURCE_DIR}/dealpkt)
 include_directories(${CMAKE_SOURCE_DIR}/packet_io)
 
-if(OPT_IOMODE_MARSIO)
+if(CAPTURE_MODE MATCHES "MARSIO")
     include_directories(${MARSIO_SDK_PREFIX}/include)
 endif()
 
diff --git a/test_so/CMakeLists.txt b/test_so/CMakeLists.txt
index f341394..6f61c9f 100644
--- a/test_so/CMakeLists.txt
+++ b/test_so/CMakeLists.txt
@@ -10,7 +10,7 @@ include_directories(${CMAKE_SOURCE_DIR}/include/support)
 include_directories(${CMAKE_SOURCE_DIR}/include/stream_inc)
 include_directories(${CMAKE_SOURCE_DIR}/dealpkt)
 
-if(OPT_IOMODE_MARSIO)
+if(CAPTURE_MODE MATCHES "MARSIO")
     include_directories(${MARSIO_SDK_PREFIX}/include)
 endif()
 
@@ -23,9 +23,10 @@ set_target_properties(test_app_sapp  PROPERTIES PREFIX "")
 add_library(trace_delay SHARED trace_delay.c)
 set_target_properties(trace_delay  PROPERTIES PREFIX "")
 
-add_library(wangyan_demo SHARED wangyan_demo.c)
-set_target_properties(wangyan_demo  PROPERTIES PREFIX "")
-
-add_library(test_wangyan SHARED test_wangyan.c)
-set_target_properties(test_wangyan  PROPERTIES PREFIX "")
+if(CAPTURE_MODE MATCHES "MARSIO")
+    add_library(wangyan_demo SHARED wangyan_demo.c)
+    set_target_properties(wangyan_demo  PROPERTIES PREFIX "")
 
+    add_library(test_wangyan SHARED test_wangyan.c)
+    set_target_properties(test_wangyan  PROPERTIES PREFIX "")
+endif()