Peerplays_Blockchain/peerplays_migrated
1
0
Fork 0
Code Issues 35 Pull requests 4 Projects Releases 20 Packages Wiki Activity Actions

Fix Ubuntu 18 build

Browse source
This commit is contained in:
timur 2022-12-16 00:34:33 +00:00 committed by serkixenos
parent 1bf5c82101
commit 578edc56d8
3 changed files with 102 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
Dockerfile
View file

@ -11,15 +11,14 @@ RUN \
apt-utils \ apt-utils \
autoconf \ autoconf \
bash \ bash \
bison \
build-essential \ build-essential \
ca-certificates \ ca-certificates \
cmake \
dnsutils \ dnsutils \
doxygen \
expect \ expect \
flex \
git \ git \
graphviz \ graphviz \
libboost-all-dev \
libbz2-dev \ libbz2-dev \
libcurl4-openssl-dev \ libcurl4-openssl-dev \
libncurses-dev \ libncurses-dev \
@ -35,7 +34,6 @@ RUN \
ntp \ ntp \
openssh-server \ openssh-server \
pkg-config \ pkg-config \
perl \
python3 \ python3 \
python3-jinja2 \ python3-jinja2 \
sudo \ sudo \
@ -53,6 +51,31 @@ RUN echo 'peerplays:peerplays' | chpasswd
# SSH # SSH
EXPOSE 22 EXPOSE 22
#===============================================================================
# Boost setup
#===============================================================================
WORKDIR /home/peerplays/
RUN \
wget https://boostorg.jfrog.io/artifactory/main/release/1.72.0/source/boost_1_72_0.tar.gz && \
tar -xzvf boost_1_72_0.tar.gz boost_1_72_0 && \
cd boost_1_72_0/ && \
./bootstrap.sh && \
./b2 install
#===============================================================================
# cmake setup
#===============================================================================
WORKDIR /home/peerplays/
RUN \
wget -c 'https://cmake.org/files/v3.23/cmake-3.23.1-linux-x86_64.sh' -O cmake-3.23.1-linux-x86_64.sh && \
chmod 755 ./cmake-3.23.1-linux-x86_64.sh && \
./cmake-3.23.1-linux-x86_64.sh --prefix=/usr/ --skip-license && \
cmake --version
#=============================================================================== #===============================================================================
# libzmq setup # libzmq setup
#=============================================================================== #===============================================================================
@ -85,6 +108,37 @@ RUN \
make -j$(nproc) install && \ make -j$(nproc) install && \
ldconfig ldconfig
#===============================================================================
# Doxygen setup
#===============================================================================
WORKDIR /home/peerplays/
RUN \
sudo apt install -y bison flex && \
wget https://github.com/doxygen/doxygen/archive/refs/tags/Release_1_8_17.tar.gz && \
tar -xvf Release_1_8_17.tar.gz && \
cd doxygen-Release_1_8_17 && \
mkdir build && \
cd build && \
cmake .. && \
make -j$(nproc) install && \
ldconfig
#===============================================================================
# Perl setup
#===============================================================================
WORKDIR /home/peerplays/
RUN \
wget https://github.com/Perl/perl5/archive/refs/tags/v5.30.0.tar.gz && \
tar -xvf v5.30.0.tar.gz && \
cd perl5-5.30.0 && \
./Configure -des && \
make -j$(nproc) install && \
ldconfig
#=============================================================================== #===============================================================================
# Peerplays setup # Peerplays setup
#=============================================================================== #===============================================================================
@ -106,6 +160,9 @@ ADD . peerplays
# Configure Peerplays # Configure Peerplays
RUN \ RUN \
cd peerplays && \ cd peerplays && \
git submodule update --init --recursive && \
git symbolic-ref --short HEAD && \
git log --oneline -n 5 && \
mkdir build && \ mkdir build && \
cd build && \ cd build && \
cmake -DCMAKE_BUILD_TYPE=Release .. cmake -DCMAKE_BUILD_TYPE=Release ..

