Mise à jour de GitLab prévue ce samedi 8 mai 2021 à partir de 9h00 CET | GitLab upgrade planned this Saturday May 4th of 2021 from 9:00 AM CET

Commit 36765a19 authored by Stéphane Veyret's avatar Stéphane Veyret Committed by Éloïs

Leave extra directory in generic delivery

Closes #1410
parent e440b262
...@@ -119,6 +119,7 @@ ifneq ($(ADD_DEBUG),Y) ...@@ -119,6 +119,7 @@ ifneq ($(ADD_DEBUG),Y)
@find -name "*.d.ts" -delete -o -name "*.js.map" -delete @find -name "*.d.ts" -delete -o -name "*.js.map" -delete
endif endif
@rm -rf $(DEV_FILES) @rm -rf $(DEV_FILES)
@mv release/extra .
@rm -rf coverage coverage.* release test @rm -rf coverage coverage.* release test
@rm -rf target @rm -rf target
@rm -rf neon/native/target @rm -rf neon/native/target
......
...@@ -72,14 +72,15 @@ cp -R "$DOWNLOADS/node-${NVER}-linux-${ARCH}" node ...@@ -72,14 +72,15 @@ cp -R "$DOWNLOADS/node-${NVER}-linux-${ARCH}" node
cd .. cd ..
# Creating DEB packaging # Creating DEB packaging
cp -r "$DOWNLOADS"/duniter/release/extra/debian/package duniter-${ARCH} mv duniter/extra/debian/package duniter-${ARCH}
mkdir -p duniter-${ARCH}/opt/duniter/ mkdir -p duniter-${ARCH}/opt/duniter/
mkdir -p duniter-${ARCH}/etc/bash_completion.d/ mkdir -p duniter-${ARCH}/etc/bash_completion.d/
chmod 755 duniter-${ARCH}/DEBIAN/post* chmod 755 duniter-${ARCH}/DEBIAN/post*
chmod 755 duniter-${ARCH}/DEBIAN/pre* chmod 755 duniter-${ARCH}/DEBIAN/pre*
sed -i "s/Version:.*/Version:$DUNITER_DEB_VER/g" duniter-${ARCH}/DEBIAN/control sed -i "s/Version:.*/Version:$DUNITER_DEB_VER/g" duniter-${ARCH}/DEBIAN/control
echo "Extra..." echo "Extra..."
cp "$DOWNLOADS"/duniter/release/extra/completion/duniter_completion.bash duniter-${ARCH}/etc/bash_completion.d/duniter_completion.bash mv duniter/extra/completion/duniter_completion.bash duniter-${ARCH}/etc/bash_completion.d/duniter_completion.bash
rm -rf duniter/extra
echo "Zipping..." echo "Zipping..."
cd duniter cd duniter
zip -qr ../duniter.zip * zip -qr ../duniter.zip *
......
...@@ -34,7 +34,7 @@ create_desc() { ...@@ -34,7 +34,7 @@ create_desc() {
# Parameters: # Parameters:
# 1. Building directory. # 1. Building directory.
build_extra_desktop() { build_extra_desktop() {
cp -r "${ROOT}/release/extra/desktop/"* "${1}" || exit 1 mv "${RELEASES}/desktop_/extra/desktop/"* "${1}" || exit 1
} }
# Server specific building phase. # Server specific building phase.
...@@ -43,9 +43,9 @@ build_extra_desktop() { ...@@ -43,9 +43,9 @@ build_extra_desktop() {
# 1. Building directory. # 1. Building directory.
build_extra_server() { build_extra_server() {
mkdir -p "${1}/lib/systemd/system" || exit 1 mkdir -p "${1}/lib/systemd/system" || exit 1
cp "${ROOT}/release/extra/systemd/duniter.service" "${1}/lib/systemd/system" || exit 1 mv "${RELEASES}/server_/extra/systemd/duniter.service" "${1}/lib/systemd/system" || exit 1
mkdir -p "${1}/etc/bash_completion.d/" || exit 1 mkdir -p "${1}/etc/bash_completion.d/" || exit 1
cp "${ROOT}/release/extra/completion/duniter_completion.bash" "${1}/etc/bash_completion.d/duniter_completion.bash" || exit 1 mv "${RELEASES}/server_/extra/completion/duniter_completion.bash" "${1}/etc/bash_completion.d/duniter_completion.bash" || exit 1
} }
# Debian package building. # Debian package building.
...@@ -56,7 +56,7 @@ build_extra_server() { ...@@ -56,7 +56,7 @@ build_extra_server() {
build_deb_pack() { build_deb_pack() {
rm -rf "${RELEASES}/duniter-x64" rm -rf "${RELEASES}/duniter-x64"
mkdir "${RELEASES}/duniter-x64" || exit 1 mkdir "${RELEASES}/duniter-x64" || exit 1
cp -r "${ROOT}/release/extra/debian/package/"* "${RELEASES}/duniter-x64" || exit 1 mv "${RELEASES}/${1}_/extra/debian/package/"* "${RELEASES}/duniter-x64" || exit 1
build_extra_${1} "${RELEASES}/duniter-x64" build_extra_${1} "${RELEASES}/duniter-x64"
mkdir -p "${RELEASES}/duniter-x64/opt/duniter/" || exit 1 mkdir -p "${RELEASES}/duniter-x64/opt/duniter/" || exit 1
chmod 755 "${RELEASES}/duniter-x64/DEBIAN/"post* || exit 1 chmod 755 "${RELEASES}/duniter-x64/DEBIAN/"post* || exit 1
...@@ -64,6 +64,7 @@ build_deb_pack() { ...@@ -64,6 +64,7 @@ build_deb_pack() {
sed -i "s/Version:.*/Version:${DUNITER_DEB_VER}/g" "${RELEASES}/duniter-x64/DEBIAN/control" || exit 1 sed -i "s/Version:.*/Version:${DUNITER_DEB_VER}/g" "${RELEASES}/duniter-x64/DEBIAN/control" || exit 1
cd "${RELEASES}/${1}_/" cd "${RELEASES}/${1}_/"
rm -rf extra
zip -yqr "${RELEASES}/duniter-x64/opt/duniter/duniter.zip" * || exit 1 zip -yqr "${RELEASES}/duniter-x64/opt/duniter/duniter.zip" * || exit 1
sed -i "s/Package: .*/Package: ${2}/g" "${RELEASES}/duniter-x64/DEBIAN/control" || exit 1 sed -i "s/Package: .*/Package: ${2}/g" "${RELEASES}/duniter-x64/DEBIAN/control" || exit 1
......
...@@ -27,7 +27,8 @@ RUN curl https://sh.rustup.rs -sSf | sh -s -- -y ...@@ -27,7 +27,8 @@ RUN curl https://sh.rustup.rs -sSf | sh -s -- -y
RUN PATH=${HOME}/.cargo/bin:${PATH} \ RUN PATH=${HOME}/.cargo/bin:${PATH} \
RUSTFLAGS="-C target-feature=-crt-static" \ RUSTFLAGS="-C target-feature=-crt-static" \
make -C release ADD_DEBUG=N server-gui clean \ make -C release ADD_DEBUG=N server-gui clean \
&& mv release/docker/duniter.sh work/docker.sh && cp release/docker/duniter.sh work/docker.sh \
&& rm -rf work/extra
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
# Final Stage # Final Stage
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment