Revision: 5463
Author: [email protected]
Date: Fri Jun 28 16:16:54 2013
Log: Fix version-skew build rule to accept all svnversion outputs.
https://codereview.appspot.com/10743045
In particular, when working in a non-SVN tree, svnversion produces the
string "exported", which was not matched, causing all version-skew tests
to fail. This problem was introduced in r5461.
[email protected]
http://code.google.com/p/google-caja/source/detail?r=5463
Modified:
/trunk/build.xml
=======================================
--- /trunk/build.xml Tue Jun 25 16:38:08 2013
+++ /trunk/build.xml Fri Jun 28 16:16:54 2013
@@ -1458,7 +1458,7 @@
</copy>
<replaceregexp
flags="g"
- match="(cajaBuildVersion\s*=|'cajolerVersion':)\s*'[m\d]+'"
+ match="(cajaBuildVersion\s*=|'cajolerVersion':)\s*'([\dmsp_]+|
exported)'"
replace="\1'0000'">
<fileset dir="${war}/testing/skew-0000" includes="**/*.js"/>
</replaceregexp>
@@ -1472,7 +1472,7 @@
</copy>
<replaceregexp
flags="g"
- match="(cajaBuildVersion\s*=|'cajolerVersion':)\s*'[m\d]+'"
+ match="(cajaBuildVersion\s*=|'cajolerVersion':)\s*'([\dmsp_]+|
exported)'"
replace="\1'${ver.mmm}'">
<fileset dir="${war}/testing/skew-mmm" includes="**/*.js"/>
</replaceregexp>
--
---
You received this message because you are subscribed to the Google Groups "Google Caja Discuss" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.
