mirror of
https://github.com/AuxXxilium/kmod.git
synced 2024-11-23 23:10:53 +07:00
Remove bootstrap* scripts
Let's just use autogen.sh, no need for wrapper scripts. Now `autogen.sh c` uses the same recommended options for developing kmod and also accepts extra arguments.
This commit is contained in:
parent
edc9d81754
commit
028d4df365
@ -22,7 +22,7 @@ matrix:
|
||||
env: MYCC=gcc-4.9
|
||||
- compiler: clang
|
||||
env: MYCC=clang
|
||||
script: ./bootstrap-configure && make -j && make -j check
|
||||
script: ./autogen.sh c && make -j && make -j check
|
||||
notifications:
|
||||
irc:
|
||||
channels:
|
||||
|
@ -459,7 +459,7 @@ endif
|
||||
|
||||
kmod-coverity-%.tar.xz:
|
||||
rm -rf $< cov-int
|
||||
./bootstrap-configure --disable-python --disable-manpages
|
||||
./autogen.sh c --disable-python --disable-manpages
|
||||
make clean
|
||||
cov-build --dir cov-int make -j 4
|
||||
tar caf $@ cov-int
|
||||
|
4
README
4
README
@ -66,8 +66,8 @@ To compile and install run:
|
||||
Hacking
|
||||
=======
|
||||
|
||||
Run 'bootstrap' script before configure. If you want to accept the recommended
|
||||
flags, you just need to run 'bootstrap-configure'. Note that the recommended
|
||||
Run 'autogen.sh' script before configure. If you want to accept the recommended
|
||||
flags, you just need to run 'autogen.sh c'. Note that the recommended
|
||||
flags require cython be installed to compile successfully.
|
||||
|
||||
Make sure to read the CODING-STYLE file and the other READMEs: libkmod/README
|
||||
|
@ -1 +0,0 @@
|
||||
bootstrap
|
69
autogen.sh
Executable file
69
autogen.sh
Executable file
@ -0,0 +1,69 @@
|
||||
#!/bin/sh
|
||||
|
||||
set -e
|
||||
|
||||
oldpwd=$(pwd)
|
||||
topdir=$(dirname $0)
|
||||
cd $topdir
|
||||
|
||||
gtkdocize --docdir libkmod/docs || touch libkmod/docs/gtk-doc.make
|
||||
autoreconf --force --install --symlink
|
||||
|
||||
libdir() {
|
||||
echo $(cd "$1/$(gcc -print-multi-os-directory)"; pwd)
|
||||
}
|
||||
|
||||
args="\
|
||||
--prefix=/usr \
|
||||
--sysconfdir=/etc \
|
||||
--libdir=$(libdir /usr/lib) \
|
||||
"
|
||||
|
||||
if [ -f "$topdir/.config.args" ]; then
|
||||
args="$args $(cat $topdir/.config.args)"
|
||||
fi
|
||||
|
||||
if [ ! -L /bin ]; then
|
||||
args="$args \
|
||||
--with-rootprefix= \
|
||||
--with-rootlibdir=$(libdir /lib) \
|
||||
"
|
||||
fi
|
||||
|
||||
cd $oldpwd
|
||||
|
||||
hackargs="--enable-debug --enable-python --with-xz --with-zlib"
|
||||
|
||||
if [ "x$1" = "xc" ]; then
|
||||
shift
|
||||
$topdir/configure CFLAGS='-g -O2' $args $hackargs "$@"
|
||||
make clean
|
||||
elif [ "x$1" = "xg" ]; then
|
||||
shift
|
||||
$topdir/configure CFLAGS='-g -Og' $args "$@"
|
||||
make clean
|
||||
elif [ "x$1" = "xl" ]; then
|
||||
shift
|
||||
$topdir/configure CC=clang CXX=clang++ $args "$@"
|
||||
make clean
|
||||
elif [ "x$1" = "xa" ]; then
|
||||
shift
|
||||
$topdir/configure CFLAGS='-g -O2 -Wsuggest-attribute=pure -Wsuggest-attribute=const' $args "$@"
|
||||
make clean
|
||||
elif [ "x$1" = "xs" ]; then
|
||||
shift
|
||||
scan-build $topdir/configure CFLAGS='-g -O0 -std=gnu11' $args "$@"
|
||||
scan-build make
|
||||
else
|
||||
echo
|
||||
echo "----------------------------------------------------------------"
|
||||
echo "Initialized build system. For a common configuration please run:"
|
||||
echo "----------------------------------------------------------------"
|
||||
echo
|
||||
echo "$topdir/configure CFLAGS='-g -O2' $args"
|
||||
echo
|
||||
echo If you are debugging or hacking on kmod, consider configuring
|
||||
echo like below:
|
||||
echo
|
||||
echo "$topdir/configure CFLAGS='-g -O2' $args $hackargs"
|
||||
fi
|
64
bootstrap
64
bootstrap
@ -1,64 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
set -e
|
||||
|
||||
oldpwd=$(pwd)
|
||||
topdir=$(dirname $0)
|
||||
cd $topdir
|
||||
|
||||
gtkdocize --docdir libkmod/docs || touch libkmod/docs/gtk-doc.make
|
||||
autoreconf --force --install --symlink
|
||||
|
||||
libdir() {
|
||||
echo $(cd "$1/$(gcc -print-multi-os-directory)"; pwd)
|
||||
}
|
||||
|
||||
args="\
|
||||
--prefix=/usr \
|
||||
--sysconfdir=/etc \
|
||||
--libdir=$(libdir /usr/lib) \
|
||||
"
|
||||
|
||||
if [ -f "$topdir/.config.args" ]; then
|
||||
args="$args $(cat $topdir/.config.args)"
|
||||
fi
|
||||
|
||||
if [ ! -L /bin ]; then
|
||||
args="$args \
|
||||
--with-rootprefix= \
|
||||
--with-rootlibdir=$(libdir /lib) \
|
||||
"
|
||||
fi
|
||||
|
||||
cd $oldpwd
|
||||
|
||||
hackargs="--enable-debug --enable-python --with-xz --with-zlib"
|
||||
|
||||
if [ "x$1" = "xc" ]; then
|
||||
$topdir/configure CFLAGS='-g -O2' $args
|
||||
make clean
|
||||
elif [ "x$1" = "xg" ]; then
|
||||
$topdir/configure CFLAGS='-g -Og' $args
|
||||
make clean
|
||||
elif [ "x$1" = "xl" ]; then
|
||||
$topdir/configure CC=clang CXX=clang++ $args
|
||||
make clean
|
||||
elif [ "x$1" = "xa" ]; then
|
||||
$topdir/configure CFLAGS='-g -O2 -Wsuggest-attribute=pure -Wsuggest-attribute=const' $args
|
||||
make clean
|
||||
elif [ "x$1" = "xs" ]; then
|
||||
scan-build $topdir/configure CFLAGS='-g -O0 -std=gnu11' $args
|
||||
scan-build make
|
||||
else
|
||||
echo
|
||||
echo "----------------------------------------------------------------"
|
||||
echo "Initialized build system. For a common configuration please run:"
|
||||
echo "----------------------------------------------------------------"
|
||||
echo
|
||||
echo "$topdir/configure CFLAGS='-g -O2' $args"
|
||||
echo
|
||||
echo If you are debugging or hacking on kmod, consider configuring
|
||||
echo like below:
|
||||
echo
|
||||
echo "$topdir/configure CFLAGS='-g -O2' $args $hackargs"
|
||||
fi
|
@ -1,4 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
. ./bootstrap && \
|
||||
exec ./configure CFLAGS="-g -O2" $args $hackargs "$@"
|
@ -58,4 +58,4 @@ pay attention when writing a test:
|
||||
too, as long as you tell them to operate on child process.
|
||||
|
||||
9 - Make sure test passes when using "default" build flags, i.e. by running
|
||||
bootstrap-configure instead of simpler bootstrap/autogen.sh
|
||||
'autogen.sh c'
|
||||
|
Loading…
Reference in New Issue
Block a user