Skip to content

Commit 1063c50

Browse files
kjinkjin
committed
Use Closure Compiler directly instead of closurebuilder.py.
1 parent 8a7f01e commit 1063c50

File tree

4 files changed

+218
-123
lines changed

4 files changed

+218
-123
lines changed

‎javascript/build.xml‎

Lines changed: 58 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -13,50 +13,48 @@
1313
value="${basedir}/../../python-gflags" />
1414

1515
<macrodef name="closure-compile">
16-
<attribute name="inputfile" />
16+
<attribute name="entrypoint" />
1717
<attribute name="outputfile" />
1818
<attribute name="compilationlevel" default="ADVANCED_OPTIMIZATIONS" />
19-
<attribute name="outputmode" default="compiled" />
2019
<attribute name="outputwrapper" default="(function(){%output%})();" />
2120
<element name="extraflags" optional="yes" />
2221
<sequential>
23-
<exec executable="python" failonerror="true" logError="true">
24-
<arg value="${closure-library.dir}/closure/bin/build/closurebuilder.py" />
25-
<arg line='-i "@{inputfile}"' />
26-
<arg line='--output_file "@{outputfile}"' />
27-
<arg line='--root "${closure-library.dir}"' />
28-
<arg line="-o @{outputmode}" />
29-
<arg line='-c "${closure-compiler.jar}"' />
30-
<arg line='-f "--output_wrapper=@{outputwrapper}"' />
31-
<arg line='-f "--compilation_level=@{compilationlevel}"' />
32-
<arg line='-f "--warning_level=VERBOSE"' />
33-
<arg line='-f "--jscomp_error=accessControls"' />
34-
<arg line='-f "--jscomp_error=checkDebuggerStatement"' />
35-
<arg line='-f "--jscomp_error=checkRegExp"' />
36-
<arg line='-f "--jscomp_error=checkTypes"' />
37-
<arg line='-f "--jscomp_error=checkVars"' />
38-
<arg line='-f "--jscomp_error=const"' />
39-
<arg line='-f "--jscomp_error=constantProperty"' />
40-
<arg line='-f "--jscomp_error=duplicate"' />
41-
<arg line='-f "--jscomp_error=duplicateMessage"' />
42-
<arg line='-f "--jscomp_error=es5Strict"' />
43-
<arg line='-f "--jscomp_error=externsValidation"' />
44-
<arg line='-f "--jscomp_error=extraRequire"' />
45-
<arg line='-f "--jscomp_error=globalThis"' />
46-
<arg line='-f "--jscomp_error=invalidCasts"' />
47-
<arg line='-f "--jscomp_error=misplacedTypeAnnotation"' />
48-
<arg line='-f "--jscomp_error=missingProperties"' />
49-
<arg line='-f "--jscomp_error=missingRequire"' />
50-
<arg line='-f "--jscomp_error=missingRequire"' />
51-
<arg line='-f "--jscomp_error=nonStandardJsDocs"' />
52-
<arg line='-f "--jscomp_error=strictModuleDepCheck"' />
53-
<arg line='-f "--jscomp_error=suspiciousCode"' />
54-
<arg line='-f "--jscomp_error=typeInvalidation"' />
55-
<arg line='-f "--jscomp_error=undefinedNames"' />
56-
<arg line='-f "--jscomp_error=undefinedVars"' />
57-
<arg line='-f "--jscomp_error=unknownDefines"' />
58-
<arg line='-f "--jscomp_error=uselessCode"' />
59-
<arg line='-f "--jscomp_error=visibility"' />
22+
<exec executable="java" failonerror="true" logError="true">
23+
<arg value="-jar" />
24+
<arg value="${closure-compiler.jar}" />
25+
<arg line='--entry_point="@{entrypoint}"' />
26+
<arg line='--js_output_file="@{outputfile}"' />
27+
<arg line='--js="${closure-library.dir}/closure/goog/**.js"' />
28+
<arg line='--js="${closure-library.dir}/third_party/closure/goog/**.js"' />
29+
<arg line="--output_wrapper=@{outputwrapper}" />
30+
<arg line="--compilation_level=@{compilationlevel}" />
31+
<arg line="--warning_level=VERBOSE" />
32+
<arg line="--jscomp_error=accessControls" />
33+
<arg line="--jscomp_error=checkDebuggerStatement" />
34+
<arg line="--jscomp_error=checkRegExp" />
35+
<arg line="--jscomp_error=checkTypes" />
36+
<arg line="--jscomp_error=checkVars" />
37+
<arg line="--jscomp_error=const" />
38+
<arg line="--jscomp_error=constantProperty" />
39+
<arg line="--jscomp_error=duplicate" />
40+
<arg line="--jscomp_error=duplicateMessage" />
41+
<arg line="--jscomp_error=es5Strict" />
42+
<arg line="--jscomp_error=externsValidation" />
43+
<arg line="--jscomp_error=extraRequire" />
44+
<arg line="--jscomp_error=globalThis" />
45+
<arg line="--jscomp_error=invalidCasts" />
46+
<arg line="--jscomp_error=misplacedTypeAnnotation" />
47+
<arg line="--jscomp_error=missingProperties" />
48+
<arg line="--jscomp_error=missingRequire" />
49+
<arg line="--jscomp_error=nonStandardJsDocs" />
50+
<arg line="--jscomp_error=strictModuleDepCheck" />
51+
<arg line="--jscomp_error=suspiciousCode" />
52+
<arg line="--jscomp_error=typeInvalidation" />
53+
<arg line="--jscomp_error=undefinedNames" />
54+
<arg line="--jscomp_error=undefinedVars" />
55+
<arg line="--jscomp_error=unknownDefines" />
56+
<arg line="--jscomp_error=uselessCode" />
57+
<arg line="--jscomp_error=visibility" />
6058
<extraflags />
6159
</exec>
6260
</sequential>
@@ -95,40 +93,44 @@
9593

