Browse Source

Update treefrog to version 1.30.0 (#6016)

* Update treefrog to version 1.30.0.

* use bionic image.

* updated dockerfiles.

* updated a dockerfile.

* updated dockerfiles.
TreeFrog Framework 4 years ago
parent
commit
a586c63e15

+ 2 - 5
frameworks/C++/treefrog/appbase.pri

@@ -7,10 +7,7 @@ win32 {
     LIBS += -ltreefrog1
     LIBS += -ltreefrog1
   }
   }
 } else {
 } else {
-  macx {
-    LIBS += -framework treefrog
-  } else {
-    LIBS += -ltreefrog
-  }
+  unix:LIBS += -Wl,-rpath,. -Wl,-rpath,/usr/lib -L/usr/lib -ltreefrog
   unix:INCLUDEPATH += /usr/include/treefrog
   unix:INCLUDEPATH += /usr/include/treefrog
+  linux-*:LIBS += -lrt
 }
 }

+ 9 - 9
frameworks/C++/treefrog/treefrog-epoll.dockerfile

@@ -1,19 +1,20 @@
 FROM buildpack-deps:bionic
 FROM buildpack-deps:bionic
 
 
 ENV DEBIAN_FRONTEND noninteractive
 ENV DEBIAN_FRONTEND noninteractive
-ENV TFVER=1.27.0
+ENV DEBCONF_NOWARNINGS yes
+ENV TFVER=1.30.0
 
 
-RUN apt-get update -yqq && apt-get install -yqq --no-install-recommends \
-    software-properties-common unzip cmake g++ gcc libjemalloc-dev qt5-qmake qt5-default qtbase5-dev \
+RUN apt-get update -yqq && apt-get upgrade -yq && apt-get install -yqq --no-install-recommends \
+    software-properties-common unzip wget make cmake gcc clang libjemalloc-dev qt5-qmake qt5-default qtbase5-dev \
     qtbase5-dev-tools libqt5sql5 libqt5sql5-mysql libqt5sql5-psql libqt5qml5 libqt5xml5 \
     qtbase5-dev-tools libqt5sql5 libqt5sql5-mysql libqt5sql5-psql libqt5qml5 libqt5xml5 \
     qtdeclarative5-dev libqt5quick5 libqt5quickparticles5 libqt5gui5 libqt5printsupport5 \
     qtdeclarative5-dev libqt5quick5 libqt5quickparticles5 libqt5gui5 libqt5printsupport5 \
-    libqt5widgets5 libqt5opengl5-dev libqt5quicktest5
+    libqt5widgets5 libqt5opengl5-dev libqt5quicktest5 libqt5sql5-sqlite libsqlite3-dev libmongoc-dev libbson-dev
 
 
 WORKDIR /usr/src
 WORKDIR /usr/src
 RUN wget -q https://github.com/treefrogframework/treefrog-framework/archive/v${TFVER}.tar.gz
 RUN wget -q https://github.com/treefrogframework/treefrog-framework/archive/v${TFVER}.tar.gz
 RUN tar xf v${TFVER}.tar.gz
 RUN tar xf v${TFVER}.tar.gz
 RUN cd treefrog-framework-${TFVER} && \
 RUN cd treefrog-framework-${TFVER} && \
-    ./configure && \
+    ./configure --spec=linux-clang && \
     cd src && \
     cd src && \
     make -j4 && \
     make -j4 && \
     make install && \
     make install && \
@@ -24,14 +25,13 @@ RUN cd treefrog-framework-${TFVER} && \
 WORKDIR /workspace
 WORKDIR /workspace
 COPY ./ ./
 COPY ./ ./
 
 
-RUN sed -i 's|DriverType=.*|DriverType=QMYSQL|g' config/database.ini
-RUN sed -i 's|MultiProcessingModule=.*|MultiProcessingModule=epoll|g' config/application.ini
-
 # 1. Generate Makefile
 # 1. Generate Makefile
-RUN qmake -r CONFIG+=release
+RUN qmake -r CONFIG+=release -spec linux-clang
 
 
 # 2. Compile applicaton
 # 2. Compile applicaton
 RUN make
 RUN make
+RUN sed -i 's|DriverType=.*|DriverType=QMYSQL|g' config/database.ini
+RUN sed -i 's|MultiProcessingModule=.*|MultiProcessingModule=epoll|g' config/application.ini
 
 
 # 3. Start TreeFrog
 # 3. Start TreeFrog
 CMD treefrog /workspace
 CMD treefrog /workspace

+ 9 - 9
frameworks/C++/treefrog/treefrog-mongodb.dockerfile

@@ -1,19 +1,20 @@
 FROM buildpack-deps:bionic
 FROM buildpack-deps:bionic
 
 
 ENV DEBIAN_FRONTEND noninteractive
 ENV DEBIAN_FRONTEND noninteractive
