stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8054465: Add --permit-artifact=bar to sjavac

Browse Source 
Add --permit-artifact=bar to white-list files that have been written to the destination directory and that sjavac should not delete.

Reviewed-by: jjg, alundblad
This commit is contained in:
Fredrik Öhrström 2014-08-09 00:56:29 +02:00
parent c8256e4d27
commit c110d6437f
7 changed files with 85 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
langtools/src/share/classes/com/sun/tools/sjavac/JavacState.java
View File

@ -127,7 +127,11 @@ public class JavacState
// Where to send stdout and stderr.
private PrintStream out, err;
JavacState(Options options, boolean removeJavacState, PrintStream o, PrintStream e) {
// Command line options.
private Options options;
JavacState(Options op, boolean removeJavacState, PrintStream o, PrintStream e) {
options = op;
out = o;
err = e;
numCores = options.getNumCores();
@ -147,7 +151,7 @@ public class JavacState
// We do not want to risk building a broken incremental build.
// BUT since the makefiles still copy things straight into the bin_dir et al,
// we avoid deleting files here, if the option --permit-unidentified-classes was supplied.
if (!options.isUnidentifiedArtifactPermitted()) {
if (!options.areUnidentifiedArtifactsPermitted()) {
deleteContents(binDir);
deleteContents(gensrcDir);
deleteContents(headerDir);
@ -511,7 +515,8 @@ public class JavacState
allKnownArtifacts.add(javacState);
for (File f : binArtifacts) {
if (!allKnownArtifacts.contains(f)) {
if (!allKnownArtifacts.contains(f) &&
!options.isUnidentifiedArtifactPermitted(f.getAbsolutePath())) {
Log.debug("Removing "+f.getPath()+" since it is unknown to the javac_state.");
f.delete();
}
@ -604,13 +609,16 @@ public class JavacState
/**
* Recursively delete a directory and all its contents.
*/
private static void deleteContents(File dir) {
private void deleteContents(File dir) {
if (dir != null && dir.exists()) {
for (File f : dir.listFiles()) {
if (f.isDirectory()) {
deleteContents(f);
}
f.delete();
if (!options.isUnidentifiedArtifactPermitted(f.getAbsolutePath())) {
Log.debug("Removing "+f.getAbsolutePath());
f.delete();
}
}
}
}

2
langtools/src/share/classes/com/sun/tools/sjavac/Main.java
View File

@ -305,7 +305,7 @@ public class Main {
// For examples, files that have been manually copied into these dirs.
// Artifacts with bad timestamps (ie the on disk timestamp does not match the timestamp
// in javac_state) have already been removed when the javac_state was loaded.
if (!options.isUnidentifiedArtifactPermitted()) {
if (!options.areUnidentifiedArtifactsPermitted()) {
javac_state.removeUnidentifiedArtifacts();
}
// Go through all sources and taint all packages that miss artifacts.

9
langtools/src/share/classes/com/sun/tools/sjavac/options/Option.java
View File

@ -231,7 +231,14 @@ public enum Option {
helper.logLevel("info");
}
},
PERMIT_UNIDENTIFIED_ARTIFACTS("--permit-unidentified-artifacts", "Keep unidentified artifacts in destination directory") {
PERMIT_ARTIFACT("--permit-artifact=", "Allow this artifact in destination directory") {
@Override
protected void processMatching(ArgumentIterator iter, OptionHelper helper) {
String a = iter.current().substring(arg.length());
helper.permitArtifact(Paths.get(a).toFile().getAbsolutePath());
}
},
PERMIT_UNIDENTIFIED_ARTIFACTS("--permit-unidentified-artifacts", "Allow unidentified artifacts in destination directory") {
@Override
protected void processMatching(ArgumentIterator iter, OptionHelper helper) {
helper.permitUnidentifiedArtifacts();

3
langtools/src/share/classes/com/sun/tools/sjavac/options/OptionHelper.java
View File

@ -80,6 +80,9 @@ public abstract class OptionHelper {
/** Record path for reference source list */
public abstract void compareFoundSources(Path referenceList);
/** Record a single permitted artifact */
public abstract void permitArtifact(String f);
/** Record the fact that unidentified artifacts are permitted */
public abstract void permitUnidentifiedArtifacts();

27
langtools/src/share/classes/com/sun/tools/sjavac/options/Options.java
View File

@ -32,6 +32,8 @@ import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.HashSet;
import com.sun.tools.sjavac.Transformer;
@ -51,7 +53,8 @@ public class Options {
private String logLevel = "info";
private boolean permitUnidentifiedArtifact = false;
private Set<String> permitted_artifacts = new HashSet<>();
private boolean permitUnidentifiedArtifacts = false;
private boolean permitSourcesInDefaultPackage = false;
private Path sourceReferenceList;
@ -119,10 +122,15 @@ public class Options {
return logLevel;
}
/** Returns true iff the artifact is permitted in the output dir. */
public boolean isUnidentifiedArtifactPermitted(String f) {
return permitted_artifacts.contains(f);
}
/** Returns true iff artifacts in the output directories should be kept,
* even if they would not be generated in a clean build. */
public boolean isUnidentifiedArtifactPermitted() {
return permitUnidentifiedArtifact;
public boolean areUnidentifiedArtifactsPermitted() {
return permitUnidentifiedArtifacts;
}
/** Returns true iff sources in the default package should be permitted. */
@ -249,7 +257,11 @@ public class Options {
if (permitSourcesInDefaultPackage)
args.addArg(Option.PERMIT_SOURCES_WITHOUT_PACKAGE);
if (permitUnidentifiedArtifact)
for (String f : permitted_artifacts) {
args.addArg(Option.PERMIT_ARTIFACT, f);
}
if (permitUnidentifiedArtifacts)
args.addArg(Option.PERMIT_UNIDENTIFIED_ARTIFACTS);
// Translation rules
@ -399,9 +411,14 @@ public class Options {
sourceReferenceList = referenceList;
}
@Override
public void permitArtifact(String f) {
permitted_artifacts.add(f);
}
@Override
public void permitUnidentifiedArtifacts() {
permitUnidentifiedArtifact = true;
permitUnidentifiedArtifacts = true;
}
@Override

9
langtools/test/tools/sjavac/OptionDecoding.java
View File

@ -25,7 +25,7 @@
/*
* @test
* @bug 8035063
* @bug 8035063 8054465
* @summary Tests decoding of String[] into Options.
*
* @build Wrapper
@ -192,13 +192,16 @@ public class OptionDecoding {
assertEquals(17, options.getNumCores());
assertEquals("debug", options.getLogLevel());
assertEquals(false, options.isDefaultPackagePermitted());
assertEquals(false, options.isUnidentifiedArtifactPermitted());
assertEquals(false, options.areUnidentifiedArtifactsPermitted());
assertEquals(false, options.isUnidentifiedArtifactPermitted(Paths.get("bar.txt").toFile().getAbsolutePath()));
options = Options.parseArgs("--permit-unidentified-artifacts",
"--permit-artifact=bar.txt",
"--permit-sources-without-package");
assertEquals("info", options.getLogLevel());
assertEquals(true, options.isDefaultPackagePermitted());
assertEquals(true, options.isUnidentifiedArtifactPermitted());
assertEquals(true, options.areUnidentifiedArtifactsPermitted());
assertEquals(true, options.isUnidentifiedArtifactPermitted(Paths.get("bar.txt").toFile().getAbsolutePath()));
}
// Test server configuration options

33
langtools/test/tools/sjavac/SJavac.java
View File

@ -25,7 +25,7 @@
/*
* @test
* @summary Test all aspects of sjavac.
* @bug 8004658 8042441 8042699 8054461 8054474
* @bug 8004658 8042441 8042699 8054461 8054474 8054465
*
* @build Wrapper
* @run main Wrapper SJavac
@ -101,6 +101,7 @@ public class SJavac {
incrementalCompileTestFullyQualifiedRef();
compileWithAtFile();
testStateDir();
testPermittedArtifact();
delete(gensrc);
delete(gensrc2);
@ -527,6 +528,36 @@ public class SJavac {
"bar/javac_state");
}
/**
* Test white listing of external artifacts inside the destination dir.
* @throws Exception If test fails
*/
void testPermittedArtifact() throws Exception {
System.out.println("\nVerify that --permit-artifact=bar works.");
System.out.println("-------------------------------------------");
delete(gensrc);
delete(bin);
previous_bin_state = collectState(bin);
populate(gensrc,
"alfa/omega/A.java",
"package alfa.omega; public class A { }");
populate(bin,
"alfa/omega/AA.class",
"Ugh, a messy build system (tobefixed) wrote this class file, sjavac must not delete it.");
compile("--log=debug", "--permit-artifact=bin/alfa/omega/AA.class", "-src", "gensrc", "-d", "bin", serverArg);
Map<String,Long> new_bin_state = collectState(bin);
verifyThatFilesHaveBeenAdded(previous_bin_state, new_bin_state,
"bin/alfa/omega/A.class",
"bin/alfa/omega/AA.class",
"bin/javac_state");
}
void removeFrom(Path dir, String... args) throws IOException {
for (String filename : args) {
Path p = dir.resolve(filename);