| commit 676: | accf8aba6341 |
| parent 675: | 51e4ba115fc5 |
| branch: | new-ws2 |
Check both out-of-tree and in-tree builds
---
dist/distcheck | 47 ++++++++++++++++++++++++++++++-----------------
1 files changed, 30 insertions(+), 17 deletions(-)
14 months ago
Changed (Δ353 bytes):
raw changeset »
dist/distcheck (30 lines added, 17 lines removed)
Up to file-list dist/distcheck:
| … | … | @@ -34,21 +34,34 @@ else |
34 |
34 |
error "can't find the source tarball" |
35 |
35 |
fi |
36 |
36 |
|
37 |
docmd mkdir build |
|
38 |
docmd cd build |
|
39 |
# docmd ./configure |
|
40 |
# docmd make |
|
41 |
docmd cmake ../$package |
|
42 |
docmd make |
|
43 |
docmd make install DESTDIR=$tmpdir/_inst |
|
44 |
docmd make uninstall DESTDIR=$tmpdir/_inst |
|
45 |
filesleft=`find $tmpdir/_inst -type f | grep -v share/mime | grep -v share/icons/hicolor/icon-theme.cache` |
|
46 |
if [ ! -z "$filesleft" ]; then |
|
47 |
error "files left after make clean: $filesleft" |
|
48 |
fi |
|
49 |
docmd make package_source |
|
50 |
docmd $unpack $tarball |
|
51 |
docmd diff -r $package ../$package |
|
52 |
docmd cd $builddir |
|
37 |
check_build() { |
|
38 |
saved_dir=`pwd` |
|
39 |
docmd mkdir -p $1 |
|
40 |
build_dir=`cd $1 && pwd` |
|
41 |
src_dir=`cd $2 && pwd` |
|
42 |
docmd cd $build_dir |
|
43 |
docmd $src_dir/configure |
|
44 |
# docmd cmake $src_dir |
|
45 |
docmd make |
|
46 |
docmd rm -rf $tmpdir/_inst |
|
47 |
docmd make install DESTDIR=$tmpdir/_inst |
|
48 |
docmd make uninstall DESTDIR=$tmpdir/_inst |
|
49 |
filesleft=`find $tmpdir/_inst -type f | grep -v share/mime | grep -v share/icons/hicolor/icon-theme.cache` |
|
50 |
if [ ! -z "$filesleft" ]; then |
|
51 |
error "files left after make clean: $filesleft" |
|
52 |
fi |
|
53 |
if [ $src_dir != $build_dir ]; then |
|
54 |
docmd make package_source |
|
55 |
docmd $unpack $tarball |
|
56 |
docmd diff -r $package $src_dir |
|
57 |
fi |
|
58 |
docmd rm -rf $tmpdir/_inst |
|
59 |
docmd cd $saved_dir |
|
60 |
} |
|
61 |
||
62 |
echo "++ Checking out-of-tree build" |
|
63 |
check_build build $package |
|
64 |
echo "++ Checking in-tree build" |
|
65 |
check_build $package $package |
|
53 |
66 |
docmd rm -r $tmpdir |
54 |
echo "++ |
|
67 |
echo "++ Good! Archive ready for distribution: $tarball" |
