Docker C++/ffead-cpp port (#3471)

* Docker c++ ffead

* [ci fw-only C++/ffead-cpp]

* already installing unixodbc from apt

* fix permission error

* more permission fixes and remove mysql

.travis.yml

@@ -18,7 +18,7 @@ env:
      - "TESTDIR=CSharp/revenj"
      - "TESTDIR=CSharp/servicestack"
      - "TESTDIR=C++/cppcms"
-    # - "TESTDIR=C++/ffead-cpp"
+     - "TESTDIR=C++/ffead-cpp"
      - "TESTDIR=C++/cpoll_cppsp"
      - "TESTDIR=C++/cutelyst"
      - "TESTDIR=C++/silicon"

frameworks/C++/ffead-cpp/benchmark_config.json

@@ -2,7 +2,6 @@
   "framework": "ffead-cpp",
   "tests": [{
     "default": {
-      "setup_file": "setup-mongo",
       "json_url": "/te-benchmark/json",
       "plaintext_url": "/te-benchmark/plaintext",
       "db_url": "/te-benchmark/db",
@@ -23,32 +22,8 @@
       "display_name": "ffead-cpp-mongo",
       "notes": "",
       "versus": ""
-    },
-	"mysql": {
-      "setup_file": "setup-mysql",
-      "json_url": "/te-benchmark/json",
-      "plaintext_url": "/te-benchmark/plaintext",
-      "db_url": "/te-benchmark/db",
-      "query_url": "/te-benchmark/queries?queries=",
-      "fortune_url": "/te-benchmark/fortunes",
-      "update_url": "/te-benchmark/updates?queries=",
-      "port": 8080,
-      "approach": "Realistic",
-      "classification": "Fullstack",
-      "database": "mysql",
-      "framework": "ffead-cpp",
-      "language": "C++",
-      "orm": "Full",
-      "platform": "ffead-cpp",
-      "webserver": "ffead-cpp",
-      "os": "Linux",
-      "database_os": "Linux",
-      "display_name": "ffead-cpp-mysql",
-      "notes": "",
-      "versus": ""
     },
 	"postgresql": {
-      "setup_file": "setup-postgresql",
       "json_url": "/te-benchmark/json",
       "plaintext_url": "/te-benchmark/plaintext",
       "db_url": "/te-benchmark/db",
@@ -92,29 +67,6 @@
       "display_name": "ffead-cpp-apache-mongo",
       "notes": "",
       "versus": ""
-    },
-	"apache-mysql": {
-      "setup_file": "setup-apache-mysql",
-      "json_url": "/te-benchmark/json",
-      "plaintext_url": "/te-benchmark/plaintext",
-      "db_url": "/te-benchmark/db",
-      "query_url": "/te-benchmark/queries?queries=",
-      "fortune_url": "/te-benchmark/fortunes",
-      "update_url": "/te-benchmark/updates?queries=",
-      "port": 8080,
-      "approach": "Realistic",
-      "classification": "Fullstack",
-      "database": "mysql",
-      "framework": "ffead-cpp",
-      "language": "C++",
-      "orm": "Full",
-      "platform": "ffead-cpp",
-      "webserver": "apache",
-      "os": "Linux",
-      "database_os": "Linux",
-      "display_name": "ffead-cpp-apache-mysql",
-      "notes": "",
-      "versus": ""
     },
 	"apache-postgresql": {
       "setup_file": "setup-apache-postgresql",
@@ -138,75 +90,6 @@
       "display_name": "ffead-cpp-apache-postgresql",
       "notes": "",
       "versus": ""
-    },
-    "nginx-mongo": {
-      "setup_file": "setup-nginx-mongo",
-      "json_url": "/te-benchmark/json",
-      "plaintext_url": "/te-benchmark/plaintext",
-      "db_url": "/te-benchmark/db",
-      "query_url": "/te-benchmark/queries?queries=",
-      "fortune_url": "/te-benchmark/fortunes",
-      "update_url": "/te-benchmark/updates?queries=",
-      "port": 8080,
-      "approach": "Realistic",
-      "classification": "Fullstack",
-      "database": "mongodb",
-      "framework": "ffead-cpp",
-      "language": "C++",
-      "orm": "Full",
-      "platform": "ffead-cpp",
-      "webserver": "nginx",
-      "os": "Linux",
-      "database_os": "Linux",
-      "display_name": "ffead-cpp-nginx-mongo",
-      "notes": "",
-      "versus": ""
-    },
-	"nginx-mysql": {
-      "setup_file": "setup-nginx-mysql",
-      "json_url": "/te-benchmark/json",
-      "plaintext_url": "/te-benchmark/plaintext",
-      "db_url": "/te-benchmark/db",
-      "query_url": "/te-benchmark/queries?queries=",
-      "fortune_url": "/te-benchmark/fortunes",
-      "update_url": "/te-benchmark/updates?queries=",
-      "port": 8080,
-      "approach": "Realistic",
-      "classification": "Fullstack",
-      "database": "mysql",
-      "framework": "ffead-cpp",
-      "language": "C++",
-      "orm": "Full",
-      "platform": "ffead-cpp",
-      "webserver": "nginx",
-      "os": "Linux",
-      "database_os": "Linux",
-      "display_name": "ffead-cpp-nginx-mysql",
-      "notes": "",
-      "versus": ""
-    },
-	"nginx-postgresql": {
-      "setup_file": "setup-nginx-postgresql",
-      "json_url": "/te-benchmark/json",
-      "plaintext_url": "/te-benchmark/plaintext",
-      "db_url": "/te-benchmark/db",
-      "query_url": "/te-benchmark/queries?queries=",
-      "fortune_url": "/te-benchmark/fortunes",
-      "update_url": "/te-benchmark/updates?queries=",
-      "port": 8080,
-      "approach": "Realistic",
-      "classification": "Fullstack",
-      "database": "postgres",
-      "framework": "ffead-cpp",
-      "language": "C++",
-      "orm": "Full",
-      "platform": "ffead-cpp",
-      "webserver": "nginx",
-      "os": "Linux",
-      "database_os": "Linux",
-      "display_name": "ffead-cpp-nginx-postgresql",
-      "notes": "",
-      "versus": ""
     }
   }]
 }

frameworks/C++/ffead-cpp/ffead-cpp-apache-mongo.dockerfile

