File tree Expand file tree Collapse file tree 9 files changed +0
-306
lines changed Expand file tree Collapse file tree 9 files changed +0
-306
lines changed Original file line number Diff line number Diff line change @@ -1144,18 +1144,6 @@ include_directories(SYSTEM ${MUSTACHE_INCLUDE_DIR})
1144
1144
ADD_THIRDPARTY_LIB (mustache
1145
1145
STATIC_LIB "${MUSTACHE_STATIC_LIB} " )
1146
1146
1147
- ## Oatpp
1148
- find_package (Oatpp REQUIRED )
1149
- include_directories (SYSTEM ${OATPP_INCLUDE_DIR} )
1150
- ADD_THIRDPARTY_LIB (oatpp
1151
- STATIC_LIB "${OATPP_STATIC_LIB} " )
1152
-
1153
- ## Oatpp-swagger
1154
- find_package (OatppSwagger REQUIRED )
1155
- include_directories (SYSTEM ${OATPP_SWAGGER_INCLUDE_DIR} )
1156
- ADD_THIRDPARTY_LIB (oatpp-swagger
1157
- STATIC_LIB "${OATPP_SWAGGER_STATIC_LIB} " )
1158
-
1159
1147
## jwt-cpp
1160
1148
find_package (JwtCpp REQUIRED )
1161
1149
include_directories (${JWT_CPP_INCLUDE_DIR} )
Load Diff This file was deleted.
Load Diff This file was deleted.
Original file line number Diff line number Diff line change @@ -1178,37 +1178,6 @@ build_postgres() {
1178
1178
popd
1179
1179
}
1180
1180
1181
- build_oatpp (){
1182
- OATPP_BUILD_DIR=$TP_BUILD_DIR /$OATPP_NAME$MODE_SUFFIX
1183
- mkdir -p $OATPP_BUILD_DIR
1184
- pushd $OATPP_BUILD_DIR
1185
- cmake \
1186
- -DCMAKE_BUILD_TYPE=release \
1187
- -DCMAKE_INSTALL_PREFIX=$PREFIX \
1188
- -DCMAKE_POSITION_INDEPENDENT_CODE=ON \
1189
- -DBUILD_SHARED_LIBS=OFF \
1190
- -DOATPP_DISABLE_ENV_OBJECT_COUNTERS=ON \
1191
- -DOATPP_BUILD_TESTS=OFF \
1192
- $OATPP_SOURCE
1193
- make -j$PARALLEL install
1194
- popd
1195
- }
1196
-
1197
- build_oatpp_swagger (){
1198
- OATPP_SWAGGER_BUILD_DIR=$TP_BUILD_DIR /$OATPP_SWAGGER_NAME$MODE_SUFFIX
1199
- mkdir -p $OATPP_SWAGGER_BUILD_DIR
1200
- pushd $OATPP_SWAGGER_BUILD_DIR
1201
- cmake \
1202
- -DCMAKE_BUILD_TYPE=release \
1203
- -DCMAKE_INSTALL_PREFIX=$PREFIX \
1204
- -DCMAKE_POSITION_INDEPENDENT_CODE=ON \
1205
- -DBUILD_SHARED_LIBS=OFF \
1206
- -DOATPP_BUILD_TESTS=OFF \
1207
- -DOATPP_INSTALL=ON \
1208
- $OATPP_SWAGGER_SOURCE
1209
- make -j$PARALLEL install
1210
- popd
1211
- }
1212
1181
1213
1182
build_jwt_cpp () {
1214
1183
JWT_CPP_BUILD_DIR=$TP_BUILD_DIR /$JWT_CPP_NAME$MODE_SUFFIX
Original file line number Diff line number Diff line change 108
108
" postgres" ) F_POSTGRES=1 ;;
109
109
" psql-jdbc" ) F_POSTGRES_JDBC=1 ;;
110
110
" ranger" ) F_RANGER=1 ;;
111
- " oatpp" ) F_OATPP=1 ;;
112
- " oatpp-swagger" ) F_OATPP_SWAGGER=1 ;;
113
111
" jwt-cpp" ) F_JWT_CPP=1 ;;
114
112
" ranger-kms" ) F_RANGER_KMS=1 ;;
115
113
" rocksdb" ) F_ROCKSDB=1 ;;
@@ -441,14 +439,6 @@ if [ -n "$F_UNINSTRUMENTED" -o -n "$F_GUMBO_QUERY" ]; then
441
439
build_gumbo_query
442
440
fi
443
441
444
- if [ -n " $F_UNINSTRUMENTED " -o -n " $F_OATPP " ]; then
445
- build_oatpp
446
- fi
447
-
448
- if [ -n " $F_UNINSTRUMENTED " -o -n " $F_OATPP_SWAGGER " ]; then
449
- build_oatpp_swagger
450
- fi
451
-
452
442
if [ -n " $F_UNINSTRUMENTED " -o -n " $F_JWT_CPP " ]; then
453
443
build_jwt_cpp
454
444
fi
@@ -639,14 +629,6 @@ if [ -n "$F_TSAN" -o -n "$F_GUMBO_QUERY" ]; then
639
629
build_gumbo_query
640
630
fi
641
631
642
- if [ -n " $F_TSAN " -o -n " $F_OATPP " ]; then
643
- build_oatpp
644
- fi
645
-
646
- if [ -n " $F_TSAN " -o -n " $F_OATPP_SWAGGER " ]; then
647
- build_oatpp_swagger
648
- fi
649
-
650
632
if [ -n " $F_TSAN " -o -n " $F_JWT_CPP " ]; then
651
633
build_jwt_cpp
652
634
fi
Original file line number Diff line number Diff line change @@ -466,20 +466,6 @@ fetch_and_patch \
466
466
$RANGER_PATCHLEVEL \
467
467
" patch -p0 < $TP_DIR /patches/ranger-fixscripts.patch"
468
468
469
- OATPP_PATCHLEVEL=1
470
- fetch_and_patch \
471
- $OATPP_NAME .tar.gz \
472
- $OATPP_SOURCE \
473
- $OATPP_PATCHLEVEL \
474
- " patch -p1 < $TP_DIR /patches/oatpp-remove-version-from-path.patch"
475
-
476
- OATPP_SWAGGER_PATCHLEVEL=1
477
- fetch_and_patch \
478
- $OATPP_SWAGGER_NAME .tar.gz \
479
- $OATPP_SWAGGER_SOURCE \
480
- $OATPP_SWAGGER_PATCHLEVEL \
481
- " patch -p1 < $TP_DIR /patches/oatpp-swagger-remove-version-from-path.patch"
482
-
483
469
JWT_CPP_PATCHLEVEL=0
484
470
fetch_and_patch \
485
471
$JWT_CPP_NAME .tar.gz \
Load Diff This file was deleted.
Load Diff This file was deleted.
Original file line number Diff line number Diff line change @@ -263,14 +263,6 @@ RANGER_KMS_VERSION=2.1.0 # this probably should match the ranger version
263
263
RANGER_KMS_NAME=ranger-$RANGER_KMS_VERSION -kms
264
264
RANGER_KMS_SOURCE=$TP_SOURCE_DIR /$RANGER_KMS_NAME
265
265
266
- OATPP_VERSION=1.2.5
267
- OATPP_NAME=oatpp-$OATPP_VERSION
268
- OATPP_SOURCE=$TP_SOURCE_DIR /$OATPP_NAME
269
-
270
- OATPP_SWAGGER_VERSION=1.2.5
271
- OATPP_SWAGGER_NAME=oatpp-swagger-$OATPP_SWAGGER_VERSION
272
- OATPP_SWAGGER_SOURCE=$TP_SOURCE_DIR /$OATPP_SWAGGER_NAME
273
-
274
266
JWT_CPP_VERSION=3bd600762a70faccc7ec1c2dacb999cba6c6ef5e
275
267
JWT_CPP=jwt-cpp
276
268
JWT_CPP_NAME=$JWT_CPP -$JWT_CPP_VERSION
You can’t perform that action at this time.
0 commit comments