Skip to content
This repository was archived by the owner on Jun 5, 2020. It is now read-only.

Commit 92983df

Browse files
committed
Post-merge, versioning
1 parent 2992295 commit 92983df

File tree

4 files changed

+38
-68
lines changed

4 files changed

+38
-68
lines changed

ClosureCompiler.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,10 +161,10 @@
161161
delete options["xmx"];
162162

163163
var jarFilePath;
164-
if (options['compiler_jar'])
164+
if (options['compiler_jar']) {
165165
jarFilePath = options['compiler_jar'];
166166
delete options['compiler_jar'];
167-
else {
167+
} else {
168168
var jarDir = __dirname + '/compiler';
169169
fs.readdirSync(jarDir).forEach(function(file) {
170170
if (file.indexOf('closure-compiler') !== -1) {

ClosureCompiler.min.js

Lines changed: 12 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

compiler/README.md

Lines changed: 23 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ The [Closure Compiler](https://developers.google.com/closure/compiler/) is a too
99
* [Download a specific version](https://github.com/google/closure-compiler/wiki/Binary-Downloads). Also available via:
1010
- [Maven](https://github.com/google/closure-compiler/wiki/Maven)
1111
- [NPM](https://www.npmjs.com/package/google-closure-compiler)
12+
* [Use the JavaScript version](https://github.com/google/closure-compiler-js), with no Java dependency
1213
* See the [Google Developers Site](https://developers.google.com/closure/compiler/docs/gettingstarted_app) for documentation including instructions for running the compiler from the command line.
1314

1415
## Options for Getting Help
@@ -45,23 +46,29 @@ unit tests too).
4546

4647
This will produce a jar file called `target/closure-compiler-1.0-SNAPSHOT.jar`.
4748

49+
Running `mvn -DskipTests -pl externs/pom.xml,pom-main.xml,pom-main-shaded.xml`
50+
will skip building the GWT version of the compiler. This can speed up the build process significantly.
51+
4852
### Using [Eclipse](http://www.eclipse.org/)
4953

5054
1. Download and open the [Eclipse IDE](http://www.eclipse.org/).
51-
2. Navigate to `File > New > Project ...` and create a Java Project. Give
52-
the project a name.
53-
3. Select `Create project from existing source` and choose the root of the
54-
checked-out source tree as the existing directory.
55-
3. Navigate to the `build.xml` file. You will see all the build rules in
56-
the Outline pane. Run the `jar` rule to build the compiler in
57-
`build/compiler.jar`.
55+
2. Run `mvn eclipse:eclipse -DdownloadSources=true` to download JARs and build Eclipse project configuration.
56+
3. Navigate to `File > Import > Maven > Existing Maven Projects` and browse to closure-compiler.
57+
4. Import both closure-compiler and the nested externs project.
58+
5. Disregard the warnings about maven-antrun-plugin and build errors.
59+
6. In Package Explorer, remove from the build path:
60+
- `src/com/google/javascript/jscomp/debugger/DebuggerGwtMain.java`
61+
- `src/com/google/javascript/jscomp/gwt/`
62+
7. In Project config, navigate to `Java Code Style > Formatter` and configure the project to
63+
use the [Google styleguide settings](https://github.com/google/styleguide/blob/gh-pages/eclipse-java-google-style.xml).
64+
8. See *Using Maven* above to build the JAR.
5865

5966
## Running
6067

6168
On the command line, at the root of this project, type
6269

6370
```
64-
java -jar build/compiler.jar
71+
java -jar target/closure-compiler-1.0-SNAPSHOT.jar
6572
```
6673

6774
This starts the compiler in interactive mode. Type
@@ -210,19 +217,14 @@ system have been added.</td>
210217
### Args4j
211218

212219
<table>
213-
<tr>
214-
<td>Code Path</td>
215-
<td><code>lib/args4j.jar</code></td>
216-
</tr>
217-
218220
<tr>
219221
<td>URL</td>
220222
<td>https://args4j.dev.java.net/</td>
221223
</tr>
222224

223225
<tr>
224226
<td>Version</td>
225-
<td>2.0.26</td>
227+
<td>2.33</td>
226228
</tr>
227229

228230
<tr>
@@ -245,11 +247,6 @@ options/arguments in your CUI application.</td>
245247
### Guava Libraries
246248

247249
<table>
248-
<tr>
249-
<td>Code Path</td>
250-
<td><code>lib/guava.jar</code></td>
251-
</tr>
252-
253250
<tr>
254251
<td>URL</td>
255252
<td>https://github.com/google/guava</td>
@@ -279,19 +276,14 @@ options/arguments in your CUI application.</td>
279276
### JSR 305
280277

281278
<table>
282-
<tr>
283-
<td>Code Path</td>
284-
<td><code>lib/jsr305.jar</code></td>
285-
</tr>
286-
287279
<tr>
288280
<td>URL</td>
289-
<td>http://code.google.com/p/jsr-305/</td>
281+
<td>https://github.com/findbugsproject/findbugs</td>
290282
</tr>
291283

292284
<tr>
293285
<td>Version</td>
294-
<td>svn revision 47</td>
286+
<td>3.0.1</td>
295287
</tr>
296288

297289
<tr>
@@ -313,19 +305,14 @@ options/arguments in your CUI application.</td>
313305
### JUnit
314306

315307
<table>
316-
<tr>
317-
<td>Code Path</td>
318-
<td><code>lib/junit.jar</code></td>
319-
</tr>
320-
321308
<tr>
322309
<td>URL</td>
323310
<td>http://sourceforge.net/projects/junit/</td>
324311
</tr>
325312

326313
<tr>
327314
<td>Version</td>
328-
<td>4.11</td>
315+
<td>4.12</td>
329316
</tr>
330317

331318
<tr>
@@ -347,19 +334,14 @@ options/arguments in your CUI application.</td>
347334
### Protocol Buffers
348335

349336
<table>
350-
<tr>
351-
<td>Code Path</td>
352-
<td><code>lib/protobuf-java.jar</code></td>
353-
</tr>
354-
355337
<tr>
356338
<td>URL</td>
357339
<td>https://github.com/google/protobuf</td>
358340
</tr>
359341

360342
<tr>
361343
<td>Version</td>
362-
<td>2.5.0</td>
344+
<td>3.0.2</td>
363345
</tr>
364346

365347
<tr>
@@ -382,19 +364,14 @@ an encoding of structured data.</td>
382364
### Truth
383365

384366
<table>
385-
<tr>
386-
<td>Code Path</td>
387-
<td><code>lib/truth.jar</code></td>
388-
</tr>
389-
390367
<tr>
391368
<td>URL</td>
392369
<td>https://github.com/google/truth</td>
393370
</tr>
394371

395372
<tr>
396373
<td>Version</td>
397-
<td>0.24</td>
374+
<td>0.30</td>
398375
</tr>
399376

400377
<tr>
@@ -416,21 +393,14 @@ an encoding of structured data.</td>
416393
### Ant
417394

418395
<table>
419-
<tr>
420-
<td>Code Path</td>
421-
<td>
422-
<code>lib/ant.jar</code>, <code>lib/ant-launcher.jar</code>
423-
</td>
424-
</tr>
425-
426396
<tr>
427397
<td>URL</td>
428398
<td>http://ant.apache.org/bindownload.cgi</td>
429399
</tr>
430400

431401
<tr>
432402
<td>Version</td>
433-
<td>1.8.1</td>
403+
<td>1.9.7</td>
434404
</tr>
435405

436406
<tr>
@@ -453,19 +423,14 @@ without make's wrinkles and with the full portability of pure java code.</td>
453423
### GSON
454424

455425
<table>
456-
<tr>
457-
<td>Code Path</td>
458-
<td><code>lib/gson.jar</code></td>
459-
</tr>
460-
461426
<tr>
462427
<td>URL</td>
463428
<td>https://github.com/google/gson</td>
464429
</tr>
465430

466431
<tr>
467432
<td>Version</td>
468-
<td>2.2.4</td>
433+
<td>2.7</td>
469434
</tr>
470435

471436
<tr>

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "closurecompiler",
3-
"version": "1.6.0",
3+
"version": "1.7.0",
44
"description": "ClosureCompiler.js: Closure Compiler for node.js. The all-round carefree package.",
55
"author": "Daniel Wirtz <dcode@dcode.io>",
66
"contributors": [

0 commit comments

Comments
 (0)