Changeset 57

Timestamp:

12/19/05 18:52:46 (3 years ago)

Author:

athomas

Message:

• Always use Python distutils data if available and user has not explicitly specified package.
  

Files:

• bpkg/trunk/bpkg (modified) (2 diffs)

bpkg/trunk/bpkg

@@ -53 +53 @@
-# XXXXXXXXXXXXXX Not really user-modifiable below here XXXXXXXXXXXXX
-#
-5
+6
-PACKAGER=auto
-SELF=`basename $0`
@@ -525 +525 @@
-test $PACKAGER = auto && PACKAGER=`detect_os`
-
+if [ $EXPLICIT_PACKAGE = 0 ]; then
+        # Always use Python distutils data if available
+        if [ -r setup.py ]; then
+                PACKAGE=`python setup.py --name | tr A-Z a-z`
+                PACKAGEVER=`python setup.py --version`
+        fi
+        if [ "_$PACKAGE" = "_$PACKAGEVER" ]; then
+                error "Could not determine package version from current directory. Specify with --package=<package>-<version>"
+        fi
+fi
+
-declare -F packager_pre_$PACKAGER > /dev/null && eval packager_pre_$PACKAGER
-declare -F packager_$PACKAGER > /dev/null || error "no such function packager_$PACKAGER()"
-
-if [ "$PACKAGE" = "$PACKAGEVER" ]; then
-        # Last resort, try Python distutils version
-        if [ -r setup.py ]; then
-                PACKAGEVER=`python setup.py --version`
-        fi
-        if [ "_$PACKAGE" = "_$PACKAGEVER" ]; then
-                error "Could not determine package version from current directory. Specify with --package=<package>-<version>"
-        fi
-fi
-
-if [ $BUILDER = auto ]; then