ReleaseEngineering/ThunderbirdTryServer/ApplyPatchesMozconfigPatch: Difference between revisions

From MozillaWiki
Jump to navigation Jump to search
(Created page with "This is the example patch for the Thunderbird Try Server to enable client.py to apply patches. <pre> diff --git a/mail/config/mozconfigs/linux32/debug b/mail/config/mozconfigs/l...")
 
(Replaced content with "This is the example patch for the Thunderbird Try Server to enable client.py to apply patches. <pre> diff --git a/build/client.py-args b/build/client.py-args --- a/build/cli...")
Line 2: Line 2:


<pre>
<pre>
diff --git a/mail/config/mozconfigs/linux32/debug b/mail/config/mozconfigs/linux32/debug
diff --git a/build/client.py-args b/build/client.py-args
--- a/mail/config/mozconfigs/linux32/debug
--- a/build/client.py-args
+++ b/mail/config/mozconfigs/linux32/debug
+++ b/build/client.py-args
@@ -22,5 +22,5 @@ mk_add_options MOZ_MAKE_FLAGS="-j$CONCUR
@@ -1,1 +1,1 @@
ac_add_options --with-ccache=/usr/bin/ccache
---hg-options='--time' --hgtool=../tools/buildfarm/utils/hgtool.py --skip-chatzilla --skip-comm --skip-inspector --skip-venkman --tinderbox-print
+--hg-options='--time' --apply-patches --skip-chatzilla --skip-comm --skip-inspector --skip-venkman --tinderbox-print
# Run client.py
-mk_add_options CLIENT_PY_ARGS="--hg-options='--time' --hgtool=../tools/buildfarm/utils/hgtool.py --skip-chatzilla --skip-comm --skip-inspector --skip-venkman --tinderbox-print"
+mk_add_options CLIENT_PY_ARGS="--hg-options='--time' --apply-patches --skip-chatzilla --skip-comm --skip-inspector --skip-venkman --tinderbox-print"
mk_add_options ALWAYS_RUN_CLIENT_PY=1
diff --git a/mail/config/mozconfigs/linux32/nightly b/mail/config/mozconfigs/linux32/nightly
--- a/mail/config/mozconfigs/linux32/nightly
+++ b/mail/config/mozconfigs/linux32/nightly
@@ -23,5 +23,5 @@ mk_add_options MOZ_MAKE_FLAGS="-j$CONCUR
ac_add_options --with-ccache=/usr/bin/ccache
# Run client.py
-mk_add_options CLIENT_PY_ARGS="--hg-options='--time' --hgtool=../tools/buildfarm/utils/hgtool.py --skip-chatzilla --skip-comm --skip-inspector --skip-venkman --tinderbox-print"
+mk_add_options CLIENT_PY_ARGS="--hg-options='--time' --apply-patches --skip-chatzilla --skip-comm --skip-inspector --skip-venkman --tinderbox-print"
mk_add_options ALWAYS_RUN_CLIENT_PY=1
diff --git a/mail/config/mozconfigs/linux64/debug b/mail/config/mozconfigs/linux64/debug
--- a/mail/config/mozconfigs/linux64/debug
+++ b/mail/config/mozconfigs/linux64/debug
@@ -22,6 +22,6 @@ mk_add_options MOZ_MAKE_FLAGS="-j$CONCUR
ac_add_options --with-ccache=/usr/bin/ccache
# Run client.py
-mk_add_options CLIENT_PY_ARGS="--hg-options='--time' --hgtool=../tools/buildfarm/utils/hgtool.py --skip-chatzilla --skip-comm --skip-inspector --skip-venkman --tinderbox-print"
+mk_add_options CLIENT_PY_ARGS="--hg-options='--time' --apply-patches --skip-chatzilla --skip-comm --skip-inspector --skip-venkman --tinderbox-print"
mk_add_options ALWAYS_RUN_CLIENT_PY=1
diff --git a/mail/config/mozconfigs/linux64/nightly b/mail/config/mozconfigs/linux64/nightly
--- a/mail/config/mozconfigs/linux64/nightly
+++ b/mail/config/mozconfigs/linux64/nightly
@@ -23,5 +23,5 @@ mk_add_options MOZ_MAKE_FLAGS="-j$CONCUR
ac_add_options --with-ccache=/usr/bin/ccache
# Run client.py
-mk_add_options CLIENT_PY_ARGS="--hg-options='--time' --hgtool=../tools/buildfarm/utils/hgtool.py --skip-chatzilla --skip-comm --skip-inspector --skip-venkman --tinderbox-print"
+mk_add_options CLIENT_PY_ARGS="--hg-options='--time' --apply-patches --skip-chatzilla --skip-comm --skip-inspector --skip-venkman --tinderbox-print"
mk_add_options ALWAYS_RUN_CLIENT_PY=1
diff --git a/mail/config/mozconfigs/macosx-universal/nightly b/mail/config/mozconfigs/macosx-universal/nightly
--- a/mail/config/mozconfigs/macosx-universal/nightly
+++ b/mail/config/mozconfigs/macosx-universal/nightly
@@ -30,5 +30,5 @@ mk_add_options MOZ_MAKE_FLAGS="-j$CONCUR
ac_add_options --with-ccache
# Run client.py
-mk_add_options CLIENT_PY_ARGS="--hg-options='--time' --hgtool=../tools/buildfarm/utils/hgtool.py --skip-chatzilla --skip-comm --skip-inspector --skip-venkman --tinderbox-print"
+mk_add_options CLIENT_PY_ARGS="--hg-options='--time' --apply-patches --skip-chatzilla --skip-comm --skip-inspector --skip-venkman --tinderbox-print"
mk_add_options ALWAYS_RUN_CLIENT_PY=1
diff --git a/mail/config/mozconfigs/macosx32/debug b/mail/config/mozconfigs/macosx32/debug
--- a/mail/config/mozconfigs/macosx32/debug
+++ b/mail/config/mozconfigs/macosx32/debug
@@ -16,5 +16,5 @@ export MOZ_DEBUG_SYMBOLS=1
ac_add_options --with-ccache
# Run client.py
-mk_add_options CLIENT_PY_ARGS="--hg-options='--time' --hgtool=../tools/buildfarm/utils/hgtool.py --skip-chatzilla --skip-comm --skip-inspector --skip-venkman --tinderbox-print"
+mk_add_options CLIENT_PY_ARGS="--hg-options='--time' --apply-patches --skip-chatzilla --skip-comm --skip-inspector --skip-venkman --tinderbox-print"
mk_add_options ALWAYS_RUN_CLIENT_PY=1
diff --git a/mail/config/mozconfigs/macosx64/debug b/mail/config/mozconfigs/macosx64/debug
--- a/mail/config/mozconfigs/macosx64/debug
+++ b/mail/config/mozconfigs/macosx64/debug
@@ -17,5 +17,5 @@ export MOZ_DEBUG_SYMBOLS=1
ac_add_options --with-ccache
# Run client.py
-mk_add_options CLIENT_PY_ARGS="--hg-options='--time' --hgtool=../tools/buildfarm/utils/hgtool.py --skip-chatzilla --skip-comm --skip-inspector --skip-venkman --tinderbox-print"
+mk_add_options CLIENT_PY_ARGS="--hg-options='--time' --apply-patches --skip-chatzilla --skip-comm --skip-inspector --skip-venkman --tinderbox-print"
mk_add_options ALWAYS_RUN_CLIENT_PY=1
diff --git a/mail/config/mozconfigs/win32/debug b/mail/config/mozconfigs/win32/debug
--- a/mail/config/mozconfigs/win32/debug
+++ b/mail/config/mozconfigs/win32/debug
@@ -16,6 +16,6 @@ else
fi
# Run client.py
-mk_add_options CLIENT_PY_ARGS="--hg-options='--time' --hgtool=../tools/buildfarm/utils/hgtool.py --skip-chatzilla --skip-comm --skip-inspector --skip-venkman --tinderbox-print"
+mk_add_options CLIENT_PY_ARGS="--hg-options='--time' --apply-patches --skip-chatzilla --skip-comm --skip-inspector --skip-venkman --tinderbox-print"
mk_add_options ALWAYS_RUN_CLIENT_PY=1
diff --git a/mail/config/mozconfigs/win32/nightly b/mail/config/mozconfigs/win32/nightly
--- a/mail/config/mozconfigs/win32/nightly
+++ b/mail/config/mozconfigs/win32/nightly
@@ -17,5 +17,5 @@ else
fi
# Run client.py
-mk_add_options CLIENT_PY_ARGS="--hg-options='--time' --hgtool=../tools/buildfarm/utils/hgtool.py --skip-chatzilla --skip-comm --skip-inspector --skip-venkman --tinderbox-print"
+mk_add_options CLIENT_PY_ARGS="--hg-options='--time' --apply-patches --skip-chatzilla --skip-comm --skip-inspector --skip-venkman --tinderbox-print"
mk_add_options ALWAYS_RUN_CLIENT_PY=1
diff --git a/mail/config/mozconfigs/win64/debug b/mail/config/mozconfigs/win64/debug
--- a/mail/config/mozconfigs/win64/debug
+++ b/mail/config/mozconfigs/win64/debug
@@ -14,5 +14,5 @@ mk_add_options MOZ_MAKE_FLAGS=-j1
. $topsrcdir/build/win64/mozconfig.vs2010
# Run client.py
-mk_add_options CLIENT_PY_ARGS="--hg-options='--time' --hgtool=../tools/buildfarm/utils/hgtool.py --skip-chatzilla --skip-comm --skip-inspector --skip-venkman --tinderbox-print"
+mk_add_options CLIENT_PY_ARGS="--hg-options='--time' --apply-patches --skip-chatzilla --skip-comm --skip-inspector --skip-venkman --tinderbox-print"
mk_add_options ALWAYS_RUN_CLIENT_PY=1
diff --git a/mail/config/mozconfigs/win64/nightly b/mail/config/mozconfigs/win64/nightly
--- a/mail/config/mozconfigs/win64/nightly
+++ b/mail/config/mozconfigs/win64/nightly
@@ -15,5 +15,5 @@ mk_add_options MOZ_MAKE_FLAGS=-j1
. $topsrcdir/build/win64/mozconfig.vs2010
# Run client.py
-mk_add_options CLIENT_PY_ARGS="--hg-options='--time' --hgtool=../tools/buildfarm/utils/hgtool.py --skip-chatzilla --skip-comm --skip-inspector --skip-venkman --tinderbox-print"
+mk_add_options CLIENT_PY_ARGS="--hg-options='--time' --apply-patches --skip-chatzilla --skip-comm --skip-inspector --skip-venkman --tinderbox-print"
mk_add_options ALWAYS_RUN_CLIENT_PY=1
</pre>
</pre>

Revision as of 21:46, 15 October 2012

This is the example patch for the Thunderbird Try Server to enable client.py to apply patches. 

diff --git a/build/client.py-args b/build/client.py-args
--- a/build/client.py-args
+++ b/build/client.py-args
@@ -1,1 +1,1 @@
---hg-options='--time' --hgtool=../tools/buildfarm/utils/hgtool.py --skip-chatzilla --skip-comm --skip-inspector --skip-venkman --tinderbox-print
+--hg-options='--time' --apply-patches --skip-chatzilla --skip-comm --skip-inspector --skip-venkman --tinderbox-print
Retrieved from "https://wiki.allizom.org/index.php?title=ReleaseEngineering/ThunderbirdTryServer/ApplyPatchesMozconfigPatch&oldid=480033"