Skip to content

Commit 88b487f

Browse files
committed
Removed todo.txt (leftover) and updated build.xml accordingly
1 parent e9e257b commit 88b487f

File tree

2 files changed

+7
-227
lines changed

2 files changed

+7
-227
lines changed

build/build.xml

+7-26
Original file line numberDiff line numberDiff line change
@@ -112,42 +112,23 @@
112112
<!-- Revision check -->
113113
<!-- - - - - - - - - -->
114114
<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-
128115
<!-- figure out the revision number in base.java -->
129116
<loadfile srcfile="../app/src/processing/app/Base.java"
130-
property="revision.base">
117+
property="revision">
131118
<filterchain>
132119
<tokenfilter>
133120
<linetokenizer />
134121
<containsregex pattern="String VERSION_NAME = "/>
135122
<replaceregex pattern="[^0-9]*" flags="g" replace=""/>
136123
</tokenfilter>
124+
<tokenfilter>
125+
<stringtokenizer suppressdelims="true"/>
126+
<!-- grab the thing that's 4 digits -->
127+
<containsregex pattern="(\d\d\d\d)" />
128+
</tokenfilter>
137129
</filterchain>
138130
</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}." />
151132
</target>
152133

153134

todo.txt

-201
This file was deleted.

0 commit comments

Comments
 (0)