[PC-BSD Commits] r1476 - pbibuild/pbibuilder/scripts

[svn at pcbsd.org]

Author: kris
Date: 2008-02-28 09:24:49 -0800 (Thu, 28 Feb 2008)
New Revision: 1476

Modified:
   pbibuild/pbibuilder/scripts/3.makepbi.sh
Log:

Changed pbi module builder to now setup versions similar to ports, 
I.E. FF 2.0.0.12_2 



Modified: pbibuild/pbibuilder/scripts/3.makepbi.sh
===================================================================
--- pbibuild/pbibuilder/scripts/3.makepbi.sh	2008-02-28 17:13:49 UTC (rev 1475)
+++ pbibuild/pbibuilder/scripts/3.makepbi.sh	2008-02-28 17:24:49 UTC (rev 1476)
@@ -54,7 +54,7 @@
 if [ -z "${PORTVER}" ]
 then
  # Get the port version number
- PORTVER="`grep DISTVERSION= ${PDESTDIR}/${PBIPORT}/Makefile | cut -f 2`" 
+ PORTVER="`grep DISTVERSION= ${PDESTDIR}/${PBIPORT}/Makefile | cut -f 2`"
 fi
 
 if [ -z "${PORTVER}" ]
@@ -81,14 +81,11 @@
 if [ "$?" = "0" ]
 then
   PORTREV="`grep PORTREVISION= ${PDESTDIR}/${PBIPORT}/Makefile | cut -f 2`" 
-  PVNUM="${PORTREV}" ; export PVNUM
-else
-  PVNUM="0" ; export PVNUM
+  PORTVER="${PORTVER}_${PORTREV}" ; export PORTVER
 fi
 
 echo "PORTREV ${PORTREV}
 PORTVER ${PORTVER}
-PVNUM: $PVNUM"
 
 export PORTVER
 
@@ -167,7 +164,7 @@
 ProgVersion: ${PORTVER}
 ProgWeb: ${PROGWEB}
 ProgAuthor: ${PROGAUTHOR}
-PBIVer: ${PVNUM}
+PBIVer: 0
 PBIUpdate: ${PBIUPDATE}
 PackageDir: ${PBIDIR}/
 LibDir: ${PROGLIBS}
@@ -249,9 +246,32 @@
   echo "`md5 ${PDESTDIR}/${PBIPORT}/Makefile | cut -d \" \" -f 4`" >${OUTDIR}/.built
   echo "${BUILDKEY}" >${OUTDIR}/.oldbk
 
+  if [ -e "${PROGDIR}/scripts/4.mailresults.sh" ]
+  then
+    ${PROGDIR}/scripts/4.mailresults.sh ${module} Success
+    rm ${OUTDIR}/.buildfailed
+    touch ${OUTDIR}/.buildgood
+  fi
 
 else
+
   echo "ERROR: Build failed of ${module}!!!" >>${BLOG}
+
+  if [ -e "${PROGDIR}/scripts/4.mailresults.sh" ]
+  then
+    ${PROGDIR}/scripts/4.mailresults.sh ${module} Failed
+    rm ${OUTDIR}/.buildgood
+    touch ${OUTDIR}/.buildfailed
+  fi
+  
   echo "ERROR: Build failed of ${module}!!!" 
+
 fi
 
+
+if [ -e "${PROGDIR}/cron/upload-nightly.sh" ]
+then
+  # Sync the outgoing directory now
+  echo "Uploading outgoing to the pbibuild.pcbsd.org site..."
+  ${PROGDIR}/cron/upload-nightly.sh
+fi