Skip to content

Commit 52bb7a7

Browse files
theunitheuni
committed
gitian: update descriptors to use a sane uniform output
1 parent ac0b239 commit 52bb7a7

File tree

3 files changed

+55
-36
lines changed

3 files changed

+55
-36
lines changed

‎contrib/gitian-descriptors/gitian-linux.yml

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -73,13 +73,13 @@ script: |
7373
./autogen.sh
7474
./configure --prefix=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'`
7575
make dist
76-
DISTNAME=`echo bitcoin-*.tar.gz`
77-
76+
SOURCEDIST=`echo bitcoin-*.tar.gz`
77+
DISTNAME=`echo ${SOURCEDIST} | sed 's/.tar.*//'`
7878
# Correct tar file order
7979
mkdir -p temp
8080
pushd temp
81-
tar xf ../$DISTNAME
82-
find bitcoin-* | sort | tar --no-recursion -c -T - | gzip -9n > ../$DISTNAME
81+
tar xf ../$SOURCEDIST
82+
find bitcoin-* | sort | tar --no-recursion -c -T - | gzip -9n > ../$SOURCEDIST
8383
popd
8484
8585
ORIGPATH="$PATH"
@@ -88,17 +88,22 @@ script: |
8888
export PATH=${BASEPREFIX}/${i}/native/bin:${ORIGPATH}
8989
mkdir -p distsrc-${i}
9090
cd distsrc-${i}
91-
tar --strip-components=1 -xf ../$DISTNAME
91+
INSTALLPATH=`pwd`/installed/${DISTNAME}
92+
mkdir -p ${INSTALLPATH}
93+
tar --strip-components=1 -xf ../$SOURCEDIST
9294
93-
./configure --prefix=${BASEPREFIX}/${i} --bindir=${OUTDIR}/${i}/bin --includedir=${OUTDIR}/${i}/include --libdir=${OUTDIR}/${i}/lib --disable-ccache --disable-maintainer-mode --disable-dependency-tracking ${CONFIGFLAGS}
95+
./configure --prefix=${BASEPREFIX}/${i} --bindir=${INSTALLPATH}/bin --includedir=${INSTALLPATH}/include --libdir=${INSTALLPATH}/lib --disable-ccache --disable-maintainer-mode --disable-dependency-tracking ${CONFIGFLAGS}
9496
make ${MAKEOPTS}
9597
make install-strip
96-
cd ..
98+
cd installed
99+
find . -name "lib*.la" -delete
100+
find . -name "lib*.a" -delete
101+
rm -rf ${DISTNAME}/lib/pkgconfig
102+
find . | sort | tar --no-recursion -c -T - | gzip -9n > ${OUTDIR}/${DISTNAME}-${i}.tar.gz
103+
cd ../../
97104
done
98105
mkdir -p $OUTDIR/src
99-
mv $DISTNAME $OUTDIR/src
100-
mv ${OUTDIR}/x86_64-* ${OUTDIR}/64
101-
mv ${OUTDIR}/i686-* ${OUTDIR}/32
106+
mv $SOURCEDIST $OUTDIR/src
107+
mv ${OUTDIR}/${DISTNAME}-x86_64-*.tar.gz ${OUTDIR}/${DISTNAME}-linux64.tar.gz
108+
mv ${OUTDIR}/${DISTNAME}-i686-*.tar.gz ${OUTDIR}/${DISTNAME}-linux32.tar.gz
102109
103-
# Delete unwanted stuff
104-
find ${OUTDIR} -name "lib*.la" -delete

‎contrib/gitian-descriptors/gitian-osx.yml

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -83,13 +83,14 @@ script: |
8383
./autogen.sh
8484
./configure --prefix=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'`
8585
make dist
86-
DISTNAME=`echo bitcoin-*.tar.gz`
86+
SOURCEDIST=`echo bitcoin-*.tar.gz`
87+
DISTNAME=`echo ${SOURCEDIST} | sed 's/.tar.*//'`
8788
8889
# Correct tar file order
8990
mkdir -p temp
9091
pushd temp
91-
tar xf ../$DISTNAME
92-
find bitcoin-* | sort | tar --no-recursion -c -T - | gzip -9n > ../$DISTNAME
92+
tar xf ../$SOURCEDIST
93+
find bitcoin-* | sort | tar --no-recursion -c -T - | gzip -9n > ../$SOURCEDIST
9394
popd
9495
9596
ORIGPATH="$PATH"
@@ -98,17 +99,23 @@ script: |
9899
export PATH=${BASEPREFIX}/${i}/native/bin:${ORIGPATH}
99100
mkdir -p distsrc-${i}
100101
cd distsrc-${i}
101-
tar --strip-components=1 -xf ../$DISTNAME
102+
INSTALLPATH=`pwd`/installed/${DISTNAME}
103+
mkdir -p ${INSTALLPATH}
104+
tar --strip-components=1 -xf ../$SOURCEDIST
102105
103-
./configure --prefix=${BASEPREFIX}/${i} --bindir=${OUTDIR}/${i}/bin --includedir=${OUTDIR}/${i}/include --libdir=${OUTDIR}/${i}/lib --disable-ccache --disable-maintainer-mode --disable-dependency-tracking ${CONFIGFLAGS}
106+
./configure --prefix=${BASEPREFIX}/${i} --bindir=${INSTALLPATH}/bin --includedir=${INSTALLPATH}/include --libdir=${INSTALLPATH}/lib --disable-ccache --disable-maintainer-mode --disable-dependency-tracking ${CONFIGFLAGS}
104107
make ${MAKEOPTS}
105108
make install-strip
106109
make deploy
107-
${WRAP_DIR}/dmg dmg Bitcoin-Qt.dmg ${OUTDIR}/Bitcoin-Qt.dmg
108-
cd ..
110+
${WRAP_DIR}/dmg dmg Bitcoin-Qt.dmg ${OUTDIR}/${DISTNAME}-osx.dmg
111+
112+
cd installed
113+
find . -name "lib*.la" -delete
114+
find . -name "lib*.a" -delete
115+
rm -rf ${DISTNAME}/lib/pkgconfig
116+
find . | sort | tar --no-recursion -c -T - | gzip -9n > ${OUTDIR}/${DISTNAME}-${i}.tar.gz
117+
cd ../../
109118
done
110119
mkdir -p $OUTDIR/src
111-
mv $DISTNAME $OUTDIR/src
112-
113-
# Delete unwanted stuff
114-
find ${OUTDIR} -name "lib*.la" -delete
120+
mv $SOURCEDIST $OUTDIR/src
121+
mv ${OUTDIR}/${DISTNAME}-x86_64-*.tar.gz ${OUTDIR}/${DISTNAME}-osx64.tar.gz

