Skip to content

Commit b41b989

Browse files
committed
#0000 Review: Correction/optimization
1 parent 379f7f0 commit b41b989

File tree

1 file changed

+31
-30
lines changed

1 file changed

+31
-30
lines changed

development/build.xml

Lines changed: 31 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
<echo> </echo>
55
<echo> the following targets are available ... </echo>
66
<echo> </echo>
7-
<echo> archive builds aspect-js in the main project </echo>
7+
<echo> archive release of aspect-js tutorial based </echo>
8+
<echo> on the existing aspect-js version </echo>
89
<echo> </echo>
910
<echo> update builds aspect-js in the main project </echo>
1011
<echo> and updates aspect-js in all examples </echo>
@@ -31,24 +32,24 @@
3132

3233
<macrodef name="release-locate">
3334
<sequential>
34-
<copy file="../aspect-js tutorial/CHANGES" tofile="../aspect-js tutorial/CHANGES.tmp" overwrite="true"/>
35-
<replaceregexp file="../aspect-js tutorial/CHANGES.tmp"
35+
<copy file="../aspect-js-tutorial/CHANGES" tofile="../aspect-js-tutorial/CHANGES.tmp" overwrite="true"/>
36+
<replaceregexp file="../aspect-js-tutorial/CHANGES.tmp"
3637
match="(?s)^\s*([\d\.x]+) (\d{4})([\dx]+).*$" flags="g" byline="false"
3738
replace="release.version=\1&#x000D;release.year=\2&#x000D;release.date=\2\3&#x000D;"/>
38-
<replaceregexp file="../aspect-js tutorial/CHANGES.tmp" match="x+" replace="0000" flags="g" byline="false"/>
39+
<replaceregexp file="../aspect-js-tutorial/CHANGES.tmp" match="x+" replace="0000" flags="g" byline="false"/>
3940
<loadproperties>
40-
<file file="../aspect-js tutorial/CHANGES.tmp"/>
41+
<file file="../aspect-js-tutorial/CHANGES.tmp"/>
4142
</loadproperties>
42-
<delete file="../aspect-js tutorial/CHANGES.tmp"/>
43-
<echo file="../aspect-js tutorial/CHANGES.tmp" message="release.major=${release.version}"/>
44-
<replaceregexp file="../aspect-js tutorial/CHANGES.tmp"
43+
<delete file="../aspect-js-tutorial/CHANGES.tmp"/>
44+
<echo file="../aspect-js-tutorial/CHANGES.tmp" message="release.major=${release.version}"/>
45+
<replaceregexp file="../aspect-js-tutorial/CHANGES.tmp"
4546
match="(?&lt;=\d+)\." byline="true" replace="&#x000D;release.minor="/>
46-
<replaceregexp file="../aspect-js tutorial/CHANGES.tmp"
47+
<replaceregexp file="../aspect-js-tutorial/CHANGES.tmp"
4748
match="(?&lt;=\d+)\." byline="true" replace="&#x000D;release.patch="/>
4849
<loadproperties>
49-
<file file="../aspect-js tutorial/CHANGES.tmp"/>
50+
<file file="../aspect-js-tutorial/CHANGES.tmp"/>
5051
</loadproperties>
51-
<delete file="../aspect-js tutorial/CHANGES.tmp"/>
52+
<delete file="../aspect-js-tutorial/CHANGES.tmp"/>
5253
</sequential>
5354
</macrodef>
5455

@@ -77,33 +78,33 @@
7778
</target>
7879

7980
<target name="changes">
80-
<replaceregexp file="../aspect-js tutorial/CHANGES" match="&#x00E4;" replace="ae" flags="g"/>
81-
<replaceregexp file="../aspect-js tutorial/CHANGES" match="&#x00C4;" replace="Ae" flags="g"/>
82-
<replaceregexp file="../aspect-js tutorial/CHANGES" match="&#x00F6;" replace="oe" flags="g"/>
83-
<replaceregexp file="../aspect-js tutorial/CHANGES" match="&#x00D6;" replace="Oe" flags="g"/>
84-
<replaceregexp file="../aspect-js tutorial/CHANGES" match="&#x00FC;" replace="ue" flags="g"/>
85-
<replaceregexp file="../aspect-js tutorial/CHANGES" match="&#x00DC;" replace="Ue" flags="g"/>
81+
<replaceregexp file="../aspect-js-tutorial/CHANGES" match="&#x00E4;" replace="ae" flags="g"/>
82+
<replaceregexp file="../aspect-js-tutorial/CHANGES" match="&#x00C4;" replace="Ae" flags="g"/>
83+
<replaceregexp file="../aspect-js-tutorial/CHANGES" match="&#x00F6;" replace="oe" flags="g"/>
84+
<replaceregexp file="../aspect-js-tutorial/CHANGES" match="&#x00D6;" replace="Oe" flags="g"/>
85+
<replaceregexp file="../aspect-js-tutorial/CHANGES" match="&#x00FC;" replace="ue" flags="g"/>
86+
<replaceregexp file="../aspect-js-tutorial/CHANGES" match="&#x00DC;" replace="Ue" flags="g"/>
8687

