From 40bdc0ada356f64872c352d1958ea7863c24d9dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Veyret?= <sveyret@axway.com>
Date: Fri, 12 Jan 2018 13:23:32 +0100
Subject: [PATCH] Change contrib directory to extra
The contrib name (taken from other open-source projects) seems a bit confusing. Extra will probably be clearer.
The Debian data where moved under linux directory, but are also used for ARM. As these are files used to build the package (and not vital to the functionning of duniter)
they have their place in extra.
The Debian data are used by many scripts which were not updated after debian folder move.
---
release/arch/arm/build-arm.sh | 2 +-
release/arch/linux/build-lin.sh | 4 ++--
.../linux => extra}/debian/package/DEBIAN/control | 0
.../linux => extra}/debian/package/DEBIAN/postinst | 0
.../{arch/linux => extra}/debian/package/DEBIAN/prerm | 0
.../desktop/usr/share/applications/duniter.desktop | 0
release/new_prerelease.sh | 10 +++++-----
release/new_version.sh | 4 ++--
8 files changed, 10 insertions(+), 10 deletions(-)
rename release/{arch/linux => extra}/debian/package/DEBIAN/control (100%)
rename release/{arch/linux => extra}/debian/package/DEBIAN/postinst (100%)
rename release/{arch/linux => extra}/debian/package/DEBIAN/prerm (100%)
rename release/{contrib => extra}/desktop/usr/share/applications/duniter.desktop (100%)
diff --git a/release/arch/arm/build-arm.sh b/release/arch/arm/build-arm.sh
index 68d0bcf45..fc0891fd3 100755
--- a/release/arch/arm/build-arm.sh
+++ b/release/arch/arm/build-arm.sh
@@ -86,7 +86,7 @@ mkdir -p duniter_release
cp -R ${SRC}/* duniter_release/
# Creating DEB packaging
-mv duniter_release/release/arch/debian/package duniter-${ARCH}
+mv duniter_release/release/extra/debian/package duniter-${ARCH}
mkdir -p duniter-${ARCH}/opt/duniter/
chmod 755 duniter-${ARCH}/DEBIAN/post*
chmod 755 duniter-${ARCH}/DEBIAN/pre*
diff --git a/release/arch/linux/build-lin.sh b/release/arch/linux/build-lin.sh
index e01deaa4f..6abf5c16f 100644
--- a/release/arch/linux/build-lin.sh
+++ b/release/arch/linux/build-lin.sh
@@ -173,9 +173,9 @@ tar czf "${BIN}/duniter-desktop-${DUNITER_TAG}-linux-x64.tar.gz" * || exit 1
build_deb_pack() {
rm -rf "${RELEASES}/duniter-x64"
mkdir "${RELEASES}/duniter-x64" || exit 1
- cp -r "${ROOT}/release/arch/linux/debian/package/"* "${RELEASES}/duniter-x64" || exit 1
+ cp -r "${ROOT}/release/extra/debian/package/"* "${RELEASES}/duniter-x64" || exit 1
if [[ "${1}" == "desktop" ]]; then
- cp -r "${ROOT}/release/contrib/desktop/"* "${RELEASES}/duniter-x64" || exit 1
+ cp -r "${ROOT}/release/extra/desktop/"* "${RELEASES}/duniter-x64" || exit 1
fi
mkdir -p "${RELEASES}/duniter-x64/opt/duniter/" || exit 1
chmod 755 "${RELEASES}/duniter-x64/DEBIAN/"post* || exit 1
diff --git a/release/arch/linux/debian/package/DEBIAN/control b/release/extra/debian/package/DEBIAN/control
similarity index 100%
rename from release/arch/linux/debian/package/DEBIAN/control
rename to release/extra/debian/package/DEBIAN/control
diff --git a/release/arch/linux/debian/package/DEBIAN/postinst b/release/extra/debian/package/DEBIAN/postinst
similarity index 100%
rename from release/arch/linux/debian/package/DEBIAN/postinst
rename to release/extra/debian/package/DEBIAN/postinst
diff --git a/release/arch/linux/debian/package/DEBIAN/prerm b/release/extra/debian/package/DEBIAN/prerm
similarity index 100%
rename from release/arch/linux/debian/package/DEBIAN/prerm
rename to release/extra/debian/package/DEBIAN/prerm
diff --git a/release/contrib/desktop/usr/share/applications/duniter.desktop b/release/extra/desktop/usr/share/applications/duniter.desktop
similarity index 100%
rename from release/contrib/desktop/usr/share/applications/duniter.desktop
rename to release/extra/desktop/usr/share/applications/duniter.desktop
diff --git a/release/new_prerelease.sh b/release/new_prerelease.sh
index bd5d78caa..1a3a0a520 100755
--- a/release/new_prerelease.sh
+++ b/release/new_prerelease.sh
@@ -42,13 +42,13 @@ for asset in $EXPECTED_ASSETS; do
echo "Missing asset: $asset"
- # Debian
+ # Linux
if [[ $asset == *"linux-x64.deb" ]] || [[ $asset == *"linux-x64.tar.gz" ]]; then
if [[ $ARCH == "x86_64" ]]; then
- echo "Starting Debian build..."
- ./release/scripts/build.sh make deb $TAG
- DEB_PATH="$PWD/release/arch/debian/$asset"
- node ./release/scripts/upload-release.js $TOKEN $TAG $DEB_PATH
+ echo "Starting Linux build..."
+ ./release/scripts/build.sh make lin $TAG
+ LIN_PATH="$PWD/release/arch/linux/$asset"
+ node ./release/scripts/upload-release.js $TOKEN $TAG $LIN_PATH
else
echo "This computer cannot build this asset, required architecture is 'x86_64'. Skipping."
fi
diff --git a/release/new_version.sh b/release/new_version.sh
index fbbda1bdc..6195860cb 100755
--- a/release/new_version.sh
+++ b/release/new_version.sh
@@ -8,7 +8,7 @@ if [[ $1 =~ ^[0-9]+.[0-9]+.[0-9]+((a|b)[0-9]+)?$ ]]; then
echo "Changing to version: $1"
# Change the version in package.json and test file
sed -i "s/version\": .*/version\": \"$1\",/g" package.json
- sed -i "s/Version: .*/Version: $1/g" release/arch/debian/package/DEBIAN/control
+ sed -i "s/Version: .*/Version: $1/g" release/extra/debian/package/DEBIAN/control
sed -i "s/version').equal('.*/version').equal('$1');/g" test/integration/branches.js
sed -i "s/ release: .*/ release: v$1/g" appveyor.yml
@@ -21,7 +21,7 @@ if [[ $1 =~ ^[0-9]+.[0-9]+.[0-9]+((a|b)[0-9]+)?$ ]]; then
# Commit
git reset HEAD
- git add package.json test/integration/branches.js gui/index.html release/arch/debian/package/DEBIAN/control release/arch/windows/duniter.iss
+ git add package.json test/integration/branches.js gui/index.html release/extra/debian/package/DEBIAN/control release/arch/windows/duniter.iss
git commit -m "v$1"
git tag "v$1"
else
--
GitLab