‎contrib/gitian-descriptors/gitian-win.yml

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ packages:
1717
- "mingw-w64"
1818
- "g++-mingw-w64"
1919
- "nsis"
20+
- "zip"
2021
reference_datetime: "2013-06-01 00:00:00"
2122
remotes:
2223
- "url": "https://github.com/bitcoin/bitcoin.git"
@@ -27,7 +28,7 @@ script: |
2728
HOSTS="x86_64-w64-mingw32 i686-w64-mingw32"
2829
CONFIGFLAGS="--enable-upnp-default"
2930
FAKETIME_HOST_PROGS="g++ ar ranlib nm windres strip"
30-
FAKETIME_PROGS="date makensis"
31+
FAKETIME_PROGS="date makensis zip"
3132
3233
export QT_RCC_TEST=1
3334
export GZIP="-9n"
@@ -75,13 +76,14 @@ script: |
7576
./autogen.sh
7677
./configure --prefix=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'`
7778
make dist
78-
DISTNAME=`echo bitcoin-*.tar.gz`
79+
SOURCEDIST=`echo bitcoin-*.tar.gz`
80+
DISTNAME=`echo ${SOURCEDIST} | sed 's/.tar.*//'`
7981
8082
# Correct tar file order
8183
mkdir -p temp
8284
pushd temp
83-
tar xf ../$DISTNAME
84-
find bitcoin-* | sort | tar --no-recursion -c -T - | gzip -9n > ../$DISTNAME
85+
tar xf ../$SOURCEDIST
86+
find bitcoin-* | sort | tar --no-recursion -c -T - | gzip -9n > ../$SOURCEDIST
8587
popd
8688
8789
ORIGPATH="$PATH"
@@ -90,19 +92,24 @@ script: |
9092
export PATH=${BASEPREFIX}/${i}/native/bin:${ORIGPATH}
9193
mkdir -p distsrc-${i}
9294
cd distsrc-${i}
93-
tar --strip-components=1 -xf ../$DISTNAME
95+
INSTALLPATH=`pwd`/installed/${DISTNAME}
96+
mkdir -p ${INSTALLPATH}
97+
tar --strip-components=1 -xf ../$SOURCEDIST
9498
95-
./configure --prefix=${BASEPREFIX}/${i} --bindir=${OUTDIR}/${i}/bin --includedir=${OUTDIR}/${i}/include --libdir=${OUTDIR}/${i}/lib --disable-ccache --disable-maintainer-mode --disable-dependency-tracking ${CONFIGFLAGS}
99+
./configure --prefix=${BASEPREFIX}/${i} --bindir=${INSTALLPATH}/bin --includedir=${INSTALLPATH}/include --libdir=${INSTALLPATH}/lib --disable-ccache --disable-maintainer-mode --disable-dependency-tracking ${CONFIGFLAGS}
96100
make ${MAKEOPTS}
97101
make deploy
98102
make install-strip
99103
cp -f bitcoin-*setup*.exe $OUTDIR/
100-
cd ..
104+
cd installed
105+
mv ${DISTNAME}/bin/*.dll ${DISTNAME}/lib/
106+
find . -name "lib*.la" -delete
107+
find . -name "lib*.a" -delete
108+
rm -rf ${DISTNAME}/lib/pkgconfig
109+
find . -type f | sort | zip -X@ ${OUTDIR}/${DISTNAME}-${i}.zip
110+
cd ../..
101111
done
102112
mkdir -p $OUTDIR/src
103-
mv $DISTNAME $OUTDIR/src
104-
mv ${OUTDIR}/x86_64-* ${OUTDIR}/64
105-
mv ${OUTDIR}/i686-* ${OUTDIR}/32
106-
107-
# Delete unwanted stuff
108-
find ${OUTDIR} -name "lib*.la" -delete
113+
mv $SOURCEDIST $OUTDIR/src
114+
mv ${OUTDIR}/${DISTNAME}-x86_64-*.zip ${OUTDIR}/${DISTNAME}-win64.zip
115+
mv ${OUTDIR}/${DISTNAME}-i686-*.zip ${OUTDIR}/${DISTNAME}-win32.zip

0 commit comments

Comments
 (0)