44
Dockerfile.18.04
View file

@ -11,11 +11,12 @@ RUN \
apt-utils \ apt-utils \
autoconf \ autoconf \
bash \ bash \
bison \
build-essential \ build-essential \
ca-certificates \ ca-certificates \
dnsutils \ dnsutils \
doxygen \
expect \ expect \
flex \
git \ git \
graphviz \ graphviz \
libbz2-dev \ libbz2-dev \
@ -33,7 +34,6 @@ RUN \
ntp \ ntp \
openssh-server \ openssh-server \
pkg-config \ pkg-config \
perl \
python3 \ python3 \
python3-jinja2 \ python3-jinja2 \
sudo \ sudo \
@ -58,9 +58,9 @@ EXPOSE 22
WORKDIR /home/peerplays/ WORKDIR /home/peerplays/
RUN \ RUN \
wget -c 'https://boostorg.jfrog.io/artifactory/main/release/1.71.0/source/boost_1_71_0.tar.bz2' -O boost_1_71_0.tar.bz2 && \ wget https://boostorg.jfrog.io/artifactory/main/release/1.72.0/source/boost_1_72_0.tar.gz && \
tar xjf boost_1_71_0.tar.bz2 && \ tar -xzvf boost_1_72_0.tar.gz boost_1_72_0 && \
cd boost_1_71_0/ && \ cd boost_1_72_0/ && \
./bootstrap.sh && \ ./bootstrap.sh && \
./b2 install ./b2 install
@ -108,6 +108,37 @@ RUN \
make -j$(nproc) install && \ make -j$(nproc) install && \
ldconfig ldconfig
#===============================================================================
# Doxygen setup
#===============================================================================
WORKDIR /home/peerplays/
RUN \
sudo apt install -y bison flex && \
wget https://github.com/doxygen/doxygen/archive/refs/tags/Release_1_8_17.tar.gz && \
tar -xvf Release_1_8_17.tar.gz && \
cd doxygen-Release_1_8_17 && \
mkdir build && \
cd build && \
cmake .. && \
make -j$(nproc) install && \
ldconfig
#===============================================================================
# Perl setup
#===============================================================================
WORKDIR /home/peerplays/
RUN \
wget https://github.com/Perl/perl5/archive/refs/tags/v5.30.0.tar.gz && \
tar -xvf v5.30.0.tar.gz && \
cd perl5-5.30.0 && \
./Configure -des && \
make -j$(nproc) install && \
ldconfig
#=============================================================================== #===============================================================================
# Peerplays setup # Peerplays setup
#=============================================================================== #===============================================================================
@ -129,6 +160,9 @@ ADD . peerplays
# Configure Peerplays # Configure Peerplays
RUN \ RUN \
cd peerplays && \ cd peerplays && \
git submodule update --init --recursive && \
git symbolic-ref --short HEAD && \
git log --oneline -n 5 && \
mkdir build && \ mkdir build && \
cd build && \ cd build && \
cmake -DCMAKE_BUILD_TYPE=Release .. cmake -DCMAKE_BUILD_TYPE=Release ..

4
libraries/wallet/include/graphene/wallet/wallet.hpp
View file

@ -980,13 +980,13 @@ class wallet_api
* *
* @return true if the label was set, otherwise false * @return true if the label was set, otherwise false
*/ */
bool set_key_label( public_key_type, string label ); bool set_key_label( public_key_type key, string label );
/** Get label of a public key. /** Get label of a public key.
* @param key a public key * @param key a public key
* @return the label if already set by \c set_key_label(), or an empty string if not set * @return the label if already set by \c set_key_label(), or an empty string if not set
*/ */
string get_key_label( public_key_type )const; string get_key_label( public_key_type key )const;
/* Get the public key associated with a given label. /* Get the public key associated with a given label.
* @param label a label * @param label a label