From abccda0c162992831df8ae478b15d1c83dfac5a8 Mon Sep 17 00:00:00 2001
From: coyote <coyote@edf5b092-35ff-0310-97b2-ce42778d08ea>
Date: Wed, 22 Nov 2006 13:55:22 +0000
Subject: Changes to the Solaris build scripts..

git-svn-id: svn://svn.icculus.org/quake3/trunk@978 edf5b092-35ff-0310-97b2-ce42778d08ea
---
 code/unix/setup/Solaris_pkg.sh | 28 ++++++++++++++++++++++------
 1 file changed, 22 insertions(+), 6 deletions(-)

(limited to 'code')

diff --git a/code/unix/setup/Solaris_pkg.sh b/code/unix/setup/Solaris_pkg.sh
index d47f5f7..d4e600c 100644
--- a/code/unix/setup/Solaris_pkg.sh
+++ b/code/unix/setup/Solaris_pkg.sh
@@ -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 @@ fi
 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@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,8 +110,15 @@ if [ -d ${BUILD_DIR} ]; then
                 > ${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 | \
-- 
cgit v1.2.3