Changeset 46

Timestamp:

06/08/05 03:11:54 (4 years ago)

Author:

athomas

Message:

• Slackware install now auto-detects checkinstall presence.
  
• Added --install-with=<cmd> for overriding make install.
  
• bpkg will self-package itself if possible.
  

Files:

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

bpkg/trunk/bpkg

@@ -32 +32 @@
-DATADIR=/usr/share
-# Where to store built packages
-/usr/src/build/packages
+$PWD
-# Skip configure phase by default?
-SKIPCONFIGURE=0
@@ -60 +60 @@
-DESTROOT=/tmp/$SELF.$PACKAGE.$$.pkg
-TMPFILES="$TMPDIR $DESTROOT $INSTALLLOG"
-
-
-
+
-
-colour()
@@ -114 +112 @@
-}
-
-
-
+
-installer()
-{
@@ -124 +121 @@
-                export INSTALLWATCH_BACKUP_PATH=$SRCDIR/backup-`date +%Y%m%d%H%M%S-backup`
-        fi
-"$@"
+$MAKEINSTALL
-        if [ $BACKUP = 1 -a -d $INSTALLWATCH_BACKUP_PATH ]; then
-                notice "Archiving backup to $INSTALLWATCH_BACKUP_PATH.tar.gz"
@@ -144 +141 @@
-packager_slackware()
-{
- make install
+
-        cd $DESTROOT
-        local out=$PKGDIR/$PACKAGE-$PACKAGEVER-i386-$PACKAGEREL.tgz
-        makepkg -c n -l y $out
+        installpkg $out
-        notice "Package is" $out
-}
@@ -168 +166 @@
-packager_arch()
-{
- make install
+
-        local configs=`(cd $DESTROOT && find etc -type f) 2> /dev/null`
-        local deps=`(cd $DESTROOT && find . -type f | xargs --no-run-if-empty file | grep 'ELF.*executable' | cut -d: -f1 | xargs --no-run-if-empty ldd 2> /dev/null | awk '{print $3}' | grep ^/ | xargs --no-run-if-empty pacman -Qo 2> /dev/null | awk '{print $5}' | sort | uniq) 2> /dev/null`
@@ -205 +203 @@
-packager_gentoo()
-{
- make install
+
-        #local deps=`(cd $DESTROOT && find . -type f | xargs --no-run-if-empty file | grep 'ELF.*executable' | cut -d: -f1 | xargs --no-run-if-empty ldd 2> /dev/null | awk '{print $3}' | grep ^/ | xargs --no-run-if-empty pacman -Qo 2> /dev/null | awk '{print $5}' | sort | uniq) 2> /dev/null`
-        ls -d /usr/portage/*/$PACKAGE > /dev/null 2>&1 && error "Package '$PACKAGE' already exists in portage."
@@ -268 +266 @@
-        fi
-}
+
+# Make sure some default directories exist
+mkdir -p "$TMPDIR"
+if [ ! -w $PKGDIR ]; then
+        warning "$PKGDIR is not writeable or does not exist, package will be left in $PWD"
+        PKGDIR=$PWD
+fi
-
-trap "for f in $TMPFILES; do rm -rf \$f; done" EXIT KILL HUP QUIT
@@ -340 +345 @@
-    --localstatedir=/var/state/<package> and --datadir=/usr/share/<package>).
-    The base directories are used if this option is not given.
+  --install-with=<command>
+    Use the given command to install rather than the default 'make install'.
-
-For further information, including examples, visit http://swapoff.org/bpkg
@@ -345 +352 @@
-                                exit 0
-                        ;;
+                  --install-with=*)
+                        MAKEINSTALL=`echo "$1" | cut -d= -f2-`
+                  ;;
-                        --skip-configure)
-                                SKIPCONFIGURE=1
@@ -428 +438 @@
-
-install:
-
+f -
-EOF
-        elif [ -r Makefile.PL ]; then

bpkg/trunk/Makefile

@@ -9 +9 @@
-all: $(OS)-build
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-        mkdir -p $(DESTDIR)$(PREFIX)/bin
-        mkdir -p $(DESTDIR)$(PREFIX)/lib
@@ -16 +28 @@
-
-$(INSTALLWATCH): $(INSTALLWATCH).tgz
-        $(MAKE)
-        rm -rf $(INSTALLWATCH)
-        gzip -dc $(INSTALLWATCH).tgz | tar xf -
@@ -46 +57 @@
-gentoo-install:
-        $(MAKE) -C $(INSTALLWATCH) PREFIX=$(PREFIX) BINDIR=$(DESTDIR)$(PREFIX)/bin LIBDIR=$(DESTDIR)$(PREFIX)/lib install
+
+slackware-build: $(INSTALLWATCH)
+        @if ! ls /var/log/packages/checkinstall* > /dev/null 2>&1; then \
+                $(MAKE) -C $(INSTALLWATCH) PREFIX=/usr; \
+                echo; \
+                echo "Installwatch has been compiled and will be installed, however Slackware includes"; \
+                echo "'checkinstall' which bundles installwatch. You can install this package instead,"; \
+                echo "if so desired."; \
+                echo; \
+        fi
+
+slackware-install:
+        @ls /var/log/packages/checkinstall* > /dev/null 2>&1 || $(MAKE) -C $(INSTALLWATCH) PREFIX=$(PREFIX) BINDIR=$(DESTDIR)$(PREFIX)/bin LIBDIR=$(DESTDIR)$(PREFIX)/lib install