Skip to content

Commit 80f795c

Browse files
nzakasnzakas
committed
Fixed YUI Test issues, bumped version
1 parent 036bd12 commit 80f795c

16 files changed

+1181
-997
lines changed

‎CHANGELOG‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
November 13, 2012 - v0.2.0
2+
3+
* Merge pull request #36 from mattiacci/border-radius (Nicholas C. Zakas)
4+
* Fix validation of border-radius (Michael Mattiacci)
5+
* Merge pull request #33 from mattiacci/bg-position (Nicholas C. Zakas)
6+
* Fix validation of background-position (Michael Mattiacci)
7+
* Merge pull request #31 from nightwing/master (Nicholas C. Zakas)
8+
* fix typo (nightwing)
9+
* v0.1.9 (Nicholas C. Zakas)
10+
* Expose vendor prefix for @keyframes (fixes #29) (Nicholas C. Zakas)
11+
* Add support for o-keyframes and remove ms-keyframes (Nicholas C. Zakas)
12+
* Fix changelog (Nicholas C. Zakas)
13+
14+
115
July 23, 2012 - v0.1.9
216

317
* Expose vendor prefix for @keyframes (fixes #29) (Nicholas C. Zakas)
@@ -250,6 +264,8 @@ November 28, 2011 - v0.1.0
250264

251265

252266

267+
268+
253269

254270

255271

‎build.xml‎

Lines changed: 52 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
11
<project name="parserlib" default="build.all">
22

33
<!-- version number -->
4-
<property name="parserlib.version" value="0.1.9" />
4+
<property name="parserlib.version" value="0.2.0" />
55

66
<!-- the directories containing the source files -->
77
<property name="src.dir" value="./src" />
88
<property name="tests.dir" value="./tests" />
99
<property name="npm.dir" value="./npm" />
10-
10+
1111
<!-- the directories and files to output to -->
1212
<property name="lib.dir" value="./lib" />
13-
13+
1414
<!-- the directories and files to output to -->
1515
<property name="build.dir" value="./build" />
1616
<property name="release.dir" value="./release" />
1717
<property name="build.npm.dir" value="${build.dir}/npm" />
18-
18+
1919
<!-- output filenames -->
2020
<property name="full.build.file" value="parserlib.js"/>
2121
<property name="core.build.file" value="parserlib-core.js"/>
2222
<property name="css.build.file" value="parserlib-css.js"/>
2323
<property name="tests.build.file" value="parserlib-tests.js"/>
2424
<property name="node.build.file" value="node-parserlib.js"/>
25-
25+
2626
<!-- license information -->
2727
<loadfile property="license.text" srcfile="LICENSE" />
28-
28+
2929
<tstamp>
3030
<format property="RIGHT_NOW"
3131
pattern="d-MMMM-yyyy hh:mm:ss"
@@ -35,77 +35,77 @@
3535
<format property="SIMPLE_DATE"
3636
pattern="MMMM d, yyyy"
3737
locale="en,US"/>
38-
</tstamp>
39-
38+
</tstamp>
39+
4040
<!-- clean -->
4141
<target name="clean">
4242
<delete dir="${build.dir}" />
4343
</target>
44-
44+
4545
<target name="changelog.update">
4646
<exec executable="git" failonerror="true" outputproperty="git.tag">
4747
<arg line="tag"/>
48-
</exec>
48+
</exec>
4949
<script language="javascript"><![CDATA[
5050
//get the most recent tag to get the diff
5151
var tags = parserlib.getProperty("git.tag").replace("\r", "").split("\n"),
5252
lastTag = tags[tags.length-1];
5353
parserlib.setProperty("git.log.range", lastTag + "..HEAD");
5454
]]></script>
55-
55+
5656
<!-- git log -pretty=format:'* %s (%an)' v0.4.0..v0.5.0-->
5757
<exec executable="git" failonerror="true" outputproperty="git.changelog">
5858
<arg line="log --pretty=format:'* %s (%an)' ${git.log.range}"/>
59-
</exec>
60-
59+
</exec>
60+
6161
<concat destfile="CHANGELOG.tmp" fixlastline="true">
6262
<header trimleading="yes">${SIMPLE_DATE} - v${parserlib.version}
63-
63+
6464
${git.changelog}
65-
65+
6666
</header>
6767
<fileset dir="." includes="CHANGELOG" />
6868
</concat>
69-
69+
7070
<delete file="CHANGELOG"/>
7171
<move file="CHANGELOG.tmp" tofile="CHANGELOG"/>
72-
72+
7373
</target>
74-
74+
7575
<!-- validate JS files with JSHint -->
76-
<target name="lint">
76+
<target name="lint">
7777
<fileset dir="${src.dir}" includes="**/*.js" id="jsfiles.raw"/>
7878
<pathconvert pathsep=" " property="jsfiles.clean" refid="jsfiles.raw" />
7979
<exec executable="java" failonerror="true">
8080
<arg line="-jar"/>
8181
<arg path="${lib.dir}/js.jar"/>
82-
<arg path="${lib.dir}/jshint.js" />
82+
<arg path="${lib.dir}/jshint.js" />
8383
<arg line="${jsfiles.clean} curly=true,forin=true,latedef=true,evil=true,loopfunc=true,undef=true,rhino=false" />
84-
</exec>
85-
</target>
86-
84+
</exec>
85+
</target>
86+
8787
<!-- run tests on the command line -->
88-
<target name="test" depends="lint,build.all">
88+
<target name="test" depends="lint,build.all">
8989
<apply executable="java" failonerror="true">
9090
<fileset dir="${tests.dir}" includes="**/*.js"/>
9191
<arg line="-jar"/>
9292
<arg path="${lib.dir}/js.jar"/>
9393
<arg path="${lib.dir}/yuitest-rhino-cli.js" />
9494
<arg path="${build.dir}/${full.build.file}" />
9595
<srcfile/>
96-
</apply>
97-
</target>
98-
96+
</apply>
97+
</target>
98+
9999
<!-- build the full library -->
100100
<target name="build.full" depends="build.core,build.css">
101101
<concat destfile="${build.dir}/${full.build.file}" fixlastline="true">
102102
<filelist dir="${build.dir}" files="${core.build.file}, ${css.build.file}"/>
103-
</concat>
103+
</concat>
104104
</target>
105-
105+
106106
<!-- build the core library -->
107107
<target name="build.core">
108-
108+
109109
<concat destfile="${build.dir}/${core.build.file}" fixlastline="true">
110110
<header trimleading="yes">/*!
111111
${license.text}
@@ -127,13 +127,13 @@
127127
})();
128128
</footer>
129129
</concat>
130-
130+
131131
</target>
132-
132+
133133
<!-- build the CSS library -->
134134
<target name="build.css">
135135
<concat destfile="${build.dir}/${css.build.file}" fixlastline="true">
136-
<header trimleading="yes">/*
136+
<header trimleading="yes">/*
137137
${license.text}
138138
*/
139139
/* Version v@VERSION@, Build time: ${RIGHT_NOW} */
@@ -143,13 +143,13 @@
143143
StringReader = parserlib.util.StringReader,
144144
SyntaxError = parserlib.util.SyntaxError,
145145
SyntaxUnit = parserlib.util.SyntaxUnit;
146-
</header>
146+
</header>
147147
<!--<filelist dir="${src.dir}/css" files="CSSTokens.js, CSSSelectorUnit.js, CSSColors.js, CSSValueUnit.js, CSSParser.js"/>-->
148148
<fileset dir="${src.dir}/css" includes="*.js" />
149149
<footer trimleading="yes">
150150
parserlib.css = {
151-
Colors :Colors,
152-
Combinator :Combinator,
151+
Colors :Colors,
152+
Combinator :Combinator,
153153
Parser :Parser,
154154
PropertyName :PropertyName,
155155
PropertyValue :PropertyValue,
@@ -168,39 +168,39 @@
168168
</footer>
169169

170170
</concat>
171-
171+
172172
</target>
173-
173+
174174
<!-- build the Node.js package -->
175175
<target name="build.node">
176-
176+
177177
<concat destfile="${build.dir}/${node.build.file}" fixlastline="true">
178178
<filelist dir="${build.dir}" files="${core.build.file}, ${css.build.file}"/>
179179
<footer trimleading="yes">
180180
(function(){
181181
for(var prop in parserlib){
182-
exports[prop] = parserlib[prop];
182+
exports[prop] = parserlib[prop];
183183
}
184184
})();
185185
</footer>
186186
</concat>
187-
187+
188188
<mkdir dir="${build.npm.dir}"/>
189189
<mkdir dir="${build.npm.dir}/lib"/>
190190
<copy file="${npm.dir}/package.json" todir="${build.npm.dir}"/>
191191
<copy file="${build.dir}/${node.build.file}" todir="${build.npm.dir}/lib"/>
192-
192+
193193
<!-- CRLF will cause Node version to break -->
194194
<fixcrlf srcdir="${build.dir}" includes="**/*" eol="lf" />
195-
</target>
196-
195+
</target>
196+
197197
<!-- build the tests into a single file -->
198-
<target name="build.tests">
198+
<target name="build.tests">
199199
<concat destfile="${build.dir}/${tests.build.file}" fixlastline="true">
200-
<fileset dir="${tests.dir}/" includes="**/*.js" />
201-
</concat>
202-
</target>
203-
200+
<fileset dir="${tests.dir}/" includes="**/*.js" />
201+
</concat>
202+
</target>
203+
204204
<!-- Create a release with version number embedded -->
205205
<target name="release" depends="test,build.all,changelog.update">
206206
<delete dir="${release.dir}" />
@@ -210,9 +210,9 @@
210210
</copy>
211211
<replaceregexp match="@VERSION@" replace="${parserlib.version}" flags="g" byline="true">
212212
<fileset dir="${release.dir}" includes="**/*"/>
213-
</replaceregexp>
214-
</target>
215-
213+
</replaceregexp>
214+
</target>
215+
216216
<!-- Build all files -->
217217
<target name="build.all" depends="build.full,build.node,build.tests"/>
218218

0 commit comments

Comments
 (0)