9694
<target name="compile-demo"
9795
description="generates demo-compiled.js">
98-
<closure-compile inputfile="i18n/phonenumbers/demo.js"
96+
<closure-compile entrypoint="goog:i18n.phonenumbers.demo"
9997
outputfile="i18n/phonenumbers/demo-compiled.js">
10098
<extraflags>
101-
<arg line='--root "i18n/phonenumbers"' />
102-
<arg line='-e "i18n/phonenumbers/metadatafortesting.js"' />
103-
<arg line='-e "i18n/phonenumbers/metadatalite.js"' />
104-
<arg line='-e "i18n/phonenumbers/regioncodefortesting.js"' />
99+
<arg line='--js="i18n/phonenumbers/**.js"' />
100+
<arg line='--js="!i18n/phonenumbers/demo-compiled.js"' />
101+
<arg line='--js="!i18n/phonenumbers/metadatafortesting.js"' />
102+
<arg line='--js="!i18n/phonenumbers/metadatalite.js"' />
103+
<arg line='--js="!i18n/phonenumbers/regioncodefortesting.js"' />
105104
</extraflags>
106105
</closure-compile>
107106
</target>
108107

109108
<target name="compile-tests" depends="setnulldevice">
110-
<closure-compile inputfile="i18n/phonenumbers/asyoutypeformatter_test.js"
109+
<closure-compile entrypoint="goog:i18n.phonenumbers.AsYouTypeFormatterTest"
111110
outputfile="${null.device}">
112111
<extraflags>
113-
<arg line='--root "i18n/phonenumbers"' />
114-
<arg line='-e "i18n/phonenumbers/metadata.js"' />
115-
<arg line='-e "i18n/phonenumbers/metadatalite.js"' />
112+
<arg line='--js="i18n/phonenumbers/**.js"' />
113+
<arg line='--js="!i18n/phonenumbers/demo-compiled.js"' />
114+
<arg line='--js="!i18n/phonenumbers/metadata.js"' />
115+
<arg line='--js="!i18n/phonenumbers/metadatalite.js"' />
116116
</extraflags>
117117
</closure-compile>
118-
<closure-compile inputfile="i18n/phonenumbers/phonenumberutil_test.js"
118+
<closure-compile entrypoint="goog:i18n.phonenumbers.PhoneNumberUtilTest"
119119
outputfile="${null.device}">
120120
<extraflags>
121-
<arg line='--root "i18n/phonenumbers"' />
122-
<arg line='-e "i18n/phonenumbers/metadata.js"' />
123-
<arg line='-e "i18n/phonenumbers/metadatalite.js"' />
121+
<arg line='--js="i18n/phonenumbers/**.js"' />
122+
<arg line='--js="!i18n/phonenumbers/demo-compiled.js"' />
123+
<arg line='--js="!i18n/phonenumbers/metadata.js"' />
124+
<arg line='--js="!i18n/phonenumbers/metadatalite.js"' />
124125
</extraflags>
125126
</closure-compile>
126-
<closure-compile inputfile="i18n/phonenumbers/shortnumberinfo_test.js"
127+
<closure-compile entrypoint="goog:i18n.phonenumbers.ShortNumberInfoTest"
127128
outputfile="${null.device}">
128129
<extraflags>
129-
<arg line='--root "i18n/phonenumbers"' />
130-
<arg line='-e "i18n/phonenumbers/metadata.js"' />
131-
<arg line='-e "i18n/phonenumbers/metadatalite.js"' />
130+
<arg line='--js="i18n/phonenumbers/**.js"' />
131+
<arg line='--js="!i18n/phonenumbers/demo-compiled.js"' />
132+
<arg line='--js="!i18n/phonenumbers/metadata.js"' />
133+
<arg line='--js="!i18n/phonenumbers/metadatalite.js"' />
132134
</extraflags>
133135
</closure-compile>
134136
</target>

0 commit comments

Comments
 (0)