[Xquartz-changes] [543] trunk/mk_x11_dist.sh

[source_changes at macosforge.org]

Revision: 543
          http://trac.macosforge.org/projects/xquartz/changeset/543
Author:   jeremyhu at freedesktop.org
Date:     2011-04-28 01:44:05 -0700 (Thu, 28 Apr 2011)
Log Message:
-----------
Set -release and build Xplugin from git

Modified Paths:
--------------
    trunk/mk_x11_dist.sh

Modified: trunk/mk_x11_dist.sh
===================================================================
--- trunk/mk_x11_dist.sh	2011-04-28 08:42:13 UTC (rev 542)
+++ trunk/mk_x11_dist.sh	2011-04-28 08:44:05 UTC (rev 543)
@@ -9,7 +9,7 @@
 #BUILDIT=./buildit
 
 MERGE_DIRS="/"
-MERGE_DIRS="${MERGE_DIRS} ${HOME}/src/freedesktop/pkg/X11"
+#MERGE_DIRS="${MERGE_DIRS} $(eval echo ~jeremy)/src/freedesktop/pkg/X11"
 
 #MACOSFORGE=LEO
 MACOSFORGE=SL
@@ -93,9 +93,11 @@
 	export PYTHON=/usr/bin/python2.5
 	export PYTHONPATH="/usr/X11/lib/python2.5:/usr/X11/lib/python2.5/site-packages"
 	export MACOSX_DEPLOYMENT_TARGET=10.5
+	BUILDIT="${BUILDIT} -release SULeoLoki"
 elif [[ "${TRAIN}" == "trains/SULeo" ]] ; then
 	ARCH_EXEC="-arch i386 -arch ppc"
 	ARCH_ALL="${ARCH_EXEC} -arch x86_64 -arch ppc64"
+	BUILDIT="${BUILDIT} -release SULeoLoki"
 else
 	ARCH_EXEC="-arch i386 -arch x86_64"
 	ARCH_ALL="${ARCH_EXEC}"
@@ -107,6 +109,7 @@
 		export PYTHON=/usr/bin/python2.6
 		export PYTHONPATH="${X11_PREFIX}/lib/python2.6:${X11_PREFIX}/lib/python2.6/site-packages"
 		export MACOSX_DEPLOYMENT_TARGET=10.6
+		BUILDIT="${BUILDIT} -release SUSnowJacks"
 	fi
 fi
 
@@ -144,9 +147,22 @@
 	fi
 }
 
+bit_git() {
+	proj=${1} ; shift
+	branch=${1} ; shift
+	[[ "${branch}" == "trunk" ]] && branch="master"
+
+	if [[ -n "${branch}" && -d "${proj}" ]] ; then
+		pushd ${proj}
+		git checkout "${branch}" || die "Unable to checkout ${branch}"
+		bit . -project ${proj} "${@}"
+		popd
+	fi
+}
+
 #[[ $(echo /tmp/X11*.roots) = '/tmp/X11*.roots' ]] || /bin/rm -rf /tmp/X11*.roots
 
-[[ -n ${XPLUGIN} && -d X11_Xplugin/${XPLUGIN} ]]      && bit X11_Xplugin/${XPLUGIN}    -project X11_Xplugin   ${ARCH_ALL} 
+bit_git X11_Xplugin "${XPLUGIN}" ${ARCH_ALL} 
 [[ -n ${X11MISC} && -d X11misc/${X11MISC} ]]          && bit X11misc/${X11MISC}        -project X11misc       ${ARCH_ALL}
 [[ -n ${X11PROTO} && -d X11proto/${X11PROTO} ]]       && bit X11proto/${X11PROTO}      -project X11proto      ${ARCH_ALL}
 [[ -n ${X11LIBS} && -d X11libs/${X11LIBS} ]]          && bit X11libs/${X11LIBS}        -project X11libs       ${ARCH_ALL}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/xquartz-changes/attachments/20110428/e4331786/attachment.html>