Browse Source

Update oatpp framework. Rename oatpp dockerfiles. (#5150)

Leonid Stryzhevskyi 5 years ago
parent
commit
986fd06725

+ 13 - 13
frameworks/C++/oatpp/benchmark_config.json

@@ -3,7 +3,6 @@
   "tests": [{
   "tests": [{
     "default": {
     "default": {
       "json_url": "/json",
       "json_url": "/json",
-      "plaintext_url": "/plaintext",
       "port": 8000,
       "port": 8000,
       "approach": "Realistic",
       "approach": "Realistic",
       "classification": "Micro",
       "classification": "Micro",
@@ -16,13 +15,12 @@
       "webserver": "None",
       "webserver": "None",
       "os": "Linux",
       "os": "Linux",
       "database_os": "Linux",
       "database_os": "Linux",
-      "display_name": "oatpp-async",
-      "notes": "Test of Oat++ Async API.",
+      "display_name": "oatpp",
+      "notes": "Test of Oat++ Simple API.",
       "versus": "None"
       "versus": "None"
     },
     },
-    "async-no-mp": {
+    "no-mp": {
       "json_url": "/json",
       "json_url": "/json",
-      "plaintext_url": "/plaintext",
       "port": 8000,
       "port": 8000,
       "approach": "Realistic",
       "approach": "Realistic",
       "classification": "Micro",
       "classification": "Micro",
@@ -35,12 +33,13 @@
       "webserver": "None",
       "webserver": "None",
       "os": "Linux",
       "os": "Linux",
       "database_os": "Linux",
       "database_os": "Linux",
-      "display_name": "oatpp-async-no-mp",
-      "notes": "Test of Oat++ Async API. No memory pool.",
+      "display_name": "oatpp-no-mp",
+      "notes": "Test of Oat++ Simple API. No memory pool.",
       "versus": "None"
       "versus": "None"
     },
     },
-    "thread": {
+    "async": {
       "json_url": "/json",
       "json_url": "/json",
+      "plaintext_url": "/plaintext",
       "port": 8000,
       "port": 8000,
       "approach": "Realistic",
       "approach": "Realistic",
       "classification": "Micro",
       "classification": "Micro",
@@ -53,12 +52,13 @@
       "webserver": "None",
       "webserver": "None",
       "os": "Linux",
       "os": "Linux",
       "database_os": "Linux",
       "database_os": "Linux",
-      "display_name": "oatpp-thread",
-      "notes": "Test of Oat++ Simple API.",
+      "display_name": "oatpp-async",
+      "notes": "Test of Oat++ Async API.",
       "versus": "None"
       "versus": "None"
     },
     },
-    "thread-no-mp": {
+    "async-no-mp": {
       "json_url": "/json",
       "json_url": "/json",
+      "plaintext_url": "/plaintext",
       "port": 8000,
       "port": 8000,
       "approach": "Realistic",
       "approach": "Realistic",
       "classification": "Micro",
       "classification": "Micro",
@@ -71,8 +71,8 @@
       "webserver": "None",
       "webserver": "None",
       "os": "Linux",
       "os": "Linux",
       "database_os": "Linux",
       "database_os": "Linux",
-      "display_name": "oatpp-thread-no-mp",
-      "notes": "Test of Oat++ Simple API. No memory pool.",
+      "display_name": "oatpp-async-no-mp",
+      "notes": "Test of Oat++ Async API. No memory pool.",
       "versus": "None"
       "versus": "None"
     }
     }
   }]
   }]

+ 1 - 1
frameworks/C++/oatpp/oatpp-async-no-mp.dockerfile

@@ -9,7 +9,7 @@ RUN git clone https://github.com/oatpp/oatpp
 
 
 WORKDIR /test/oatpp
 WORKDIR /test/oatpp
 
 
-RUN git checkout f24a2247098d02975869e8d90a059770ddca8df5
+RUN git checkout 3670e081af33ae02f8a5b11dafc6a2622f92927a
 
 
 WORKDIR /test/oatpp/build
 WORKDIR /test/oatpp/build
 
 

+ 4 - 4
frameworks/C++/oatpp/oatpp-thread.dockerfile → frameworks/C++/oatpp/oatpp-async.dockerfile

@@ -9,7 +9,7 @@ RUN git clone https://github.com/oatpp/oatpp
 
 
 WORKDIR /test/oatpp
 WORKDIR /test/oatpp
 
 
-RUN git checkout f24a2247098d02975869e8d90a059770ddca8df5
+RUN git checkout 3670e081af33ae02f8a5b11dafc6a2622f92927a
 
 
 WORKDIR /test/oatpp/build
 WORKDIR /test/oatpp/build
 
 
@@ -19,13 +19,13 @@ RUN make install
 #---------------------------------------------------------------
 #---------------------------------------------------------------
 # build test app
 # build test app
 
 
-ADD src-thread /test/src-thread
+ADD src-async /test/src-async
 
 
-WORKDIR /test/src-thread/build
+WORKDIR /test/src-async/build
 
 
 RUN cmake -DCMAKE_BUILD_TYPE=Release ..
 RUN cmake -DCMAKE_BUILD_TYPE=Release ..
 RUN make
 RUN make
 
 
 EXPOSE 8000 8000
 EXPOSE 8000 8000
 
 
-CMD ./oatpp-thread-test
+CMD ./oatpp-async-test

+ 1 - 1
frameworks/C++/oatpp/oatpp-thread-no-mp.dockerfile → frameworks/C++/oatpp/oatpp-no-mp.dockerfile

@@ -9,7 +9,7 @@ RUN git clone https://github.com/oatpp/oatpp
 
 
 WORKDIR /test/oatpp
 WORKDIR /test/oatpp
 
 
-RUN git checkout f24a2247098d02975869e8d90a059770ddca8df5
+RUN git checkout 3670e081af33ae02f8a5b11dafc6a2622f92927a
 
 
 WORKDIR /test/oatpp/build
 WORKDIR /test/oatpp/build
 
 

+ 4 - 4
frameworks/C++/oatpp/oatpp.dockerfile

@@ -9,7 +9,7 @@ RUN git clone https://github.com/oatpp/oatpp
 
 
 WORKDIR /test/oatpp
 WORKDIR /test/oatpp
 
 
-RUN git checkout f24a2247098d02975869e8d90a059770ddca8df5
+RUN git checkout 3670e081af33ae02f8a5b11dafc6a2622f92927a
 
 
 WORKDIR /test/oatpp/build
 WORKDIR /test/oatpp/build
 
 
@@ -19,13 +19,13 @@ RUN make install
 #---------------------------------------------------------------
 #---------------------------------------------------------------
 # build test app
 # build test app
 
 
-ADD src-async /test/src-async
+ADD src-thread /test/src-thread
 
 
-WORKDIR /test/src-async/build
+WORKDIR /test/src-thread/build
 
 
 RUN cmake -DCMAKE_BUILD_TYPE=Release ..
 RUN cmake -DCMAKE_BUILD_TYPE=Release ..
 RUN make
 RUN make
 
 
 EXPOSE 8000 8000
 EXPOSE 8000 8000
 
 
-CMD ./oatpp-async-test
+CMD ./oatpp-thread-test

+ 1 - 1
frameworks/C++/oatpp/src-async/CMakeLists.txt

@@ -19,7 +19,7 @@ add_executable(${project_name}
 
 
 ## link libs
 ## link libs
 
 
-find_package(oatpp 0.19.8 REQUIRED)
+find_package(oatpp 0.19.9 REQUIRED)
 
 
 target_link_libraries(${project_name}
 target_link_libraries(${project_name}
         PUBLIC oatpp::oatpp
         PUBLIC oatpp::oatpp

+ 1 - 1
frameworks/C++/oatpp/src-thread/CMakeLists.txt

@@ -19,7 +19,7 @@ add_executable(${project_name}
 
 
 ## link libs
 ## link libs
 
 
-find_package(oatpp 0.19.8 REQUIRED)
+find_package(oatpp 0.19.9 REQUIRED)
 
 
 target_link_libraries(${project_name}
 target_link_libraries(${project_name}
         PUBLIC oatpp::oatpp
         PUBLIC oatpp::oatpp