diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..6ad8a88 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,130 @@ +#image: "docker:stable" + +#services: +# - docker:dind + +#variables: +# GIT_STRATEGY: "clone" +# DOCKER_HOST: tcp://docker:2375 +# DOCKER_DRIVER: overlay2 +# IMAGE_TAG: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG + + +#stages: + # - build + # - package + # - release + # - docker + +#.build_before_script: +# before_script: + # - mkdir -p /tmp/padding_for_CPACK_RPM_BUILD_SOURCE_DIRS_PREFIX/$CI_PROJECT_NAMESPACE/ + # - cp ./inc/http.h /opt/MESA/include/MESA/ + # - ln -s $CI_PROJECT_DIR /tmp/padding_for_CPACK_RPM_BUILD_SOURCE_DIRS_PREFIX/$CI_PROJECT_PATH + # - cd /tmp/padding_for_CPACK_RPM_BUILD_SOURCE_DIRS_PREFIX/$CI_PROJECT_PATH + +#.build_tf_http_plug: + # extends: .build_before_script + # image: git.mesalab.cn:7443/mesa_platform/mesa_protocol:master + # script: + # - source /etc/profile.d/MESA.sh + # - mkdir -p build + # - cd build +# - cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DENABLE_NTC_SWITCH=$NTC_SWITCH + # - cmake .. + # - make + +#.package_tf_http_plug: + #extends: .build_before_script + #image: git.mesalab.cn:7443/mesa_platform/mesa_protocol:master + #script: + # - source /etc/profile.d/MESA.sh + # - mkdir -p build + # - cd build +# - cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DENABLE_NTC_SWITCH=$NTC_SWITCH + # - cmake .. + # - make package + +#build-tf-http-plug-debug: + #stage: build + #extends: .build_tf_http_plug + #tags: + # - share + # variables: + # BUILD_TYPE: "Debug" + #except: + # - tags + +#build-tf-http-plug-release: + #stage: package + #extends: .package_tf_http_plug + #tags: + # - share + #variables: + # BUILD_TYPE: "Release" + #artifacts: + # name: "$CI_JOB_NAME-$CI_COMMIT_REF_NAME" + # paths: + # - ./build/*.rpm + #only: + # - tags + + + +#http-plug-tf-release: + #stage: release + #image: git.mesalab.cn:7443/TF/TF_HTTP:collect + #tags: + # - share + #variables: + # ARTIFACTS_JOB: "tf-http-plug" + # PROJECT_NAME: "tf-http-plug" + # USER_DEFINE: "release" + #only: + # - tags + #script: + # - /bin/bash -x ./autorelease.sh $CI_API_V4_URL $CI_PROJECT_URL $CI_PROJECT_ID $CI_TOKEN $CI_COMMIT_TAG $ARTIFACTS_JOB $PROJECT_NAME $USER_DEFINE + + +#build-docker: + #stage: docker + #script: + # - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY + # - docker build -t $IMAGE_TAG . + # - docker push $IMAGE_TAG + # tags: + # - share + #only: + # - master + +stages: + - build + - test + - package + +variables: + BUILD_DIR: build + +before_script: + - mkdir -p $BUILD_DIR + - cd $BUILD_DIR + +build: + stage: build + script: + - cmake .. + - make + +#test: +# stage: test +# script: +# - cd ../test +# - cmake .. +# - make +# - ctest + +package: + stage: package + script: + - cd $BUILD_DIR + - cpack diff --git a/CMakeLists.txt b/CMakeLists.txt index 630a7d4..27fe87f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,7 +11,7 @@ set(CMAKE_INSTALL_PREFIX /home/mesasoft/sapp_run) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D__FILENAME__='\"$(subst ${CMAKE_CURRENT_SOURCE_DIR}/,,$(abspath $<))\"'") -set (NAT_FORMAT_SRC nat_format.cpp) +set (NAT_FORMAT_SRC "src/*.cpp") include_directories(/opt/MESA/include/) include_directories(inc)