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

[svn at pcbsd.org]

Author: kris
Date: 2009-01-07 10:30:43 -0800 (Wed, 07 Jan 2009)
New Revision: 3195

Modified:
   pbibuild/pbibuilder/scripts/2.1.startmake.sh
Log:

Updated our startmake.sh script for Pbi builder to provide a moderate speed increase by using a shared distfiles dir, which saves a lot of time simply waiting for fetches to finish up. The user can then clear out the saved distfiles as often as they wish



Modified: pbibuild/pbibuilder/scripts/2.1.startmake.sh
===================================================================
--- pbibuild/pbibuilder/scripts/2.1.startmake.sh	2009-01-07 16:15:28 UTC (rev 3194)
+++ pbibuild/pbibuilder/scripts/2.1.startmake.sh	2009-01-07 18:30:43 UTC (rev 3195)
@@ -102,6 +102,18 @@
 
 fi
 
+
+# Now setup our distfiles dir
+if [ ! -d "${PROGDIR}/distfiles" ]
+then
+   mkdir ${PROGDIR}/distfiles
+fi
+
+# Mount the distfiles directory
+mkdir -p ${PDESTDIR}/usr/ports/distfiles
+mount_nullfs ${PROGDIR}/distfiles ${PDESTDIR}/usr/ports/distfiles
+
+
 if [ "$BUILDINMATE" = "YES" ]
 then
   echo "BATCH=yes
@@ -231,15 +243,6 @@
 rm -rf /usr/X11R6
 ln -s /usr/local /usr/X11R6
 
-# Make gmake first, since almost all progs require it
-cd /usr/ports/devel/gmake
-make clean
-make install
-
-cd /usr/ports/devel/qmake
-make clean
-make install
-
 # Cd to the port and start the build
 cd ${PBIPORT}
 make clean
@@ -293,8 +296,10 @@
   # The build was successful, go ahead make the PBI file
   echo "SUCCESS! Build finished for ${module}"
   ${PROGDIR}/scripts/3.makepbi.sh ${module}
+  umount ${PDESTDIR}/usr/ports/distfiles
   exit 0
 else
+  umount ${PDESTDIR}/usr/ports/distfiles
   echo "ERROR: 2.1 Build failed of ${module}!!!"
   echo "ERROR: 2.1 Build failed of ${module}!!!" >>${BLOG}
   bzip2 ${BLOG}