svn commit: r243384 - projects/portbuild/scripts

[Mark Linimon]

Author: linimon (doc,ports committer)
Date: Thu Nov 22 02:42:31 2012
New Revision: 243384
URL: http://svnweb.freebsd.org/changeset/base/243384

Log:
  Add yet more automation.

Modified:
  projects/portbuild/scripts/build

Modified: projects/portbuild/scripts/build
==============================================================================
--- projects/portbuild/scripts/build	Thu Nov 22 00:25:57 2012	(r243383)
+++ projects/portbuild/scripts/build	Thu Nov 22 02:42:31 2012	(r243384)
@@ -52,17 +52,31 @@ do_create() {
     buildid=$3
     shift 3
 
+    # create overall archive directory if it does not already exist 
     archivedir=${pbd}/${arch}/archive
+    if [ ! -d ${archivedir} ]; then
+	mkdir -p ${archivedir} || exit 1
+	chown -R ports-${arch}:portmgr ${archivedir}
+	chmod -R g+w ${archivedir}
+    fi
 
-    # create directory for all build logs
+    # create archive directory for all build logs if it does not already exist
     buildlogsdir=${archivedir}/buildlogs
     if [ ! -d ${buildlogsdir} ]; then
 	mkdir -p ${buildlogsdir} || exit 1
-	chown -R ports-${arch}:portmgr ${archivedir}
-	chmod -R g+w ${archivedir}
+	chown -R ports-${arch}:portmgr ${buildlogsdir}
+	chmod -R g+w ${buildlogsdir}
     fi
 
-    # create directory for all builds for buildenv
+    # create archive directory for all errorlogs if it does not already exist
+    errorlogsdir=${archivedir}/errorlogs
+    if [ ! -d ${errorlogsdir} ]; then
+	mkdir -p ${errorlogsdir} || exit 1
+	chown -R ports-${arch}:portmgr ${errorlogsdir}
+	chmod -R g+w ${errorlogsdir}
+    fi
+
+    # create directory for all builds for buildenv if it does not already exist
     buildsdir=${pbab}/builds
     if [ ! -d ${buildsdir} ]; then
 	mkdir -p ${buildsdir} || exit 1
@@ -70,7 +84,7 @@ do_create() {
 	chmod -R g+w ${pbab}
     fi
 
-    # create directory for latest build for buildenv
+    # create directory for latest build for buildenv if it does not already exist
     builddir=$(realpath ${buildsdir})/${buildid}
     if [ -d ${builddir} ]; then
 	echo "Can't create ${builddir}, it already exists"
@@ -103,6 +117,15 @@ do_create() {
     ln -s ${buildsdir}/latest/bak/packages ${errorlogs}/${arch}-${branch}-packages-previous
     ln -s ${buildsdir}/latest/packages ${errorlogs}/${arch}-${branch}-packages-latest
 
+    buildlogs_archive_link=${errorlogs}/${arch}-buildlogs
+    if [ ! -e ${buildlogs_archive_link} ]; then
+      ln -s ${archivedir}/buildlogs ${buildlogs_archive_link}
+    fi
+    errorlogs_archive_link=${errorlogs}/${arch}-errorlogs
+    if [ ! -e ${errorlogs_archive_link} ]; then
+      ln -s ${archivedir}/errorlogs ${errorlogs_archive_link}
+    fi
+
     echo "New build ID is ${buildid}"
 }