Changeset 56

Timestamp:

12/17/05 07:35:41 (3 years ago)

Author:

athomas

Message:

• Refactored build section so it's cleaner.
  
• Fixed self-packaging so it should actually work if you don't already have installwatch installed.
  
• Added --build-with option.
  
• By using --skip-build and --install-with, bpkg effectively has the same functionality as checkinstall.
  

Files:

• bpkg/trunk/bpkg (modified) (11 diffs)
• bpkg/trunk/Makefile (modified) (4 diffs)

bpkg/trunk/bpkg

@@ -33 +33 @@
-# Where to store built packages
-PKGDIR=$PWD
-configure
-CONFIGURE
+build
+BUILD
-# Program used to download source
-DOWNLOADER='wget -c'
@@ -47 +47 @@
-# Load system config
-test -r /etc/bpkg.conf && . /etc/bpkg.conf
+# Load per-user config
+test -r ~/.bpkgrc && . ~/.bpkgrc
-
-#
-# XXXXXXXXXXXXXX Not really user-modifiable below here XXXXXXXXXXXXX
-#
-4
+5
-PACKAGER=auto
-SELF=`basename $0`
@@ -63 +65 @@
-DESTROOT=/tmp/$SELF.$PACKAGE.$$.pkg
-TMPFILES="$TMPDIR $DESTROOT $INSTALLLOG"
-
+
+
+
-EXPLICIT_PACKAGE=0
-REQUIRED_PROGRAMS='installwatch cpio perl tar bzip2 unzip gzip'
@@ -135 +139 @@
-                export INSTALLWATCH_BACKUP_PATH=$SRCDIR/backup-`date +%Y%m%d%H%M%S-backup`
-        fi
-MAKEINSTALL
+INSTALLER
-        if [ $BACKUP = 1 -a -d $INSTALLWATCH_BACKUP_PATH ]; then
-                notice "Archiving backup to $INSTALLWATCH_BACKUP_PATH.tar.gz"
@@ -152 +156 @@
-}
-
+# Builders
+build_xmkmf()
+{
+        notice "running xmkmf on Imakefile"
+        xmkmf || error "xmkmf failed"
+}
+
+build_autoconf()
+{
+        if ! grep -i autoconf ./configure > /dev/null; then
+                notice "./configure does not seem to be generated by autoconf, running anyway"
+        fi
+        notice "running './configure --prefix=$PREFIX --sysconfdir=$SYSCONFDIR --localstatedir=$LOCALSTATEDIR --datadir=$DATADIR $@'"
+        ./configure --prefix=$PREFIX --sysconfdir=$SYSCONFDIR --localstatedir=$LOCALSTATEDIR --datadir=$DATADIR "$@" || error "configure failed"
+        make
+}
+
+build_autogen()
+{
+        notice "no ./configure, but we have ./autogen.sh - running it"
+        ./autogen.sh --prefix=$PREFIX --sysconfdir=$SYSCONFDIR --localstatedir=$LOCALSTATEDIR --datadir=$DATADIR "$@" || error "./autogen.sh failed"
+        if test ! -r Makefile; then
+                notice "./autogen.sh did not run configure, running it now"
+                build_autoconf
+        fi
+        make
+}
+
+build_make()
+{
+        notice "source doesn't appear to use autoconf or Imake, trying standard make"
+        test -r $MAKEFILE || MF=makefile
+        test -r $MAKEFILE || MF=GNUmakefile
+        test -r $MAKEFILE || error "can't determine makefile (tried Makefile, makefile and GNUmakefile)"
+        # Change /usr/local to $PREFIX
+        if grep /usr/local $MAKEFILE > /dev/null; then
+                notice "Changing all instances of /usr/local in $MAKEFILE to $PREFIX"
+                sed -e "s,/usr/local,$PREFIX,g" $MAKEFILE > $MAKEFILE~ && mv $MAKEFILE~ $MAKEFILE
+        fi
+        make
+}
+
+build_jam()
+{
+        jam
+}
+
+build_python()
+{
+        python setup.py build -f
+}
+
+build_perl()
+{
+        perl Makefile.PL || error "Makefile generation failed"
+        make
+}
+
+build_qmake()
+{
+        qmake $PACKAGE.pro || error "qmake failed"
+        make
+}
+
+build_custom()
+{
+        eval "$CUSTOMBUILDER" || error "custom builder failed"
+}
+
+# Packagers
-packager_slackware()
-{
@@ -302 +376 @@
-quitloop=0
-while [ $quitloop = 0 -a $# != 0 ]; do
-#       if [[ "$1" = cpan://* ]]; then
-#               CPAN="${1#cpan://}"
-#               PACKAGE=perl-`echo ${CPAN/::/-} | tr A-Z a-z`
-#               notice "Pre-installing Perl module before packaging"
-#               perl -MCPAN -e "install '$CPAN'" || error "CPAN install failed"
-#               PACKAGEVER=`perl -MExtUtils::Installed -e "print ExtUtils::Installed->new()->version('$CPAN')" 2> /dev/null`
-#               CPANTMP="/tmp/$SELF.$PACKAGE.$$.cpan"
-#               TMPFILES="$TMPFILES $CPANTMP"
-#               mkdir -p $CPANTMP
-#               cd "$CPANTMP"
-#               SRCDIR=$PWD
-#               test -z "$PACKAGEVER" && error "could not determine version of Perl module $CPAN"
-#               perl -MExtUtils::Installed -e "print join(\"\n\", ExtUtils::Installed->new()->files('$CPAN')) . \"\n\"" | duplicate_paths "$CPANTMP" || error "failed to extract PERL module content list"
-#               cat <<EOF > Makefile
-#all:
-#
-#install:
-#       find ./ | cpio -pdm /
-#       rm -f /Makefile
-#EOF
-#               notice "packaging perl module $CPAN as $PACKAGE-$PACKAGEVER"
-        if [[ -f "$1" || "$1" = ftp://* || "$1" = http://* ]]; then
-                AUTOEXTRACT="$1"
@@ -396 +449 @@
-    Display the O/S that bpkg thinks you are running.
-  --version
-
-
-
-
+
-  --packager=arch|slackware|rpm|deb|gentoo|redhat|suse|auto
-    Generate packages using the specified packaging system. 'auto' is the
@@ -412 +462 @@
-    --localstatedir=/var/state/<package> and --datadir=/usr/share/<package>).
-    The base directories are used if this option is not given.
+  --skip-build
+    Do not perform the build phase of bpkg.
+  --build-with=<command>
+    Use the given command to build, rather than the default 'make'.
-  --install-with=<command>
-
+,
-  --md5=<md5sum>
-    Verify that the source file has the given MD5 checksum.
@@ -421 +475 @@
-                                exit 0
-                        ;;
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-                        ;;
-                        --prefix=*)
@@ -480 +538 @@
-fi
-
-SKIPCONFIGURE = 0
+BUILDER = auto
-        if [ -x ./configure ]; then
-
-
-
-
-
+
-        elif [ -x autogen.sh ]; then
-
-
-
-
-
-
+
-        elif [ -r Imakefile ]; then
-
-
+
-        elif [ -r GNUmakefile -o -r makefile -o -r Makefile ]; then
-
-
-
-
-
-
-
-
-
+
-        elif [ -r Jamfile ]; then
-
-
-
-
-
-
-
-
-
+
+
-        elif [ -r setup.py ]; then
-
-
-
-
-
-
-
-
-
+
+
-        elif [ -r Makefile.PL ]; then
-perl Makefile.PL
+BUILDER=perl
-        elif [ -r $PACKAGE.pro ]; then
-qmake $PACKAGE.pro || error "qmake failed"
+BUILDER=qmake
-        else
-                error "couldn't auto-detect build mechanism"
@@ -536 +562 @@
-fi
-
-
+
+
+
-
-eval packager_$PACKAGER

bpkg/trunk/Makefile

@@ -5 +5 @@
-OS=$(shell ./bpkg --detect-os)
-
-
+pre-install $(OS)-install real-install all 
-
-all: $(OS)-build
-
-
+ all $(OS)-pre-install
-        @if ! ./bpkg --install-with='make install-raw' --package=bpkg-`./bpkg --version`; then \
-                echo; \
@@ -20 +20 @@
-                exit 1; \
-        fi
+        @cat README
-
-install-raw: all $(OS)-install
-        mkdir -p $(DESTDIR)$(PREFIX)/bin
-        install -m755 bpkg $(DESTDIR)$(PREFIX)/bin
-        @cat README
-
-$(INSTALLWATCH): $(INSTALLWATCH).tgz
@@ -46 +46 @@
-        @exit 1
-
-arch
-
-Run 'pacman -S installwatch' to install installwatch
-cho
+unknown
+"FATAL: Unknown operating system/distribution. Need detection and"
+       backend code in bpkg
+xit 1
-
+install-installwatch:
+        $(MAKE) -C $(INSTALLWATCH) PREFIX=$(PREFIX) BINDIR=$(DESTDIR)$(PREFIX)/bin LIBDIR=$(DESTDIR)$(PREFIX)/lib install
+
+# Arch
+arch-pre-install:
+        @if ! pacman -Q installwatch > /dev/null 2>&1; then \
+                echo "Installwatch is required by bpkg, attempting to install"; \
+                pacman -S installwatch; \
+                pacman -Q installwatch > /dev/null 2>&1 || exit 1; \
+        fi
+
+# Gentoo
-gentoo-build: $(INSTALLWATCH)
-        $(MAKE) -C $(INSTALLWATCH) PREFIX=/usr
-
-
-
+
-
+gentoo-install: gentoo-pre-install
+
+# Slackware
-slackware-build:
-        @if ! ls /var/log/packages/checkinstall* > /dev/null 2>&1; then \
@@ -68 +82 @@
-        fi
-
-
-
+
+
+
+