[Xquartz-changes] [434] trunk/mk_x11_dist.sh
source_changes at macosforge.org
source_changes at macosforge.org
Mon Mar 29 16:06:40 PDT 2010
Revision: 434
http://trac.macosforge.org/projects/xquartz/changeset/434
Author: jeremyhu at freedesktop.org
Date: 2010-03-29 16:06:38 -0700 (Mon, 29 Mar 2010)
Log Message:
-----------
Only enforce doc generation for MacOSForge builds
Modified Paths:
--------------
trunk/mk_x11_dist.sh
Modified: trunk/mk_x11_dist.sh
===================================================================
--- trunk/mk_x11_dist.sh 2010-03-26 08:33:49 UTC (rev 433)
+++ trunk/mk_x11_dist.sh 2010-03-29 23:06:38 UTC (rev 434)
@@ -12,7 +12,7 @@
#MERGE_DIRS="${MERGE_DIRS} /Users/jeremy/src/freedesktop/pkg/X11"
#MACOSFORGE=LEO
-MACOSFORGE=SL
+#MACOSFORGE=SL
TRAIN="trunk"
#TRAIN="trains/SnowLeopard"
@@ -31,17 +31,6 @@
X11APPS="${X11APPS:-${TRAIN}}"
X11FONTS="${X11FONTS:-${TRAIN}}"
-export XMLTO=/opt/local/bin/xmlto
-export ASCIIDOC=/opt/local/bin/asciidoc
-export DOXYGEN=/opt/local/bin/doxygen
-export FOP=/opt/local/bin/fop
-export GROFF=/opt/local/bin/groff
-export PS2PDF=/opt/local/bin/ps2pdf
-
-for f in "${XMLTO}" "${ASCIIDOC}" "${DOXYGEN}" "${FOP}" "${GROFF}" "${PS2PDF}" ; do
- [[ -x "${f}" ]] || die "Could not find ${f}"
-done
-
MACOSFORGE_LEO=NO
MACOSFORGE_SL=NO
MACOSFORGE_RELEASE=NO
@@ -68,6 +57,17 @@
if [[ ${MACOSFORGE_RELEASE} == "YES" ]] ; then
BUILDIT="${BUILDIT} -noverifydstroot"
+
+ export XMLTO=/opt/local/bin/xmlto
+ export ASCIIDOC=/opt/local/bin/asciidoc
+ export DOXYGEN=/opt/local/bin/doxygen
+ export FOP=/opt/local/bin/fop
+ export GROFF=/opt/local/bin/groff
+ export PS2PDF=/opt/local/bin/ps2pdf
+
+ for f in "${XMLTO}" "${ASCIIDOC}" "${DOXYGEN}" "${FOP}" "${GROFF}" "${PS2PDF}" ; do
+ [[ -x "${f}" ]] || die "Could not find ${f}"
+ done
fi
if [[ "${MACOSFORGE_LEO}" == "YES" && ${XPLUGIN} == "trunk" ]] ; then
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/xquartz-changes/attachments/20100329/56db84db/attachment.html>
More information about the Xquartz-changes
mailing list