[Xquartz-changes] [570] trunk
source_changes at macosforge.org
source_changes at macosforge.org
Sun Jul 24 21:35:12 PDT 2011
Revision: 570
http://trac.macosforge.org/projects/xquartz/changeset/570
Author: jeremyhu at freedesktop.org
Date: 2011-07-24 21:35:11 -0700 (Sun, 24 Jul 2011)
Log Message:
-----------
Updates to mk_x11_dist to automate packaging
Modified Paths:
--------------
trunk/compile-xserver.sh
trunk/mk_x11_dist.sh
Modified: trunk/compile-xserver.sh
===================================================================
--- trunk/compile-xserver.sh 2011-07-25 04:17:14 UTC (rev 569)
+++ trunk/compile-xserver.sh 2011-07-25 04:35:11 UTC (rev 570)
@@ -9,25 +9,61 @@
# Parallel Make. Change $MAKE if you don't have gmake installed
MAKE="gnumake"
-MAKE_OPTS="-j3"
+MAKE_OPTS="-j10"
. ~/src/strip.sh
-#PREFIX=/usr/X11
-#ARCHFLAGS="-arch i386 -arch ppc"
-
-PREFIX=/opt/X11
-CONFOPT="$CONFOPT --with-apple-application-name=XQuartz --with-launchd-id-prefix=org.macosforge.xquartz"
+PREFIX=/usr/X11
ARCHFLAGS="-arch i386 -arch x86_64"
+#PREFIX=/opt/X11
+#CONFOPT="$CONFOPT --with-apple-application-name=XQuartz --with-launchd-id-prefix=org.macosforge.xquartz"
+#ARCHFLAGS="-arch i386 -arch x86_64"
+
ACLOCAL="aclocal -I ${PREFIX}/share/aclocal -I /usr/local/share/aclocal"
CPPFLAGS="-DNO_ALLOCA"
-CFLAGS="$CFLAGS -O0 -ggdb3 -pipe"
+CFLAGS="$CFLAGS -Os -ggdb3 -pipe"
CFLAGS="$CFLAGS $ARCHFLAGS"
CFLAGS="$CFLAGS -Wall -Wextra -Wno-sign-compare -Wno-unused-parameter -Wno-missing-field-initializers"
+ TB_CFLAGS="-fdiagnostics-show-category=name"
+
+# Stage 1:
+ TB_CFLAGS="${TB_CFLAGS} -Werror=implicit"
+ TB_CFLAGS="${TB_CFLAGS} -Werror=nonnull"
+ TB_CFLAGS="${TB_CFLAGS} -Wformat-security" # <rdar://problem/9418512> clang is overzealous about -Werror=format-*
+ TB_CFLAGS="${TB_CFLAGS} -Wformat-extra-args"
+ TB_CFLAGS="${TB_CFLAGS} -Wformat-y2k"
+ TB_CFLAGS="${TB_CFLAGS} -Werror=init-self"
+ TB_CFLAGS="${TB_CFLAGS} -Werror=main"
+ TB_CFLAGS="${TB_CFLAGS} -Werror=missing-braces"
+ TB_CFLAGS="${TB_CFLAGS} -Wparentheses" # libX11 XKBBind.c:169
+ TB_CFLAGS="${TB_CFLAGS} -Werror=sequence-point"
+ TB_CFLAGS="${TB_CFLAGS} -Werror=return-type"
+ TB_CFLAGS="${TB_CFLAGS} -Werror=trigraphs"
+ TB_CFLAGS="${TB_CFLAGS} -Werror=array-bounds"
+# TB_CFLAGS="${TB_CFLAGS} -Wcast-align" # Noisy
+ TB_CFLAGS="${TB_CFLAGS} -Werror=write-strings"
+# TB_CFLAGS="${TB_CFLAGS} -Werror=clobbered"
+ TB_CFLAGS="${TB_CFLAGS} -Werror=address"
+ TB_CFLAGS="${TB_CFLAGS} -Werror=int-to-pointer-cast"
+ TB_CFLAGS="${TB_CFLAGS} -Werror=pointer-to-int-cast"
+
+# Stage 2:
+# TB_CFLAGS="${TB_CFLAGS} -Wlogical-op"
+ TB_CFLAGS="${TB_CFLAGS} -Wunused"
+ TB_CFLAGS="${TB_CFLAGS} -Wuninitialized"
+ TB_CFLAGS="${TB_CFLAGS} -Wshadow"
+# TB_CFLAGS="${TB_CFLAGS} -Wunsafe-loop-optimizations"
+ TB_CFLAGS="${TB_CFLAGS} -Wcast-qual"
+ TB_CFLAGS="${TB_CFLAGS} -Wmissing-noreturn"
+ TB_CFLAGS="${TB_CFLAGS} -Wmissing-format-attribute"
+ TB_CFLAGS="${TB_CFLAGS} -Wredundant-decls"
+ TB_CFLAGS="${TB_CFLAGS} -Wnested-externs"
+ TB_CFLAGS="${TB_CFLAGS} -Winline"
+
OBJCFLAGS="$CFLAGS"
LDFLAGS="$CFLAGS"
Modified: trunk/mk_x11_dist.sh
===================================================================
--- trunk/mk_x11_dist.sh 2011-07-25 04:17:14 UTC (rev 569)
+++ trunk/mk_x11_dist.sh 2011-07-25 04:35:11 UTC (rev 570)
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
. ~jeremy/src/strip.sh
@@ -9,17 +9,31 @@
#BUILDIT=./buildit
MERGE_DIRS="/"
-#MERGE_DIRS="${MERGE_DIRS} $(eval echo ~jeremy)/src/freedesktop/pkg/X11"
+if [[ $# -eq 2 ]] ; then
+ MERGE_DIRS="${MERGE_DIRS} $(eval echo ~jeremy)/src/freedesktop/pkg/X11"
+
+ VERSION_TXT=$1
+ VERSION_TXT_SHORT=${VERSION_TXT%_*}
+ VERSION=$2
+
+ echo "User Version: ${VERSION_TXT}"
+ echo "Base Version: ${VERSION_TXT_SHORT}"
+ echo "Bundle Version: ${VERSION}"
+fi
+
#MACOSFORGE=LEO
MACOSFORGE=SL
-MACOSFORGE_BUILD_DOCS="YES"
-#MACOSFORGE_BUILD_DOCS="NO"
+#MACOSFORGE_BUILD_DOCS="YES"
+MACOSFORGE_BUILD_DOCS="NO"
+#QUARTZWM="trains/quartz-wm-1.2-branch"
+
TRAIN="trunk"
#TRAIN="trains/SnowLeopard"
#TRAIN="trains/SULeo"
+#TRAIN="trains/Lion"
### End Configuration ###
@@ -88,11 +102,13 @@
if [[ "${MACOSFORGE_LEO}" == "YES" ]] ; then
ARCH_EXEC="-arch i386 -arch ppc"
ARCH_ALL="${ARCH_EXEC} -arch x86_64 -arch ppc64"
+ export MACOSX_DEPLOYMENT_TARGET=10.5
+ export EXTRA_XQUARTZ_CFLAGS="-mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET}"
+ export EXTRA_XQUARTZ_LDFLAGS="-Wl,-macosx_version_min,${MACOSX_DEPLOYMENT_TARGET}"
export CC="/usr/bin/gcc-4.2"
- export OBJC="$CC"
+ export OBJC="${CC}"
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"
@@ -102,14 +118,16 @@
ARCH_EXEC="-arch i386 -arch x86_64"
ARCH_ALL="${ARCH_EXEC}"
if [[ "${MACOSFORGE_SL}" == "YES" ]] ; then
+ export MACOSX_DEPLOYMENT_TARGET=10.6
+ export EXTRA_XQUARTZ_CFLAGS="-mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET}"
+ export EXTRA_XQUARTZ_LDFLAGS="-Wl,-macosx_version_min,${MACOSX_DEPLOYMENT_TARGET}"
+ export CC="/opt/llvm/bin/clang"
+ #export CC="/usr/bin/gcc-4.2"
+ #export CC="/usr/bin/llvm-gcc-4.2"
#export CC="/usr/bin/clang"
- export CC="/opt/llvm/bin/clang"
- #export CC="/opt/local/bin/clang"
- export OBJC="$CC"
+ export OBJC="${CC}"
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
@@ -172,3 +190,25 @@
[[ -n ${X11FONTS} && -d X11fonts/${X11FONTS} ]] && bit X11fonts/${X11FONTS} -project X11fonts ${ARCH_ALL}
[[ -n ${X11SERVER} ]] && echo "Remember to edit the plists"
+
+INFO_PLIST="$(eval echo ~jeremy)/src/freedesktop/pkg/X11/Applications/Utilities/XQuartz.app/Contents/Info.plist"
+if [[ -n ${VERSION_TXT} ]] ; then
+ if [[ "${VERSION_TXT}" == "VERSION_TXT_SHORT" ]] ; then
+ /opt/local/bin/gsed -i 's:beta.xml:release.xml:' "${INFO_PLIST}"
+ else
+ /opt/local/bin/gsed -i 's:release.xml:beta.xml:' "${INFO_PLIST}"
+ fi
+ defaults write "${INFO_PLIST}" CFBundleShortVersionString "${VERSION_TXT}"
+ plutil -convert xml1 "${INFO_PLIST}"
+ chmod 644 "${INFO_PLIST}"
+fi
+if [[ -n ${VERSION} ]] ; then
+ defaults write "${INFO_PLIST}" CFBundleVersion "${VERSION}"
+ plutil -convert xml1 "${INFO_PLIST}"
+ chmod 644 "${INFO_PLIST}"
+
+ cd $(eval echo ~jeremy)/src/freedesktop/pkg
+ ./mkpmdoc.sh
+ chown -R jeremy XQuartz-${VERSION_TXT}.pmdoc
+ sudo -u jeremy open XQuartz-${VERSION_TXT}.pmdoc
+fi
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/xquartz-changes/attachments/20110724/1144e13c/attachment.html>
More information about the Xquartz-changes
mailing list