|
112 | 112 | <!-- Revision check --> |
113 | 113 | <!-- - - - - - - - - --> |
114 | 114 | <target name="revision-check"> |
115 | | - <!-- figure out the revision number --> |
116 | | - <loadfile srcfile="../todo.txt" property="revision"> |
117 | | - <filterchain> |
118 | | - <headfilter lines="1"/> |
119 | | - <tokenfilter> |
120 | | - <stringtokenizer suppressdelims="true"/> |
121 | | - <!-- grab the thing from the first line that's 4 digits --> |
122 | | - <containsregex pattern="(\d\d\d\d)" /> |
123 | | - </tokenfilter> |
124 | | - </filterchain> |
125 | | - </loadfile> |
126 | | - <!-- <echo message="revision is ${revision}." /> --> |
127 | | - |
128 | 115 | <!-- figure out the revision number in base.java --> |
129 | 116 | <loadfile srcfile="../app/src/processing/app/Base.java" |
130 | | - property="revision.base"> |
| 117 | + property="revision"> |
131 | 118 | <filterchain> |
132 | 119 | <tokenfilter> |
133 | 120 | <linetokenizer /> |
134 | 121 | <containsregex pattern="String VERSION_NAME = "/> |
135 | 122 | <replaceregex pattern="[^0-9]*" flags="g" replace=""/> |
136 | 123 | </tokenfilter> |
| 124 | + <tokenfilter> |
| 125 | + <stringtokenizer suppressdelims="true"/> |
| 126 | + <!-- grab the thing that's 4 digits --> |
| 127 | + <containsregex pattern="(\d\d\d\d)" /> |
| 128 | + </tokenfilter> |
137 | 129 | </filterchain> |
138 | 130 | </loadfile> |
139 | | - <!-- <echo message="base revision is ${revision.base}." /> --> |
140 | | - |
141 | | - <condition property="revision.correct"> |
142 | | - <!-- Using contains because I can't figure out how to get rid of the |
143 | | - LF in revision.base. Please file a bug if you have a fix. --> |
144 | | - <contains string="${revision.base}" substring="${revision}"/> |
145 | | - </condition> |
146 | | - |
147 | | - <!-- the revision.base property won't be set |
148 | | - if $revision wasn't found... --> |
149 | | - <fail unless="revision.correct" |
150 | | - message="Fix revision number in Base.java" /> |
| 131 | + <echo message="base revision is ${revision}." /> |
151 | 132 | </target> |
152 | 133 |
|
153 | 134 |
|
|
0 commit comments