@@ -0,0 +1,22 @@
+FROM tfb/ffead-cpp-httpd:latest
+
+WORKDIR ${IROOT}/ffead-cpp-src/
+
+RUN cp -f web/te-benchmark/sql-src/TeBkWorldmongo.h web/te-benchmark/include/TeBkWorld.h
+RUN cp -f web/te-benchmark/sql-src/TeBkWorldmongo.cpp web/te-benchmark/src/TeBkWorld.cpp
+RUN cp -f web/te-benchmark/config/sdormmongo.xml web/te-benchmark/config/sdorm.xml
+RUN rm -rf ffead-cpp-2.0-bin
+RUN make build-apps
+RUN rm -rf ${IROOT}/ffead-cpp-2.0
+RUN cp -rf ffead-cpp-2.0-bin ${IROOT}/ffead-cpp-2.0
+
+WORKDIR ${IROOT}/ffead-cpp-2.0
+
+RUN rm -rf web/default web/oauthApp web/flexApp web/markers
+RUN chmod 755 *.sh resources/*.sh rtdcf/autotools/*.sh
+
+RUN chmod 755 $FFEAD_CPP_PATH/*.sh
+RUN rm -f $FFEAD_CPP_PATH/*.cntrl
+RUN rm -f $FFEAD_CPP_PATH/tmp/*.sess
+
+CMD apachectl -D FOREGROUND

frameworks/C++/ffead-cpp/ffead-cpp-apache-mysql.dockerfile

@@ -0,0 +1,22 @@
+FROM tfb/ffead-cpp-httpd:latest
+
+WORKDIR ${IROOT}/ffead-cpp-src/
+
+RUN cp -f web/te-benchmark/sql-src/TeBkWorldsql.h web/te-benchmark/include/TeBkWorld.h
+RUN cp -f web/te-benchmark/sql-src/TeBkWorldsql.cpp web/te-benchmark/src/TeBkWorld.cpp
+RUN cp -f web/te-benchmark/config/sdormmysql.xml web/te-benchmark/config/sdorm.xml
+RUN rm -rf ffead-cpp-2.0-bin
+RUN make build-apps
+RUN rm -rf ${IROOT}/ffead-cpp-2.0
+RUN cp -rf ffead-cpp-2.0-bin ${IROOT}/ffead-cpp-2.0
+
+WORKDIR ${IROOT}/ffead-cpp-2.0
+
+RUN rm -rf web/default web/oauthApp web/flexApp web/markers
+RUN chmod 755 *.sh resources/*.sh rtdcf/autotools/*.sh
+
+RUN chmod 755 $FFEAD_CPP_PATH/*.sh
+RUN rm -f $FFEAD_CPP_PATH/*.cntrl
+RUN rm -f $FFEAD_CPP_PATH/tmp/*.sess
+
+CMD apachectl -D FOREGROUND

frameworks/C++/ffead-cpp/ffead-cpp-apache-postgresql.dockerfile

@@ -0,0 +1,22 @@
+FROM tfb/ffead-cpp-httpd:latest
+
+WORKDIR ${IROOT}/ffead-cpp-src/
+
+RUN cp -f web/te-benchmark/sql-src/TeBkWorldsql.h web/te-benchmark/include/TeBkWorld.h
+RUN cp -f web/te-benchmark/sql-src/TeBkWorldsql.cpp web/te-benchmark/src/TeBkWorld.cpp
+RUN cp -f web/te-benchmark/config/sdormpostgresql.xml web/te-benchmark/config/sdorm.xml
+RUN rm -rf ffead-cpp-2.0-bin
+RUN make build-apps
+RUN rm -rf ${IROOT}/ffead-cpp-2.0
+RUN cp -rf ffead-cpp-2.0-bin ${IROOT}/ffead-cpp-2.0
+
+WORKDIR ${IROOT}/ffead-cpp-2.0
+
+RUN rm -rf web/default web/oauthApp web/flexApp web/markers
+RUN chmod 755 *.sh resources/*.sh rtdcf/autotools/*.sh
+
+RUN chmod 755 $FFEAD_CPP_PATH/*.sh
+RUN rm -f $FFEAD_CPP_PATH/*.cntrl
+RUN rm -f $FFEAD_CPP_PATH/tmp/*.sess
+
+CMD apachectl -D FOREGROUND

frameworks/C++/ffead-cpp/ffead-cpp-base.dockerfile

@@ -0,0 +1,37 @@
+FROM tfb/base:latest
+
+ENV IROOT=/installs
+ENV FFEAD_CPP_PATH=${IROOT}/ffead-cpp-2.0
+ENV PATH=${FFEAD_CPP_PATH}:${PATH}
+
+RUN mkdir /installs
+
+RUN apt install -yqq autoconf uuid-dev odbc-postgresql unixodbc unixodbc-dev
+
+WORKDIR $IROOT
+
+# libmyodbc has been removed from apt
+
+RUN wget -q http://www.mirrorservice.org/sites/ftp.mysql.com/Downloads/Connector-ODBC/5.3/mysql-connector-odbc-5.3.10-linux-ubuntu16.04-x86-64bit.tar.gz
+RUN tar xf mysql-connector-odbc-5.3.10-linux-ubuntu16.04-x86-64bit.tar.gz
+RUN mkdir -p /usr/lib/x86_64-linux-gnu/odbc
+RUN mv mysql-connector-odbc-5.3.10-linux-ubuntu16.04-x86-64bit/lib/libmyodbc5* /usr/lib/x86_64-linux-gnu/odbc/
+RUN mysql-connector-odbc-5.3.10-linux-ubuntu16.04-x86-64bit/bin/myodbc-installer -d -a -n "MySQL" -t "DRIVER=/usr/lib/x86_64-linux-gnu/odbc/libmyodbc5w.so;"
+
+# mongocdriver also used in all tests
+
+RUN wget -q https://github.com/mongodb/mongo-c-driver/releases/download/1.4.0/mongo-c-driver-1.4.0.tar.gz
+RUN tar xf mongo-c-driver-1.4.0.tar.gz
+RUN cd mongo-c-driver-1.4.0/ && \
+    ./configure --prefix=${IROOT} --libdir=${IROOT} --disable-automatic-init-and-cleanup && \
+    make && make install
+
+WORKDIR /
+
+COPY te-benchmark/ te-benchmark/
+COPY ffead-cpp-framework.sh ./
+COPY server.sh ./
+
+RUN chmod 755 *.sh
+
+RUN ./ffead-cpp-framework.sh

frameworks/C++/ffead-cpp/ffead-cpp-emb-base.dockerfile

@@ -0,0 +1,20 @@
+FROM tfb/ffead-cpp-base:latest
+
+WORKDIR ${IROOT}/ffead-cpp-src/
+
+RUN cp -f web/te-benchmark/sql-src/TeBkWorldmongo.h web/te-benchmark/include/TeBkWorld.h
+RUN cp -f web/te-benchmark/sql-src/TeBkWorldmongo.cpp web/te-benchmark/src/TeBkWorld.cpp
+RUN cp -f web/te-benchmark/config/sdormmongo.xml web/te-benchmark/config/sdorm.xml
+RUN rm -rf ffead-cpp-2.0-bin
+RUN make build-apps
+RUN rm -rf ${IROOT}/ffead-cpp-2.0
+RUN cp -rf ffead-cpp-2.0-bin ${IROOT}/ffead-cpp-2.0
+
+WORKDIR ${IROOT}/ffead-cpp-2.0
+
+RUN rm -rf web/default web/oauthApp web/flexApp web/markers
+RUN chmod 755 *.sh resources/*.sh rtdcf/autotools/*.sh
+
+RUN chmod 755 $FFEAD_CPP_PATH/*.sh
+RUN rm -f $FFEAD_CPP_PATH/*.cntrl
+RUN rm -f $FFEAD_CPP_PATH/tmp/*.sess

toolset/setup/linux/frameworks/ffead-cpp-framework.sh → frameworks/C++/ffead-cpp/ffead-cpp-framework.sh

@@ -1,7 +1,5 @@
 #!/bin/bash
 
-fw_installed ffead-cpp-framework && return 0
-
 #From https://github.com/TechEmpower/FrameworkBenchmarks/blob/master/frameworks/C%2B%2B/ulib/setup_json.sh
 if [ "$TRAVIS" != "true" ]; then
 MAX_THREADS=$(( 3 * $CPU_COUNT / 2 ))
@@ -12,10 +10,10 @@ fi
 WRIT_THREADS=$(( $MAX_THREADS / 3 ))
 SERV_THREADS=$(( $MAX_THREADS - $WRIT_THREADS ))
 
-fw_get -o ffead-cpp-src.zip https://github.com/sumeetchhetri/ffead-cpp/archive/master.zip
-rm -rf ffead-cpp-src
-rm -rf ffead-cpp-master
-unzip ffead-cpp-src.zip
+cd $IROOT
+
+wget -q https://github.com/sumeetchhetri/ffead-cpp/archive/master.zip
+unzip master.zip
 mv ffead-cpp-master ffead-cpp-src
 cd ffead-cpp-src/
 
@@ -59,7 +57,3 @@ sed -i 's|localhost|'${DBHOST}'|g' resources/sample-odbc.ini
 
 cp resources/sample-odbcinst.ini ${IROOT}/odbcinst.ini
 cp resources/sample-odbc.ini ${IROOT}/odbc.ini
-
-cd ${IROOT}
-
-echo -e "export FFEAD_CPP_PATH=${IROOT}/ffead-cpp-2.0" > $IROOT/ffead-cpp-framework.installed

frameworks/C++/ffead-cpp/ffead-cpp-httpd.dockerfile

@@ -0,0 +1,9 @@
+FROM tfb/ffead-cpp-base:latest
+
+COPY ffead-cpp-httpd.sh ./
+
+RUN chmod 755 *.sh
+
+RUN ./ffead-cpp-httpd.sh
+
+ENV PATH=${IROOT}/httpd/bin:${PATH}

toolset/setup/linux/frameworks/ffead-cpp-httpd.sh → frameworks/C++/ffead-cpp/ffead-cpp-httpd.sh

@@ -1,20 +1,16 @@
 #!/bin/bash
 
-fw_installed ffead-cpp-httpd && return 0
+cd $IROOT
 
-fw_depends ffead-cpp-framework
-
-sudo apt-get remove -y apache2
-
-fw_get -o httpd-2.4.25.tar.gz https://archive.apache.org/dist/httpd/httpd-2.4.25.tar.gz
-fw_get -o apr-1.5.2.tar.gz https://archive.apache.org/dist/apr/apr-1.5.2.tar.gz
-fw_get -o apr-util-1.5.4.tar.gz https://archive.apache.org/dist/apr/apr-util-1.5.4.tar.gz
+wget -q https://archive.apache.org/dist/httpd/httpd-2.4.25.tar.gz
+wget -q https://archive.apache.org/dist/apr/apr-1.5.2.tar.gz
+wget -q https://archive.apache.org/dist/apr/apr-util-1.5.4.tar.gz
 rm -rf ${IROOT}/httpd-2.4.25
 rm -rf ${IROOT}/apr-1.5.2
 rm -rf ${IROOT}/apr-util-1.5.4
-fw_untar httpd-2.4.25.tar.gz
-fw_untar apr-1.5.2.tar.gz
-fw_untar apr-util-1.5.4.tar.gz
+tar xf httpd-2.4.25.tar.gz
+tar xf apr-1.5.2.tar.gz
+tar xf apr-util-1.5.4.tar.gz
 mv -f apr-1.5.2 httpd-2.4.25/srclib/apr
 mv -f apr-util-1.5.4 httpd-2.4.25/srclib/apr-util
 cd ${IROOT}/httpd-2.4.25
@@ -84,5 +80,3 @@ FFEAD_CPP_PATH '"${FFEADROOT}"'
 	</Directory>
 </VirtualHost>
 EOL'
-
-touch ${IROOT}/ffead-cpp-httpd.installed

frameworks/C++/ffead-cpp/ffead-cpp-mysql.dockerfile

@@ -0,0 +1,22 @@
+FROM tfb/ffead-cpp-base:latest
+
+WORKDIR ${IROOT}/ffead-cpp-src/
+
+RUN cp -f web/te-benchmark/sql-src/TeBkWorldsql.h web/te-benchmark/include/TeBkWorld.h
+RUN cp -f web/te-benchmark/sql-src/TeBkWorldsql.cpp web/te-benchmark/src/TeBkWorld.cpp
+RUN cp -f web/te-benchmark/config/sdormmysql.xml web/te-benchmark/config/sdorm.xml
+RUN rm -rf ffead-cpp-2.0-bin
+RUN make build-apps
+RUN rm -rf ${IROOT}/ffead-cpp-2.0
+RUN cp -rf ffead-cpp-2.0-bin ${IROOT}/ffead-cpp-2.0
+
+WORKDIR ${IROOT}/ffead-cpp-2.0
+
+RUN rm -rf web/default web/oauthApp web/flexApp web/markers
+RUN chmod 755 *.sh resources/*.sh rtdcf/autotools/*.sh
+
+RUN chmod 755 $FFEAD_CPP_PATH/*.sh
+RUN rm -f $FFEAD_CPP_PATH/*.cntrl
+RUN rm -f $FFEAD_CPP_PATH/tmp/*.sess
+
+CMD ./server.sh

frameworks/C++/ffead-cpp/ffead-cpp-nginx-mongo.dockerfile

@@ -0,0 +1,22 @@
+FROM tfb/ffead-cpp-nginx:latest
+
+WORKDIR ${IROOT}/ffead-cpp-src/
+
+RUN cp -f web/te-benchmark/sql-src/TeBkWorldmongo.h web/te-benchmark/include/TeBkWorld.h
+RUN cp -f web/te-benchmark/sql-src/TeBkWorldmongo.cpp web/te-benchmark/src/TeBkWorld.cpp
+RUN cp -f web/te-benchmark/config/sdormmongo.xml web/te-benchmark/config/sdorm.xml
+RUN rm -rf ffead-cpp-2.0-bin
+RUN make build-apps
+RUN rm -rf ${IROOT}/ffead-cpp-2.0
+RUN cp -rf ffead-cpp-2.0-bin ${IROOT}/ffead-cpp-2.0
+
+WORKDIR ${IROOT}/ffead-cpp-2.0
+
+RUN rm -rf web/default web/oauthApp web/flexApp web/markers
+RUN chmod 755 *.sh resources/*.sh rtdcf/autotools/*.sh
+
+RUN chmod 755 $FFEAD_CPP_PATH/*.sh
+RUN rm -f $FFEAD_CPP_PATH/*.cntrl
+RUN rm -f $FFEAD_CPP_PATH/tmp/*.sess
+
+CMD nginx -g 'daemon off;'

frameworks/C++/ffead-cpp/ffead-cpp-nginx-mysql.dockerfile

@@ -0,0 +1,22 @@
+FROM tfb/ffead-cpp-nginx:latest
+
+WORKDIR ${IROOT}/ffead-cpp-src/
+
+RUN cp -f web/te-benchmark/sql-src/TeBkWorldsql.h web/te-benchmark/include/TeBkWorld.h
+RUN cp -f web/te-benchmark/sql-src/TeBkWorldsql.cpp web/te-benchmark/src/TeBkWorld.cpp
+RUN cp -f web/te-benchmark/config/sdormmysql.xml web/te-benchmark/config/sdorm.xml
+RUN rm -rf ffead-cpp-2.0-bin
+RUN make build-apps
+RUN rm -rf ${IROOT}/ffead-cpp-2.0
+RUN cp -rf ffead-cpp-2.0-bin ${IROOT}/ffead-cpp-2.0
+
+WORKDIR ${IROOT}/ffead-cpp-2.0
+
+RUN rm -rf web/default web/oauthApp web/flexApp web/markers
+RUN chmod 755 *.sh resources/*.sh rtdcf/autotools/*.sh
+
+RUN chmod 755 $FFEAD_CPP_PATH/*.sh
+RUN rm -f $FFEAD_CPP_PATH/*.cntrl
+RUN rm -f $FFEAD_CPP_PATH/tmp/*.sess
+
+CMD nginx -g 'daemon off;'

frameworks/C++/ffead-cpp/ffead-cpp-nginx-postgresql.dockerfile

@@ -0,0 +1,22 @@
+FROM tfb/ffead-cpp-nginx:latest
+
+WORKDIR ${IROOT}/ffead-cpp-src/
+
+RUN cp -f web/te-benchmark/sql-src/TeBkWorldsql.h web/te-benchmark/include/TeBkWorld.h
+RUN cp -f web/te-benchmark/sql-src/TeBkWorldsql.cpp web/te-benchmark/src/TeBkWorld.cpp
+RUN cp -f web/te-benchmark/config/sdormpostgresql.xml web/te-benchmark/config/sdorm.xml
+RUN rm -rf ffead-cpp-2.0-bin
+RUN make build-apps
+RUN rm -rf ${IROOT}/ffead-cpp-2.0
+RUN cp -rf ffead-cpp-2.0-bin ${IROOT}/ffead-cpp-2.0
+
+WORKDIR ${IROOT}/ffead-cpp-2.0
+
+RUN rm -rf web/default web/oauthApp web/flexApp web/markers
+RUN chmod 755 *.sh resources/*.sh rtdcf/autotools/*.sh
+
+RUN chmod 755 $FFEAD_CPP_PATH/*.sh
+RUN rm -f $FFEAD_CPP_PATH/*.cntrl
+RUN rm -f $FFEAD_CPP_PATH/tmp/*.sess
+
+CMD nginx -g 'daemon off;'

frameworks/C++/ffead-cpp/ffead-cpp-nginx.dockerfile

@@ -0,0 +1,21 @@
+FROM tfb/ffead-cpp-base:latest
+
+WORKDIR $IROOT
+
+RUN wget -q http://nginx.org/download/nginx-1.13.1.tar.gz
+RUN tar xf nginx-1.13.1.tar.gz
+
+WORKDIR $IROOT/nginx-1.13.1
+
+RUN ./configure \
+    --prefix=${IROOT}/nginxfc \
+    --with-ld-opt="-lstdc++ -L${IROOT}/ffead-cpp-2.0/lib -L${IROOT}" \
+    --add-module="${IROOT}/ffead-cpp-src/modules/nginx_mod_ffeadcpp" \
+    --with-cc-opt="-I${IROOT}/ffead-cpp-2.0/include -I${IROOT}/include/libmongoc-1.0 -I${IROOT}/include/libbson-1.0 -w -fpermissive"
+RUN make
+RUN make install
+
+RUN cp ${IROOT}/ffead-cpp-src/modules/nginx_mod_ffeadcpp/nginx.conf ${IROOT}/nginxfc/conf/
+RUN sed -i 's|FFEAD_PATH|'${IROOT}/ffead-cpp-2.0'|g' ${IROOT}/nginxfc/conf/nginx.conf
+
+ENV PATH=${IROOT}/nginxfc/sbin:${PATH}

frameworks/C++/ffead-cpp/ffead-cpp-postgresql.dockerfile

@@ -0,0 +1,22 @@
+FROM tfb/ffead-cpp-base:latest
+
+WORKDIR ${IROOT}/ffead-cpp-src/
+
+RUN cp -f web/te-benchmark/sql-src/TeBkWorldsql.h web/te-benchmark/include/TeBkWorld.h
+RUN cp -f web/te-benchmark/sql-src/TeBkWorldsql.cpp web/te-benchmark/src/TeBkWorld.cpp
+RUN cp -f web/te-benchmark/config/sdormpostgresql.xml web/te-benchmark/config/sdorm.xml
+RUN rm -rf ffead-cpp-2.0-bin
+RUN make build-apps
+RUN rm -rf ${IROOT}/ffead-cpp-2.0
+RUN cp -rf ffead-cpp-2.0-bin ${IROOT}/ffead-cpp-2.0
+
+WORKDIR ${IROOT}/ffead-cpp-2.0
+
+RUN rm -rf web/default web/oauthApp web/flexApp web/markers
+RUN chmod 755 *.sh resources/*.sh rtdcf/autotools/*.sh
+
+RUN chmod 755 $FFEAD_CPP_PATH/*.sh
+RUN rm -f $FFEAD_CPP_PATH/*.cntrl
+RUN rm -f $FFEAD_CPP_PATH/tmp/*.sess
+
+CMD ./server.sh

frameworks/C++/ffead-cpp/ffead-cpp.dockerfile

@@ -0,0 +1,22 @@
+FROM tfb/ffead-cpp-base:latest
+
+WORKDIR ${IROOT}/ffead-cpp-src/
+
+RUN cp -f web/te-benchmark/sql-src/TeBkWorldmongo.h web/te-benchmark/include/TeBkWorld.h
+RUN cp -f web/te-benchmark/sql-src/TeBkWorldmongo.cpp web/te-benchmark/src/TeBkWorld.cpp
+RUN cp -f web/te-benchmark/config/sdormmongo.xml web/te-benchmark/config/sdorm.xml
+RUN rm -rf ffead-cpp-2.0-bin
+RUN make build-apps
+RUN rm -rf ${IROOT}/ffead-cpp-2.0
+RUN cp -rf ffead-cpp-2.0-bin ${IROOT}/ffead-cpp-2.0
+
+WORKDIR ${IROOT}/ffead-cpp-2.0
+
+RUN rm -rf web/default web/oauthApp web/flexApp web/markers
+RUN chmod 755 *.sh resources/*.sh rtdcf/autotools/*.sh
+
+RUN chmod 755 $FFEAD_CPP_PATH/*.sh
+RUN rm -f $FFEAD_CPP_PATH/*.cntrl
+RUN rm -f $FFEAD_CPP_PATH/tmp/*.sess
+
+CMD ./server.sh

frameworks/C++/ffead-cpp/removed.txt

@@ -0,0 +1,112 @@
+Could mot get the following
+	"mysql": {
+      "json_url": "/te-benchmark/json",
+      "plaintext_url": "/te-benchmark/plaintext",
+      "db_url": "/te-benchmark/db",
+      "query_url": "/te-benchmark/queries?queries=",
+      "fortune_url": "/te-benchmark/fortunes",
+      "update_url": "/te-benchmark/updates?queries=",
+      "port": 8080,
+      "approach": "Realistic",
+      "classification": "Fullstack",
+      "database": "mysql",
+      "framework": "ffead-cpp",
+      "language": "C++",
+      "orm": "Full",
+      "platform": "ffead-cpp",
+      "webserver": "ffead-cpp",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "ffead-cpp-mysql",
+      "notes": "",
+      "versus": ""
+    },
+    "apache-mysql": {
+      "setup_file": "setup-apache-mysql",
+      "json_url": "/te-benchmark/json",
+      "plaintext_url": "/te-benchmark/plaintext",
+      "db_url": "/te-benchmark/db",
+      "query_url": "/te-benchmark/queries?queries=",
+      "fortune_url": "/te-benchmark/fortunes",
+      "update_url": "/te-benchmark/updates?queries=",
+      "port": 8080,
+      "approach": "Realistic",
+      "classification": "Fullstack",
+      "database": "mysql",
+      "framework": "ffead-cpp",
+      "language": "C++",
+      "orm": "Full",
+      "platform": "ffead-cpp",
+      "webserver": "apache",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "ffead-cpp-apache-mysql",
+      "notes": "",
+      "versus": ""
+    },
+    "nginx-mongo": {
+      "json_url": "/te-benchmark/json",
+      "plaintext_url": "/te-benchmark/plaintext",
+      "db_url": "/te-benchmark/db",
+      "query_url": "/te-benchmark/queries?queries=",
+      "fortune_url": "/te-benchmark/fortunes",
+      "update_url": "/te-benchmark/updates?queries=",
+      "port": 8080,
+      "approach": "Realistic",
+      "classification": "Fullstack",
+      "database": "mongodb",
+      "framework": "ffead-cpp",
+      "language": "C++",
+      "orm": "Full",
+      "platform": "ffead-cpp",
+      "webserver": "nginx",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "ffead-cpp-nginx-mongo",
+      "notes": "",
+      "versus": ""
+    },
+	"nginx-mysql": {
+      "json_url": "/te-benchmark/json",
+      "plaintext_url": "/te-benchmark/plaintext",
+      "db_url": "/te-benchmark/db",
+      "query_url": "/te-benchmark/queries?queries=",
+      "fortune_url": "/te-benchmark/fortunes",
+      "update_url": "/te-benchmark/updates?queries=",
+      "port": 8080,
+      "approach": "Realistic",
+      "classification": "Fullstack",
+      "database": "mysql",
+      "framework": "ffead-cpp",
+      "language": "C++",
+      "orm": "Full",
+      "platform": "ffead-cpp",
+      "webserver": "nginx",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "ffead-cpp-nginx-mysql",
+      "notes": "",
+      "versus": ""
+    },
+	"nginx-postgresql": {
+      "json_url": "/te-benchmark/json",
+      "plaintext_url": "/te-benchmark/plaintext",
+      "db_url": "/te-benchmark/db",
+      "query_url": "/te-benchmark/queries?queries=",
+      "fortune_url": "/te-benchmark/fortunes",
+      "update_url": "/te-benchmark/updates?queries=",
+      "port": 8080,
+      "approach": "Realistic",
+      "classification": "Fullstack",
+      "database": "postgres",
+      "framework": "ffead-cpp",
+      "language": "C++",
+      "orm": "Full",
+      "platform": "ffead-cpp",
+      "webserver": "nginx",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "ffead-cpp-nginx-postgresql",
+      "notes": "",
+      "versus": ""
+    }

frameworks/C++/ffead-cpp/server.sh

@@ -1,12 +1,8 @@
 #!/bin/sh
 
+cd $FFEAD_CPP_PATH
+
 export MALLOC_CHECK_=0
-IS_OS_DARWIN=`uname|tr '[A-Z]' '[a-z]'|awk 'index($0,"darwin") != 0 {print "darwin"}'`
-if [ "$IS_OS_DARWIN" != "" ]; then
-	export FFEAD_CPP_PATH=`cd "$(dirname server.sh)" && ABSPATH=$(pwd) && cd -`
-else
-	export FFEAD_CPP_PATH=`echo $(dirname $(readlink -f $0))`
-fi
 
 echo $FFEAD_CPP_PATH
 export LD_LIBRARY_PATH=$FFEAD_CPP_PATH/lib:$LD_LIBRARY_PATH
@@ -29,4 +25,7 @@ chmod 700 $FFEAD_CPP_PATH/tests/*
 chmod 700 $FFEAD_CPP_PATH/rtdcf/*
 #chmod 700 $FFEAD_CPP_PATH/rtdcf/autotools/*
 #/usr/sbin/setenforce 0
-./CHS $FFEAD_CPP_PATH > ffead.log 2>&1
+
+./CHS $FFEAD_CPP_PATH
+
+wait

frameworks/C++/ffead-cpp/setup-apache-mongo.sh

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-fw_depends ffead-cpp-apache-mongo
-
-rm -f $FFEAD_CPP_PATH/*.cntrl
-rm -f $FFEAD_CPP_PATH/tmp/*.sess
-apachectl restart > ffead.log 2>&1

frameworks/C++/ffead-cpp/setup-apache-mysql.sh

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-fw_depends ffead-cpp-apache-mysql
-
-rm -f $FFEAD_CPP_PATH/*.cntrl
-rm -f $FFEAD_CPP_PATH/tmp/*.sess
-apachectl restart > ffead.log 2>&1

frameworks/C++/ffead-cpp/setup-apache-postgresql.sh

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-fw_depends ffead-cpp-apache-postgresql
-
-rm -f $FFEAD_CPP_PATH/*.cntrl
-rm -f $FFEAD_CPP_PATH/tmp/*.sess
-apachectl restart > ffead.log 2>&1

frameworks/C++/ffead-cpp/setup-mongo.sh

@@ -1,9 +0,0 @@
-#!/bin/bash
-
-fw_depends ffead-cpp-emb-mongo
-
-chmod 755 $FFEAD_CPP_PATH/*.sh
-rm -f $FFEAD_CPP_PATH/*.cntrl
-rm -f $FFEAD_CPP_PATH/tmp/*.sess
-cd $FFEAD_CPP_PATH
-./server.sh

frameworks/C++/ffead-cpp/setup-mysql.sh

@@ -1,9 +0,0 @@
-#!/bin/bash
-
-fw_depends ffead-cpp-emb-mysql
-
-chmod 755 $FFEAD_CPP_PATH/*.sh
-rm -f $FFEAD_CPP_PATH/*.cntrl
-rm -f $FFEAD_CPP_PATH/tmp/*.sess
-cd $FFEAD_CPP_PATH
-./server.sh

frameworks/C++/ffead-cpp/setup-nginx-mongo.sh

@@ -1,13 +0,0 @@
-#!/bin/bash
-
-fw_depends ffead-cpp-nginx-mongo
-
-#export FFEAD_CPP_PATH=$IROOT/ffead-cpp-2.0
-export LD_LIBRARY_PATH=$IROOT:$FFEAD_CPP_PATH/lib:$LD_LIBRARY_PATH
-export ODBCINI=${IROOT}/odbc.ini
-export ODBCSYSINI=${IROOT}
-echo $FFEAD_CPP_PATH
-echo $LD_LIBRARY_PATH
-rm -f $FFEAD_CPP_PATH/*.cntrl
-rm -f $FFEAD_CPP_PATH/tmp/*.sess
-nginx > ffead.log 2>&1

frameworks/C++/ffead-cpp/setup-nginx-mysql.sh

@@ -1,14 +0,0 @@
-#!/bin/bash
-
-fw_depends ffead-cpp-nginx-mysql
-
-#export FFEAD_CPP_PATH=$IROOT/ffead-cpp-2.0
-export LD_LIBRARY_PATH=$IROOT:$FFEAD_CPP_PATH/lib:$LD_LIBRARY_PATH
-export ODBCINI=${IROOT}/odbc.ini
-export ODBCSYSINI=${IROOT}
-echo $FFEAD_CPP_PATH
-echo $LD_LIBRARY_PATH
-rm -f $FFEAD_CPP_PATH/*.cntrl
-rm -f $FFEAD_CPP_PATH/tmp/*.sess
-nginx > ffead.log 2>&1
-

frameworks/C++/ffead-cpp/setup-nginx-postgresql.sh

@@ -1,13 +0,0 @@
-#!/bin/bash
-
-fw_depends ffead-cpp-nginx-postgresql
-
-#export FFEAD_CPP_PATH=$IROOT/ffead-cpp-2.0
-export LD_LIBRARY_PATH=$IROOT:$FFEAD_CPP_PATH/lib:$LD_LIBRARY_PATH
-export ODBCINI=${IROOT}/odbc.ini
-export ODBCSYSINI=${IROOT}
-echo $FFEAD_CPP_PATH
-echo $LD_LIBRARY_PATH
-rm -f $FFEAD_CPP_PATH/*.cntrl
-rm -f $FFEAD_CPP_PATH/tmp/*.sess
-nginx > ffead.log 2>&1

frameworks/C++/ffead-cpp/setup-postgresql.sh

@@ -1,9 +0,0 @@
-#!/bin/bash
-
-fw_depends ffead-cpp-emb-postgresql
-
-chmod 755 $FFEAD_CPP_PATH/*.sh
-rm -f $FFEAD_CPP_PATH/*.cntrl
-rm -f $FFEAD_CPP_PATH/tmp/*.sess
-cd $FFEAD_CPP_PATH
-./server.sh

toolset/setup/linux/frameworks/ffead-cpp-apache-mongo.sh

@@ -1,28 +0,0 @@
-#!/bin/bash
-
-fw_installed ffead-cpp-apache-mongo && return 0
-
-fw_depends mongodb
-fw_depends ffead-cpp-unixodbc
-fw_depends ffead-cpp-mongocdriver
-fw_depends ffead-cpp-httpd
-
-cd ${IROOT}/ffead-cpp-src/
-cp -f web/te-benchmark/sql-src/TeBkWorldmongo.h web/te-benchmark/include/TeBkWorld.h
-cp -f web/te-benchmark/sql-src/TeBkWorldmongo.cpp web/te-benchmark/src/TeBkWorld.cpp
-cp -f web/te-benchmark/config/sdormmongo.xml web/te-benchmark/config/sdorm.xml
-rm -rf ffead-cpp-2.0-bin
-make build-apps
-rm -rf ${IROOT}/ffead-cpp-2.0
-cp -rf ffead-cpp-2.0-bin ${IROOT}/ffead-cpp-2.0
-cd ${IROOT}/ffead-cpp-2.0
-rm -rf web/default web/oauthApp web/flexApp web/markers
-chmod 755 *.sh resources/*.sh rtdcf/autotools/*.sh
-./server.sh > ffead-cpp-apache-mongo.log 2>&1
-while ! echo exit | nc localhost 8080; do sleep 5; done
-rm -f serv.ctrl
-sleep 10
-
-cd ${IROOT}
-
-echo -e "export PATH=${IROOT}/httpd/bin:\$PATH" > $IROOT/ffead-cpp-apache-mongo.installed

toolset/setup/linux/frameworks/ffead-cpp-apache-mysql.sh

@@ -1,28 +0,0 @@
-#!/bin/bash
-
-fw_installed ffead-cpp-apache-mysql && return 0
-
-fw_depends mysql
-fw_depends ffead-cpp-unixodbc
-fw_depends ffead-cpp-mongocdriver
-fw_depends ffead-cpp-httpd
-
-cd ${IROOT}/ffead-cpp-src/
-cp -f web/te-benchmark/sql-src/TeBkWorldsql.h web/te-benchmark/include/TeBkWorld.h
-cp -f web/te-benchmark/sql-src/TeBkWorldsql.cpp web/te-benchmark/src/TeBkWorld.cpp
-cp -f web/te-benchmark/config/sdormmysql.xml web/te-benchmark/config/sdorm.xml
-rm -rf ffead-cpp-2.0-bin
-make build-apps
-rm -rf ${IROOT}/ffead-cpp-2.0
-cp -rf ffead-cpp-2.0-bin ${IROOT}/ffead-cpp-2.0
-cd ${IROOT}/ffead-cpp-2.0
-rm -rf web/default web/oauthApp web/flexApp web/markers
-chmod 755 *.sh resources/*.sh rtdcf/autotools/*.sh
-./server.sh > ffead-cpp-apache-mysql.log 2>&1
-while ! echo exit | nc localhost 8080; do sleep 5; done
-rm -f serv.ctrl
-sleep 10
-
-cd ${IROOT}
-
-echo -e "export PATH=${IROOT}/httpd/bin:\$PATH" > $IROOT/ffead-cpp-apache-mysql.installed

toolset/setup/linux/frameworks/ffead-cpp-apache-postgresql.sh

@@ -1,28 +0,0 @@
-#!/bin/bash
-
-fw_installed ffead-cpp-apache-postgresql && return 0
-
-fw_depends postgresql
-fw_depends ffead-cpp-unixodbc
-fw_depends ffead-cpp-mongocdriver
-fw_depends ffead-cpp-httpd
-
-cd ${IROOT}/ffead-cpp-src/
-cp -f web/te-benchmark/sql-src/TeBkWorldsql.h web/te-benchmark/include/TeBkWorld.h
-cp -f web/te-benchmark/sql-src/TeBkWorldsql.cpp web/te-benchmark/src/TeBkWorld.cpp
-cp -f web/te-benchmark/config/sdormpostgresql.xml web/te-benchmark/config/sdorm.xml
-rm -rf ffead-cpp-2.0-bin
-make build-apps
-rm -rf ${IROOT}/ffead-cpp-2.0
-cp -rf ffead-cpp-2.0-bin ${IROOT}/ffead-cpp-2.0
-cd ${IROOT}/ffead-cpp-2.0
-rm -rf web/default web/oauthApp web/flexApp web/markers
-chmod 755 *.sh resources/*.sh rtdcf/autotools/*.sh
-./server.sh > ffead-cpp-apache-postgresql.log 2>&1
-while ! echo exit | nc localhost 8080; do sleep 5; done
-rm -f serv.ctrl
-sleep 10
-
-cd ${IROOT}
-
-echo -e "export PATH=${IROOT}/httpd/bin:\$PATH" > $IROOT/ffead-cpp-apache-postgresql.installed

toolset/setup/linux/frameworks/ffead-cpp-emb-mongo.sh

@@ -1,28 +0,0 @@
-#!/bin/bash
-
-fw_installed ffead-cpp-emb-mongo && return 0
-
-fw_depends mongodb
-fw_depends ffead-cpp-unixodbc
-fw_depends ffead-cpp-mongocdriver
-fw_depends ffead-cpp-framework
-
-cd ${IROOT}/ffead-cpp-src/
-cp -f web/te-benchmark/sql-src/TeBkWorldmongo.h web/te-benchmark/include/TeBkWorld.h
-cp -f web/te-benchmark/sql-src/TeBkWorldmongo.cpp web/te-benchmark/src/TeBkWorld.cpp
-cp -f web/te-benchmark/config/sdormmongo.xml web/te-benchmark/config/sdorm.xml
-rm -rf ffead-cpp-2.0-bin
-make build-apps
-rm -rf ${IROOT}/ffead-cpp-2.0
-cp -rf ffead-cpp-2.0-bin ${IROOT}/ffead-cpp-2.0
-cd ${IROOT}/ffead-cpp-2.0
-rm -rf web/default web/oauthApp web/flexApp web/markers
-chmod 755 *.sh resources/*.sh rtdcf/autotools/*.sh
-./server.sh > ffead-cpp-emb-mongo.log 2>&1
-while ! echo exit | nc localhost 8080; do sleep 5; done
-rm -f serv.ctrl
-sleep 10
-
-cd ${IROOT}
-
-echo -e "export PATH=${FFEAD_CPP_PATH}:\$PATH" > $IROOT/ffead-cpp-emb-mongo.installed

toolset/setup/linux/frameworks/ffead-cpp-emb-mysql.sh

@@ -1,28 +0,0 @@
-#!/bin/bash
-
-fw_installed ffead-cpp-emb-mysql && return 0
-
-fw_depends mysql
-fw_depends ffead-cpp-unixodbc
-fw_depends ffead-cpp-mongocdriver
-fw_depends ffead-cpp-framework
-
-cd ${IROOT}/ffead-cpp-src/
-cp -f web/te-benchmark/sql-src/TeBkWorldsql.h web/te-benchmark/include/TeBkWorld.h
-cp -f web/te-benchmark/sql-src/TeBkWorldsql.cpp web/te-benchmark/src/TeBkWorld.cpp
-cp -f web/te-benchmark/config/sdormmysql.xml web/te-benchmark/config/sdorm.xml
-rm -rf ffead-cpp-2.0-bin
-make build-apps
-rm -rf ${IROOT}/ffead-cpp-2.0
-cp -rf ffead-cpp-2.0-bin ${IROOT}/ffead-cpp-2.0
-cd ${IROOT}/ffead-cpp-2.0
-rm -rf web/default web/oauthApp web/flexApp web/markers
-chmod 755 *.sh resources/*.sh rtdcf/autotools/*.sh
-./server.sh > ffead-cpp-emb-mysql.log 2>&1
-while ! echo exit | nc localhost 8080; do sleep 5; done
-rm -f serv.ctrl
-sleep 10
-
-cd ${IROOT}
-
-echo -e "export PATH=${FFEAD_CPP_PATH}:\$PATH" > $IROOT/ffead-cpp-emb-mysql.installed

toolset/setup/linux/frameworks/ffead-cpp-emb-postgresql.sh

@@ -1,28 +0,0 @@
-#!/bin/bash
-
-fw_installed ffead-cpp-emb-postgresql && return 0
-
-fw_depends postgresql
-fw_depends ffead-cpp-unixodbc
-fw_depends ffead-cpp-mongocdriver
-fw_depends ffead-cpp-framework
-
-cd ${IROOT}/ffead-cpp-src/
-cp -f web/te-benchmark/sql-src/TeBkWorldsql.h web/te-benchmark/include/TeBkWorld.h
-cp -f web/te-benchmark/sql-src/TeBkWorldsql.cpp web/te-benchmark/src/TeBkWorld.cpp
-cp -f web/te-benchmark/config/sdormpostgresql.xml web/te-benchmark/config/sdorm.xml
-rm -rf ffead-cpp-2.0-bin
-make build-apps
-rm -rf ${IROOT}/ffead-cpp-2.0
-cp -rf ffead-cpp-2.0-bin ${IROOT}/ffead-cpp-2.0
-cd ${IROOT}/ffead-cpp-2.0
-rm -rf web/default web/oauthApp web/flexApp web/markers
-chmod 755 *.sh resources/*.sh rtdcf/autotools/*.sh
-./server.sh > ffead-cpp-emb-postgresql.log 2>&1
-while ! echo exit | nc localhost 8080; do sleep 5; done
-rm -f serv.ctrl
-sleep 10
-
-cd ${IROOT}
-
-echo -e "export PATH=${FFEAD_CPP_PATH}:\$PATH" > $IROOT/ffead-cpp-emb-postgresql.installed

toolset/setup/linux/frameworks/ffead-cpp-mongocdriver.sh

@@ -1,12 +0,0 @@
-#!/bin/bash
-
-fw_installed ffead-cpp-mongocdriver && return 0
-
-fw_get -o mongo-c-driver-1.4.0.tar.gz https://github.com/mongodb/mongo-c-driver/releases/download/1.4.0/mongo-c-driver-1.4.0.tar.gz
-rm -rf mongo-c-driver-1.4.0/
-fw_untar mongo-c-driver-1.4.0.tar.gz
-cd mongo-c-driver-1.4.0/
-./configure --prefix=${IROOT} --libdir=${IROOT} --disable-automatic-init-and-cleanup
-make && make install
-
-touch ${IROOT}/ffead-cpp-mongocdriver.installed

toolset/setup/linux/frameworks/ffead-cpp-nginx-mongo.sh

@@ -1,28 +0,0 @@
-#!/bin/bash
-
-fw_installed ffead-cpp-nginx-mongo && return 0
-
-fw_depends mongodb
-fw_depends ffead-cpp-unixodbc
-fw_depends ffead-cpp-mongocdriver
-fw_depends ffead-cpp-nginx
-
-cd ${IROOT}/ffead-cpp-src/
-cp -f web/te-benchmark/sql-src/TeBkWorldmongo.h web/te-benchmark/include/TeBkWorld.h
-cp -f web/te-benchmark/sql-src/TeBkWorldmongo.cpp web/te-benchmark/src/TeBkWorld.cpp
-cp -f web/te-benchmark/config/sdormmongo.xml web/te-benchmark/config/sdorm.xml
-rm -rf ffead-cpp-2.0-bin
-make build-apps
-rm -rf ${IROOT}/ffead-cpp-2.0
-cp -rf ffead-cpp-2.0-bin ${IROOT}/ffead-cpp-2.0
-cd ${IROOT}/ffead-cpp-2.0
-rm -rf web/default web/oauthApp web/flexApp web/markers
-chmod 755 *.sh resources/*.sh rtdcf/autotools/*.sh
-./server.sh > ffead-cpp-nginx-mongo.log 2>&1
-while ! echo exit | nc localhost 8080; do sleep 5; done
-rm -f serv.ctrl
-sleep 10
-
-cd ${IROOT}
-
-echo -e "export PATH=${IROOT}/nginxfc/sbin:\$PATH" > $IROOT/ffead-cpp-nginx-mongo.installed

toolset/setup/linux/frameworks/ffead-cpp-nginx-mysql.sh

@@ -1,28 +0,0 @@
-#!/bin/bash
-
-fw_installed ffead-cpp-nginx-mysql && return 0
-
-fw_depends mysql
-fw_depends ffead-cpp-unixodbc
-fw_depends ffead-cpp-mongocdriver
-fw_depends ffead-cpp-nginx
-
-cd ${IROOT}/ffead-cpp-src/
-cp -f web/te-benchmark/sql-src/TeBkWorldsql.h web/te-benchmark/include/TeBkWorld.h
-cp -f web/te-benchmark/sql-src/TeBkWorldsql.cpp web/te-benchmark/src/TeBkWorld.cpp
-cp -f web/te-benchmark/config/sdormmysql.xml web/te-benchmark/config/sdorm.xml
-rm -rf ffead-cpp-2.0-bin
-make build-apps
-rm -rf ${IROOT}/ffead-cpp-2.0
-cp -rf ffead-cpp-2.0-bin ${IROOT}/ffead-cpp-2.0
-cd ${IROOT}/ffead-cpp-2.0
-rm -rf web/default web/oauthApp web/flexApp web/markers
-chmod 755 *.sh resources/*.sh rtdcf/autotools/*.sh
-./server.sh > ffead-cpp-nginx-mysql.log 2>&1
-while ! echo exit | nc localhost 8080; do sleep 5; done
-rm -f serv.ctrl
-sleep 10
-
-cd ${IROOT}
-
-echo -e "export PATH=${IROOT}/nginxfc/sbin:\$PATH" > $IROOT/ffead-cpp-nginx-mysql.installed

toolset/setup/linux/frameworks/ffead-cpp-nginx-postgresql.sh

@@ -1,28 +0,0 @@
-#!/bin/bash
-
-fw_installed ffead-cpp-nginx-postgresql && return 0
-
-fw_depends postgresql
-fw_depends ffead-cpp-unixodbc
-fw_depends ffead-cpp-mongocdriver
-fw_depends ffead-cpp-nginx
-
-cd ${IROOT}/ffead-cpp-src/
-cp -f web/te-benchmark/sql-src/TeBkWorldsql.h web/te-benchmark/include/TeBkWorld.h
-cp -f web/te-benchmark/sql-src/TeBkWorldsql.cpp web/te-benchmark/src/TeBkWorld.cpp
-cp -f web/te-benchmark/config/sdormpostgresql.xml web/te-benchmark/config/sdorm.xml
-rm -rf ffead-cpp-2.0-bin
-make build-apps
-rm -rf ${IROOT}/ffead-cpp-2.0
-cp -rf ffead-cpp-2.0-bin ${IROOT}/ffead-cpp-2.0
-cd ${IROOT}/ffead-cpp-2.0
-rm -rf web/default web/oauthApp web/flexApp web/markers
-chmod 755 *.sh resources/*.sh rtdcf/autotools/*.sh
-./server.sh > ffead-cpp-nginx-postgresql.log 2>&1
-while ! echo exit | nc localhost 8080; do sleep 5; done
-rm -f serv.ctrl
-sleep 10
-
-cd ${IROOT}
-
-echo -e "export PATH=${IROOT}/nginxfc/sbin:\$PATH" > $IROOT/ffead-cpp-nginx-postgresql.installed

toolset/setup/linux/frameworks/ffead-cpp-nginx.sh

@@ -1,20 +0,0 @@
-#!/bin/bash
-
-fw_installed ffead-cpp-nginx && return 0
-
-fw_depends ffead-cpp-framework
-
-sudo apt-get remove -y nginx
-
-fw_get -o nginx-1.11.3.tar.gz http://nginx.org/download/nginx-1.11.3.tar.gz
-rm -rf ${IROOT}nginx-1.11.3
-fw_untar nginx-1.11.3.tar.gz
-rm -rf ${IROOT}/nginxfc
-cd nginx-1.11.3
-./configure --prefix=${IROOT}/nginxfc --with-ld-opt="-lstdc++ -L${IROOT}/ffead-cpp-2.0/lib -L${IROOT}" --add-module="${IROOT}/ffead-cpp-src/modules/nginx_mod_ffeadcpp" --with-cc-opt="-I${IROOT}/include -I${IROOT}/include/libmongoc-1.0/ -I${IROOT}/include/libbson-1.0/ -I${IROOT}/ffead-cpp-2.0/include -w -fpermissive"
-make install
-
-cp ${IROOT}/ffead-cpp-src/modules/nginx_mod_ffeadcpp/nginx.conf ${IROOT}/nginxfc/conf/
-sed -i 's|FFEAD_PATH|'${IROOT}/ffead-cpp-2.0'|g' ${IROOT}/nginxfc/conf/nginx.conf
-
-touch ${IROOT}/ffead-cpp-nginx.installed

toolset/setup/linux/frameworks/ffead-cpp-unixodbc.sh

@@ -1,15 +0,0 @@
-#!/bin/bash
-
-fw_installed ffead-cpp-unixodbc && return 0
-
-sudo apt-get install -y build-essential
-sudo apt-get install -y uuid-dev libmyodbc odbc-postgresql
-
-fw_get -o unixODBC-2.3.4.tar.gz ftp://ftp.unixodbc.org/pub/unixODBC/unixODBC-2.3.4.tar.gz
-rm -rf unixODBC-2.3.4
-fw_untar unixODBC-2.3.4.tar.gz
-cd unixODBC-2.3.4
-./configure --enable-stats=no --enable-gui=no --enable-drivers=no --enable-iconv --with-iconv-char-enc=UTF8 --with-iconv-ucode-enc=UTF16LE --libdir=${IROOT} --prefix=${IROOT} --sysconfdir=${IROOT}
-make install
-
-touch ${IROOT}/ffead-cpp-unixodbc.installed