r978 - branches/1.34/code/unix/setup trunk/code/unix/setup

[DONOTREPLY at icculus.org]

Author: coyote
Date: 2006-11-22 08:55:22 -0500 (Wed, 22 Nov 2006)
New Revision: 978

Modified:
   branches/1.34/code/unix/setup/Solaris_pkg.sh
   trunk/code/unix/setup/Solaris_pkg.sh
Log:
Changes to the Solaris build scripts..


Modified: branches/1.34/code/unix/setup/Solaris_pkg.sh
===================================================================
--- branches/1.34/code/unix/setup/Solaris_pkg.sh	2006-11-21 13:09:25 UTC (rev 977)
+++ branches/1.34/code/unix/setup/Solaris_pkg.sh	2006-11-22 13:55:22 UTC (rev 978)
@@ -1,5 +1,9 @@
 #!/bin/bash
-# Solaris tuff
+
+# Source directory
+MOUNT_DIR="../../.."
+
+# Solaris stuff
 PLATFORM=`uname|sed -e s/_.*//|tr '[:upper:]' '[:lower:]'`
 if [ "X`uname -m`" = "Xi386" ]; then
 	ARCH=i386
@@ -11,14 +15,19 @@
 PKG_SOLARIS_NAME=ioquake3
 PKG_DATA_NAME=ioquake3d
 BUILD_DATE="`/usr/bin/date '+%Y%m%d%H%M%S'`"
-BUILD_VERSION="1.34-rc2"
+SVNVERSION=/usr/local/bin/svnversion
+if [ -x /usr/local/bin/svnversion ]; then
+	SVN_BANNER=`/usr/local/bin/svnversion ${MOUNT_DIR}|sed -e 's/S$//' -e 's/M$//' `
+	BUILD_VERSION="1.34-rc2"
+else
+	BUILD_VERSION="1.34-rc2"
+fi
 PKG_VERSION="`date '+%Y%m%d%H%M'`"
 PKG_MAINT_ID="quake at cojot.name"
 SOLARIS_PKGFILE="${PKG_SOLARIS_NAME}-${BUILD_VERSION}-${PKG_VERSION}-${ARCH}.pkg"
 DATA_PKGFILE="${PKG_DATA_NAME}-${BUILD_VERSION}-${PKG_VERSION}-${ARCH}.pkg"
 
-# Locations
-MOUNT_DIR="../../.."
+# build directories
 BUILD_DIR="${MOUNT_DIR}/build/release-${PLATFORM}-${ARCH}"
 PKG_SRC_DIR="${MOUNT_DIR}/code/unix/setup/pkg/${PKG_SOLARIS_NAME}"
 PKG_BUILD_DIR="/tmp/ioquake3-build/${PKG_SOLARIS_NAME}-${BUILD_VERSION}"
@@ -101,9 +110,16 @@
                 > ${PKG_DATA_SRC_DIR}/pkginfo
         ${CAT} ${PKG_DATA_SRC_DIR}/prototype.template > ${PKG_DATA_SRC_DIR}/prototype
 
-	if [ -f ${MOUNT_DIR}/../../webspace/include/id_patch_pk3s_Q3A_EULA.txt ]; then
-	${INSTALL_DATA} ${MOUNT_DIR}/../../webspace/include/id_patch_pk3s_Q3A_EULA.txt ${PKG_DATA_SRC_DIR}/copyright
+	if [ -d ${MOUNT_DIR}/../webspace/include ]; then
+		EULA_DIR=${MOUNT_DIR}/../webspace/include
+	else
+		if [ -d ${MOUNT_DIR}/../../webspace/include ]; then
+			EULA_DIR=${MOUNT_DIR}/../../webspace/include
+		fi
 	fi
+	if [ -f ${EULA_DIR}/id_patch_pk3s_Q3A_EULA.txt ]; then
+	${INSTALL_DATA} ${EULA_DIR}/id_patch_pk3s_Q3A_EULA.txt ${PKG_DATA_SRC_DIR}/copyright
+	fi
 
         ${PKGPROTO} ${PKG_DATA_BUILD_DIR}=quake3 | \
                 ${NAWK} '{ print $1,$2,$3,$4 }' >> ${PKG_DATA_SRC_DIR}/prototype

