Revision: 49057
http://brlcad.svn.sourceforge.net/brlcad/?rev=49057&view=rev
Author: jordisayol
Date: 2012-01-24 22:17:28 +0000 (Tue, 24 Jan 2012)
Log Message:
-----------
Update debian/changelog version
Change multijob on deb/rpm builfing scripts
Remove binary checking on debian building script
Modified Paths:
--------------
brlcad/trunk/misc/debian/changelog
brlcad/trunk/sh/make_deb.sh
brlcad/trunk/sh/make_rpm.sh
Modified: brlcad/trunk/misc/debian/changelog
===================================================================
--- brlcad/trunk/misc/debian/changelog 2012-01-24 22:03:31 UTC (rev 49056)
+++ brlcad/trunk/misc/debian/changelog 2012-01-24 22:17:28 UTC (rev 49057)
@@ -1,3 +1,9 @@
+brlcad (7.22.0-0) unstable; urgency=low
+
+ * update brlcad version
+
+ -- Jordi Sayol <g.sa...@yahoo.es> Tue, 24 Jan 2012 21:53:52 +0100
+
brlcad (7.20.4-0) unstable; urgency=low
* moved to CMAKE building
Modified: brlcad/trunk/sh/make_deb.sh
===================================================================
--- brlcad/trunk/sh/make_deb.sh 2012-01-24 22:03:31 UTC (rev 49056)
+++ brlcad/trunk/sh/make_deb.sh 2012-01-24 22:17:28 UTC (rev 49057)
@@ -50,19 +50,18 @@
echo "Script to create Debian binary and source packages."
echo
echo "Usage:"
- echo " sh/make_deb.sh -b | -s [-t]"
+ echo " sh/make_deb.sh -b | -s"
echo
echo "Options:"
echo " -b build the Debian binary package (deb file)"
echo " -s * build the Debian source package"
- echo " -t as second argument: test for all prerequisites"
echo
echo " * (use with a clean brlcad tree)"
exit 1
fi
# too many parameters
-if test $# -gt 2 ;then
+if test $# -gt 1 ;then
ferror "Too many arguments" "Exiting..."
fi
@@ -71,14 +70,6 @@
ferror "Unknown first argument '$!'." "Exiting..."
fi
-# check for test
-TEST=0
-if test $# -eq 2 && test "$2" != "-t" ; then
- ferror "Unknown second argument '$2'." "Exiting..."
-elif test $# -eq 2 && test "$2" = "-t" ; then
- TEST=1
-fi
-
# test if in project root
if test ! -f misc/debian/control ; then
ferror "\"make_deb.sh\" should be run from project root directory."
"Exiting..."
@@ -94,44 +85,28 @@
fcheck() {
T="install ok installed"
if test ! `dpkg -s $1 2>/dev/null | grep "$T" | wc -l` -eq 0 ; then
- # success
echo "Found package $1..."
- return
+ else
+ echo "* Missing $1..."
+ LLIST=$LLIST" "$1
+ E=1
fi
-
- # need to check for local, non-package versions
- # check for binaries
- if test "$2" = "x" ; then
- if [ -f /usr/bin/$1 ]; then
- # success
- echo "Found /usr/bin/$1..."
- return
- elif [ -f /usr/local/bin/$1 ]; then
- # success
- echo "Found /usr/local/bin/$1..."
- return
- fi
- fi
-
- echo "* Missing $1..."
- LLIST=$LLIST" "$1
- E=1
}
fcheck debhelper
-fcheck fakeroot x
+fcheck fakeroot
if test "$1" = "-b" ;then
fcheck build-essential
fcheck make
- fcheck cmake x
- fcheck libtool x
- fcheck bc x
- fcheck sed x
- fcheck bison x
- fcheck flex x
+ fcheck cmake
+ fcheck libtool
+ fcheck bc
+ fcheck sed
+ fcheck bison
+ fcheck flex
fcheck libxi-dev
- fcheck xsltproc x
+ fcheck xsltproc
fcheck libglu1-mesa-dev
fcheck libpango1.0-dev
#fcheck fop # allows pdf creation
@@ -141,21 +116,13 @@
ferror "Mandatory to install these packages first:" "$LLIST"
fi
-if [ $TEST -eq 1 ]; then
- echo "=========================================================="
- echo "Testing complete"
- echo "Ready to create a Debian package"
- echo "=========================================================="
- exit
-fi
-
# set variables
BVERSION=`cat include/conf/MAJOR | sed 's/[^0-9]//g'`"."`cat
include/conf/MINOR | sed 's/[^0-9]//g'`"."`cat include/conf/PATCH | sed
's/[^0-9]//g'`
CDATE=`date -R`
CFILE="debian/changelog"
RELEASE="0"
-NJOBS=`getconf _NPROCESSORS_ONLN | sed "s/.*/&*2-1/" | bc`
+NJOBS=`getconf _NPROCESSORS_ONLN`
if test ! $NJOBS -gt 0 2>/dev/null ;then
NJOBS=1
fi
Modified: brlcad/trunk/sh/make_rpm.sh
===================================================================
--- brlcad/trunk/sh/make_rpm.sh 2012-01-24 22:03:31 UTC (rev 49056)
+++ brlcad/trunk/sh/make_rpm.sh 2012-01-24 22:17:28 UTC (rev 49057)
@@ -72,8 +72,11 @@
fi
fcheck(){
if ! `rpm -q $1 &>/dev/null` ; then
+ echo "* Missing $1..."
LLIST=$LLIST" "$1
E=1
+ else
+ echo "Found package $1..."
fi
}
@@ -132,7 +135,7 @@
ferror "Unknown architecture. \"`gcc -dumpmachine`\"" "Exiting..."
fi
-NJOBS=`getconf _NPROCESSORS_ONLN | sed "s/.*/&*2-1/" | bc`
+NJOBS=`getconf _NPROCESSORS_ONLN`
if test ! $NJOBS -gt 0 2>/dev/null ;then
NJOBS=1
fi
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Keep Your Developer Skills Current with LearnDevNow!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-d2d
_______________________________________________
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