-ENV TFVER=1.27.0
+ENV DEBCONF_NOWARNINGS yes
+ENV TFVER=1.30.0
 
 
-RUN apt-get update -yqq && apt-get install -yqq --no-install-recommends \
-    software-properties-common unzip cmake g++ gcc libjemalloc-dev qt5-qmake qt5-default qtbase5-dev \
+RUN apt-get update -yqq && apt-get upgrade -yq && apt-get install -yqq --no-install-recommends \
+    software-properties-common unzip wget make cmake gcc clang libjemalloc-dev qt5-qmake qt5-default qtbase5-dev \
     qtbase5-dev-tools libqt5sql5 libqt5sql5-mysql libqt5sql5-psql libqt5qml5 libqt5xml5 \
     qtbase5-dev-tools libqt5sql5 libqt5sql5-mysql libqt5sql5-psql libqt5qml5 libqt5xml5 \
     qtdeclarative5-dev libqt5quick5 libqt5quickparticles5 libqt5gui5 libqt5printsupport5 \
     qtdeclarative5-dev libqt5quick5 libqt5quickparticles5 libqt5gui5 libqt5printsupport5 \
-    libqt5widgets5 libqt5opengl5-dev libqt5quicktest5
+    libqt5widgets5 libqt5opengl5-dev libqt5quicktest5 libqt5sql5-sqlite libsqlite3-dev libmongoc-dev libbson-dev
 
 
 WORKDIR /usr/src
 WORKDIR /usr/src
 RUN wget -q https://github.com/treefrogframework/treefrog-framework/archive/v${TFVER}.tar.gz
 RUN wget -q https://github.com/treefrogframework/treefrog-framework/archive/v${TFVER}.tar.gz
 RUN tar xf v${TFVER}.tar.gz
 RUN tar xf v${TFVER}.tar.gz
 RUN cd treefrog-framework-${TFVER} && \
 RUN cd treefrog-framework-${TFVER} && \
-    ./configure && \
+    ./configure --spec=linux-clang && \
     cd src && \
     cd src && \
     make -j4 && \
     make -j4 && \
     make install && \
     make install && \
@@ -24,14 +25,13 @@ RUN cd treefrog-framework-${TFVER} && \
 WORKDIR /workspace
 WORKDIR /workspace
 COPY ./ ./
 COPY ./ ./
 
 
-RUN sed -i 's|DriverType=.*|DriverType=QMYSQL|g' config/database.ini
-RUN sed -i 's|MultiProcessingModule=.*|MultiProcessingModule=thread|g' config/application.ini
-
 # 1. Generate Makefile
 # 1. Generate Makefile
-RUN qmake -r CONFIG+=release
+RUN qmake -r CONFIG+=release -spec linux-clang
 
 
 # 2. Compile applicaton
 # 2. Compile applicaton
 RUN make
 RUN make
+RUN sed -i 's|DriverType=.*|DriverType=QMYSQL|g' config/database.ini
+RUN sed -i 's|MultiProcessingModule=.*|MultiProcessingModule=thread|g' config/application.ini
 
 
 # 3. Start TreeFrog
 # 3. Start TreeFrog
 CMD treefrog /workspace
 CMD treefrog /workspace

+ 9 - 9
frameworks/C++/treefrog/treefrog-postgres.dockerfile

@@ -1,19 +1,20 @@
 FROM buildpack-deps:bionic
 FROM buildpack-deps:bionic
 
 
 ENV DEBIAN_FRONTEND noninteractive
 ENV DEBIAN_FRONTEND noninteractive
-ENV TFVER=1.27.0
+ENV DEBCONF_NOWARNINGS yes
+ENV TFVER=1.30.0
 
 
-RUN apt-get update -yqq && apt-get install -yqq --no-install-recommends \
-    software-properties-common unzip cmake g++ gcc libjemalloc-dev qt5-qmake qt5-default qtbase5-dev \
+RUN apt-get update -yqq && apt-get upgrade -yq && apt-get install -yqq --no-install-recommends \
+    software-properties-common unzip wget make cmake gcc clang libjemalloc-dev qt5-qmake qt5-default qtbase5-dev \
     qtbase5-dev-tools libqt5sql5 libqt5sql5-mysql libqt5sql5-psql libqt5qml5 libqt5xml5 \
     qtbase5-dev-tools libqt5sql5 libqt5sql5-mysql libqt5sql5-psql libqt5qml5 libqt5xml5 \
     qtdeclarative5-dev libqt5quick5 libqt5quickparticles5 libqt5gui5 libqt5printsupport5 \
     qtdeclarative5-dev libqt5quick5 libqt5quickparticles5 libqt5gui5 libqt5printsupport5 \
-    libqt5widgets5 libqt5opengl5-dev libqt5quicktest5
+    libqt5widgets5 libqt5opengl5-dev libqt5quicktest5 libqt5sql5-sqlite libsqlite3-dev libmongoc-dev libbson-dev
 
 
 WORKDIR /usr/src
 WORKDIR /usr/src
 RUN wget -q https://github.com/treefrogframework/treefrog-framework/archive/v${TFVER}.tar.gz
 RUN wget -q https://github.com/treefrogframework/treefrog-framework/archive/v${TFVER}.tar.gz
 RUN tar xf v${TFVER}.tar.gz
 RUN tar xf v${TFVER}.tar.gz
 RUN cd treefrog-framework-${TFVER} && \
 RUN cd treefrog-framework-${TFVER} && \