Modified: trunk/code/unix/setup/Solaris_pkg.sh
===================================================================
--- trunk/code/unix/setup/Solaris_pkg.sh	2006-11-21 13:09:25 UTC (rev 977)
+++ trunk/code/unix/setup/Solaris_pkg.sh	2006-11-22 13:55:22 UTC (rev 978)
@@ -1,5 +1,9 @@
 #!/bin/bash
-# Solaris tuff
+
+# Source directory
+MOUNT_DIR="../../.."
+
+# Solaris stuff
 PLATFORM=`uname|sed -e s/_.*//|tr '[:upper:]' '[:lower:]'`
 if [ "X`uname -m`" = "Xi386" ]; then
 	ARCH=i386
@@ -11,14 +15,19 @@
 PKG_SOLARIS_NAME=ioquake3
 PKG_DATA_NAME=ioquake3d
 BUILD_DATE="`/usr/bin/date '+%Y%m%d%H%M%S'`"
-BUILD_VERSION="1.34-rSVN"
+SVNVERSION=/usr/local/bin/svnversion
+if [ -x /usr/local/bin/svnversion ]; then
+	SVN_BANNER=`/usr/local/bin/svnversion ${MOUNT_DIR}|sed -e 's/S$//' -e 's/M$//' `
+	BUILD_VERSION="1.34-r${SVN_BANNER}"
+else
+	BUILD_VERSION="1.34-rSVN"
+fi
 PKG_VERSION="`date '+%Y%m%d%H%M'`"
 PKG_MAINT_ID="quake at cojot.name"
 SOLARIS_PKGFILE="${PKG_SOLARIS_NAME}-${BUILD_VERSION}-${PKG_VERSION}-${ARCH}.pkg"
 DATA_PKGFILE="${PKG_DATA_NAME}-${BUILD_VERSION}-${PKG_VERSION}-${ARCH}.pkg"
 
-# Locations
-MOUNT_DIR="../../.."
+# build directories
 BUILD_DIR="${MOUNT_DIR}/build/release-${PLATFORM}-${ARCH}"
 PKG_SRC_DIR="${MOUNT_DIR}/code/unix/setup/pkg/${PKG_SOLARIS_NAME}"
 PKG_BUILD_DIR="/tmp/ioquake3-build/${PKG_SOLARIS_NAME}-${BUILD_VERSION}"
@@ -101,9 +110,16 @@
                 > ${PKG_DATA_SRC_DIR}/pkginfo
         ${CAT} ${PKG_DATA_SRC_DIR}/prototype.template > ${PKG_DATA_SRC_DIR}/prototype
 
-	if [ -f ${MOUNT_DIR}/../../webspace/include/id_patch_pk3s_Q3A_EULA.txt ]; then
-	${INSTALL_DATA} ${MOUNT_DIR}/../../webspace/include/id_patch_pk3s_Q3A_EULA.txt ${PKG_DATA_SRC_DIR}/copyright
+	if [ -d ${MOUNT_DIR}/../webspace/include ]; then
+		EULA_DIR=${MOUNT_DIR}/../webspace/include
+	else
+		if [ -d ${MOUNT_DIR}/../../webspace/include ]; then
+			EULA_DIR=${MOUNT_DIR}/../../webspace/include
+		fi
 	fi
+	if [ -f ${EULA_DIR}/id_patch_pk3s_Q3A_EULA.txt ]; then
+	${INSTALL_DATA} ${EULA_DIR}/id_patch_pk3s_Q3A_EULA.txt ${PKG_DATA_SRC_DIR}/copyright
+	fi
 
         ${PKGPROTO} ${PKG_DATA_BUILD_DIR}=quake3 | \
                 ${NAWK} '{ print $1,$2,$3,$4 }' >> ${PKG_DATA_SRC_DIR}/prototype