87-
<copy file="../aspect-js tutorial/CHANGES" tofile="../aspect-js tutorial/CHANGES.tmp" overwrite="true"/>
88-
<replaceregexp file="../aspect-js tutorial/CHANGES.tmp" match="^\s+" replace="" byline="false"/>
89-
<replaceregexp file="../aspect-js tutorial/CHANGES.tmp" match="(?s)^(.*?)[\r\n]+\d[\d\. x]+.*$" replace="\1" byline="false"/>
90-
<replaceregexp file="../aspect-js tutorial/CHANGES.tmp" match="^(.*?)\s*$" replace="\1 " flags="g" byline="true"/>
91-
<replaceregexp file="../aspect-js tutorial/CHANGES.tmp" match="^(\d[\.\d x]+)[^\r\n]*" replace="## \1" byline="false"/>
92-
<replaceregexp file="../aspect-js tutorial/CHANGES.tmp" match="^ {0,4}([A-Z]+:.*)\s*$" replace="\1" byline="true"/>
93-
<replaceregexp file="../aspect-js tutorial/CHANGES.tmp" match="(?s)[\r\n]+ [^\r\n]+" replace="" flags="g" byline="false"/>
94-
<replaceregexp file="../aspect-js tutorial/CHANGES.tmp" match="^(## \d[\.\d]+ \d+)( )" replace="\1 (summary of the current version)\2" flags="g" byline="true"/>
95-
<replaceregexp file="../aspect-js tutorial/CHANGES.tmp" match="^(## \d[\.\d]+ [\dx]+)( )" replace="\1 (summary of the next version)\2" flags="g" byline="true"/>
88+
<copy file="../aspect-js-tutorial/CHANGES" tofile="../aspect-js-tutorial/CHANGES.tmp" overwrite="true"/>
89+
<replaceregexp file="../aspect-js-tutorial/CHANGES.tmp" match="^\s+" replace="" byline="false"/>
90+
<replaceregexp file="../aspect-js-tutorial/CHANGES.tmp" match="(?s)^(.*?)[\r\n]+\d[\d\. x]+.*$" replace="\1" byline="false"/>
91+
<replaceregexp file="../aspect-js-tutorial/CHANGES.tmp" match="^(.*?)\s*$" replace="\1 " flags="g" byline="true"/>
92+
<replaceregexp file="../aspect-js-tutorial/CHANGES.tmp" match="^(\d[\.\d x]+)[^\r\n]*" replace="## \1" byline="false"/>
93+
<replaceregexp file="../aspect-js-tutorial/CHANGES.tmp" match="^ {0,4}([A-Z]+:.*)\s*$" replace="\1" byline="true"/>
94+
<replaceregexp file="../aspect-js-tutorial/CHANGES.tmp" match="(?s)[\r\n]+ [^\r\n]+" replace="" flags="g" byline="false"/>
95+
<replaceregexp file="../aspect-js-tutorial/CHANGES.tmp" match="^(## \d[\.\d]+ \d+)( )" replace="\1 (summary of the current version)\2" flags="g" byline="true"/>
96+
<replaceregexp file="../aspect-js-tutorial/CHANGES.tmp" match="^(## \d[\.\d]+ [\dx]+)( )" replace="\1 (summary of the next version)\2" flags="g" byline="true"/>
9697
<loadresource property="changes">
97-
<file file="../aspect-js tutorial/CHANGES.tmp"/>
98+
<file file="../aspect-js-tutorial/CHANGES.tmp"/>
9899
</loadresource>
99-
<delete file="../aspect-js tutorial/CHANGES.tmp"/>
100-
<replaceregexp file="../aspect-js tutorial/README.md"
100+
<delete file="../aspect-js-tutorial/CHANGES.tmp"/>
101+
<replaceregexp file="../aspect-js-tutorial/README.md"
101102
match="(?si)(# Changes \(Change Log\)\s+).*?(\[Read more\])" flags="g" byline="false"
102103
replace="\1${changes}${line.separator}${line.separator}\2"/>
103104
<tstamp>
104105
<format property="now.year" pattern="yyyy"/>
105106
</tstamp>
106-
<replaceregexp file="../aspect-js tutorial/README.md"
107+
<replaceregexp file="../aspect-js-tutorial/README.md"
107108
match="(?si)(?&lt;=\(C\)\s)\d{4}\b" flags="g" byline="true"
108109
replace="${now.year}"/>
109110
</target>

0 commit comments

Comments
 (0)