-    ./configure && \
+    ./configure --spec=linux-clang && \
     cd src && \
     cd src && \
     make -j4 && \
     make -j4 && \
     make install && \
     make install && \
@@ -24,14 +25,13 @@ RUN cd treefrog-framework-${TFVER} && \
 WORKDIR /workspace
 WORKDIR /workspace
 COPY ./ ./
 COPY ./ ./
 
 
-RUN sed -i 's|DriverType=.*|DriverType=QPSQL|g' config/database.ini
-RUN sed -i 's|MultiProcessingModule=.*|MultiProcessingModule=thread|g' config/application.ini
-
 # 1. Generate Makefile
 # 1. Generate Makefile
-RUN qmake -r CONFIG+=release
+RUN qmake -r CONFIG+=release -spec linux-clang
 
 
 # 2. Compile applicaton
 # 2. Compile applicaton
 RUN make
 RUN make
+RUN sed -i 's|DriverType=.*|DriverType=QPSQL|g' config/database.ini
+RUN sed -i 's|MultiProcessingModule=.*|MultiProcessingModule=thread|g' config/application.ini
 
 
 # 3. Start TreeFrog
 # 3. Start TreeFrog
 CMD treefrog /workspace
 CMD treefrog /workspace

+ 9 - 9
frameworks/C++/treefrog/treefrog.dockerfile

@@ -1,19 +1,20 @@
 FROM buildpack-deps:bionic
 FROM buildpack-deps:bionic
 
 
 ENV DEBIAN_FRONTEND noninteractive
 ENV DEBIAN_FRONTEND noninteractive
-ENV TFVER=1.27.0
+ENV DEBCONF_NOWARNINGS yes
+ENV TFVER=1.30.0
 
 
-RUN apt-get update -yqq && apt-get install -yqq --no-install-recommends \
-    software-properties-common unzip cmake g++ gcc libjemalloc-dev qt5-qmake qt5-default qtbase5-dev \
+RUN apt-get update -yqq && apt-get upgrade -yq && apt-get install -yqq --no-install-recommends \
+    software-properties-common unzip wget make cmake gcc clang libjemalloc-dev qt5-qmake qt5-default qtbase5-dev \
     qtbase5-dev-tools libqt5sql5 libqt5sql5-mysql libqt5sql5-psql libqt5qml5 libqt5xml5 \
     qtbase5-dev-tools libqt5sql5 libqt5sql5-mysql libqt5sql5-psql libqt5qml5 libqt5xml5 \
     qtdeclarative5-dev libqt5quick5 libqt5quickparticles5 libqt5gui5 libqt5printsupport5 \
     qtdeclarative5-dev libqt5quick5 libqt5quickparticles5 libqt5gui5 libqt5printsupport5 \
-    libqt5widgets5 libqt5opengl5-dev libqt5quicktest5
+    libqt5widgets5 libqt5opengl5-dev libqt5quicktest5 libqt5sql5-sqlite libsqlite3-dev libmongoc-dev libbson-dev
 
 
 WORKDIR /usr/src
 WORKDIR /usr/src
 RUN wget -q https://github.com/treefrogframework/treefrog-framework/archive/v${TFVER}.tar.gz
 RUN wget -q https://github.com/treefrogframework/treefrog-framework/archive/v${TFVER}.tar.gz
 RUN tar xf v${TFVER}.tar.gz
 RUN tar xf v${TFVER}.tar.gz
 RUN cd treefrog-framework-${TFVER} && \
 RUN cd treefrog-framework-${TFVER} && \
-    ./configure && \
+    ./configure --spec=linux-clang && \
     cd src && \
     cd src && \
     make -j4 && \
     make -j4 && \
     make install && \
     make install && \
@@ -24,14 +25,13 @@ RUN cd treefrog-framework-${TFVER} && \
 WORKDIR /workspace
 WORKDIR /workspace
 COPY ./ ./
 COPY ./ ./
 
 
-RUN sed -i 's|DriverType=.*|DriverType=QMYSQL|g' config/database.ini
-RUN sed -i 's|MultiProcessingModule=.*|MultiProcessingModule=thread|g' config/application.ini
-
 # 1. Generate Makefile
 # 1. Generate Makefile
-RUN qmake -r CONFIG+=release
+RUN qmake -r CONFIG+=release -spec linux-clang
 
 
 # 2. Compile applicaton
 # 2. Compile applicaton
 RUN make
 RUN make
+RUN sed -i 's|DriverType=.*|DriverType=QMYSQL|g' config/database.ini
+RUN sed -i 's|MultiProcessingModule=.*|MultiProcessingModule=thread|g' config/application.ini
 
 
 # 3. Start TreeFrog
 # 3. Start TreeFrog
 CMD treefrog /workspace
 CMD treefrog /workspace