summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorJudd Vinet <judd@archlinux.org>2004-08-04 08:49:31 +0200
committerJudd Vinet <judd@archlinux.org>2004-08-04 08:49:31 +0200
commitad87360a71927f2afb3f91f13005b3c477f82acf (patch)
tree3e90bda99e91b5a9e2332f23012e687a392e7011 /scripts
parent62913fba63000dd9a7f1ff12c6cd40362ad56f3a (diff)
downloadpacman-ad87360a71927f2afb3f91f13005b3c477f82acf.tar.gz
pacman-ad87360a71927f2afb3f91f13005b3c477f82acf.tar.xz
Imported from pacman-2.8.3.tar.gz
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/gensync2
-rwxr-xr-xscripts/makepkg33
-rwxr-xr-xscripts/makeworld2
3 files changed, 23 insertions, 14 deletions
diff --git a/scripts/gensync b/scripts/gensync
index fe5b1e2a..a1e85f90 100755
--- a/scripts/gensync
+++ b/scripts/gensync
@@ -20,7 +20,7 @@
# USA.
#
-myver='2.8.2'
+myver='2.8.3'
usage() {
echo "gensync $myver"
diff --git a/scripts/makepkg b/scripts/makepkg
index e4efd7a6..3497d16b 100755
--- a/scripts/makepkg
+++ b/scripts/makepkg
@@ -20,7 +20,7 @@
# USA.
#
-myver='2.8.2'
+myver='2.8.3'
startdir=`pwd`
PKGDEST=$startdir
USE_COLOR="n"
@@ -187,6 +187,7 @@ usage() {
echo " -j <jobs> Set MAKEFLAGS to \"-j<jobs>\" before building"
echo " -m, --nocolor Disable colorized output messages"
echo " -n, --nostrip Do not strip binaries/libraries"
+ echo " -o, --nobuild Download and extract files only"
echo " -p <buildscript> Use an alternate build script (instead of PKGBUILD)"
echo " -r, --rmdeps Remove installed dependencies after a successful build"
echo " -s, --syncdeps Install missing dependencies with pacman"
@@ -209,6 +210,7 @@ NODEPS=0
FORCE=0
NOEXTRACT=0
NOSTRIP=0
+NOBUILD=0
RMDEPS=0
BUILDSCRIPT="./PKGBUILD"
@@ -225,6 +227,7 @@ while [ "$#" -ne "0" ]; do
--install) INSTALL=1 ;;
--force) FORCE=1 ;;
--nostrip) NOSTRIP=1 ;;
+ --nobuild) NOBUILD=1 ;;
--nocolor) USE_COLOR="n" ;;
--genmd5) GENMD5=1 ;;
--rmdeps) RMDEPS=1 ;;
@@ -237,27 +240,28 @@ while [ "$#" -ne "0" ]; do
exit 1
;;
-*)
- while getopts "cCsbdehifgj:mnrp:w:-" opt; do
+ while getopts "cCsbdehifgj:mnorp:w:-" opt; do
case $opt in
c) CLEANUP=1 ;;
C) CLEANCACHE=1 ;;
- s) DEP_BIN=1 ;;
b) DEP_SRC=1 ;;
d) NODEPS=1 ;;
e) NOEXTRACT=1 ;;
- i) INSTALL=1 ;;
- g) GENMD5=1 ;;
f) FORCE=1 ;;
- m) USE_COLOR="n" ;;
- n) NOSTRIP=1 ;;
- w) PKGDEST=$OPTARG ;;
- p) BUILDSCRIPT=$OPTARG ;;
- j) export MAKEFLAGS="-j$OPTARG" ;;
- r) RMDEPS=1 ;;
+ g) GENMD5=1 ;;
h)
usage
exit 0
;;
+ i) INSTALL=1 ;;
+ j) export MAKEFLAGS="-j$OPTARG" ;;
+ m) USE_COLOR="n" ;;
+ n) NOSTRIP=1 ;;
+ o) NOBUILD=1 ;;
+ p) BUILDSCRIPT=$OPTARG ;;
+ r) RMDEPS=1 ;;
+ s) DEP_BIN=1 ;;
+ w) PKGDEST=$OPTARG ;;
-)
OPTIND=0
break
@@ -283,7 +287,7 @@ if [ $? -ne 0 ]; then
exit 1
fi
PKGDEST=`pwd`
-cd -
+cd $OLDPWD
if [ "$CLEANCACHE" = "1" ]; then
if [ "`id -u`" = "0" -a "$INFAKEROOT" != "1" ]; then
@@ -538,6 +542,11 @@ if [ -d $startdir/pkg ]; then
fi
mkdir -p $startdir/pkg
+if [ "$NOBUILD" = "1" ]; then
+ msg "Sources are ready."
+ exit 0
+fi
+
# build
msg "Starting build()..."
build 2>&1
diff --git a/scripts/makeworld b/scripts/makeworld
index 59d3616a..45757977 100755
--- a/scripts/makeworld
+++ b/scripts/makeworld
@@ -21,7 +21,7 @@
#
toplevel=`pwd`
-version="2.8.2"
+version="2.8.3"
usage() {
echo "makeworld version $version"