Skip to content
This repository was archived by the owner on Jan 9, 2019. It is now read-only.

bug fix with absolute uri IMPORT #48

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

bug fix with absolute uri IMPORT #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
82c67cb
bug fix with absolute uri IMPORT
marcosemiao Apr 25, 2014
f786f23
Because doesn't work in windows 8, The maven plugin doesn't use a pat…
marcosemiao May 12, 2014
132bdfb
correct test with new constructor LessSource (sourceDirectory)
marcosemiao Jul 2, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
<dependency>
<groupId>org.lesscss</groupId>
<artifactId>lesscss</artifactId>
<version>1.3.3</version>
<version>1.5.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
Expand Down
301 changes: 149 additions & 152 deletions src/main/java/org/lesscss/mojo/CompileMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,156 +35,153 @@
*/
public class CompileMojo extends AbstractLessCssMojo {

/**
* The directory for compiled CSS stylesheets.
*
* @parameter expression="${lesscss.outputDirectory}" default-value="${project.build.directory}"
* @required
*/
private File outputDirectory;

/**
* When <code>true</code> the LESS compiler will compress the CSS stylesheets.
*
* @parameter expression="${lesscss.compress}" default-value="false"
*/
private boolean compress;

/**
* The character encoding the LESS compiler will use for writing the CSS stylesheets.
*
* @parameter expression="${lesscss.encoding}" default-value="${project.build.sourceEncoding}"
*/
private String encoding;

/**
* When <code>true</code> forces the LESS compiler to always compile the LESS sources. By default LESS sources are only compiled when modified (including imports) or the CSS stylesheet does not exists.
*
* @parameter expression="${lesscss.force}" default-value="false"
*/
private boolean force;

/**
* The location of the LESS JavasSript file.
*
* @parameter
*/
private File lessJs;

/**
* The location of the NodeJS executable.
*
* @parameter
*/
private String nodeExecutable;

/**
* Execute the MOJO.
*
* @throws MojoExecutionException
* if something unexpected occurs.
*/
public void execute() throws MojoExecutionException {

long start = System.currentTimeMillis();

if (getLog().isDebugEnabled()) {
getLog().debug("sourceDirectory = " + sourceDirectory);
getLog().debug("outputDirectory = " + outputDirectory);
getLog().debug("includes = " + Arrays.toString(includes));
getLog().debug("excludes = " + Arrays.toString(excludes));
getLog().debug("force = " + force);
getLog().debug("lessJs = " + lessJs);
}

String[] files = getIncludedFiles();

if (files == null || files.length < 1) {
getLog().info("Nothing to compile - no LESS sources found");
} else {
if (getLog().isDebugEnabled()) {
getLog().debug("included files = " + Arrays.toString(files));
}

Object lessCompiler = initLessCompiler();
try {
for (String file : files) {
File input = new File(sourceDirectory, file);

buildContext.removeMessages(input);

File output = new File(outputDirectory, file.replace(".less", ".css"));

if (!output.getParentFile().exists() && !output.getParentFile().mkdirs()) {
throw new MojoExecutionException("Cannot create output directory " + output.getParentFile());
}

try {
LessSource lessSource = new LessSource(input);

if (output.lastModified() < lessSource.getLastModifiedIncludingImports() || force) {
getLog().info("Compiling LESS source: " + file + "...");
if (lessCompiler instanceof LessCompiler) {
((LessCompiler) lessCompiler).compile(lessSource, output, force);
} else {
((NodeJsLessCompiler) lessCompiler).compile(lessSource, output, force);
}
buildContext.refresh(output);
}
else {
getLog().info("Bypassing LESS source: " + file + " (not modified)");
}
} catch (IOException e) {
buildContext.addMessage(input, 0, 0, "Error compiling LESS source", BuildContext.SEVERITY_ERROR, e);
throw new MojoExecutionException("Error while compiling LESS source: " + file, e);
} catch (LessException e) {
String message = e.getMessage();
if (StringUtils.isEmpty(message)) {
message = "Error compiling LESS source";
}
buildContext.addMessage(input, 0, 0, "Error compiling LESS source", BuildContext.SEVERITY_ERROR, e);
throw new MojoExecutionException("Error while compiling LESS source: " + file, e);
} catch (InterruptedException e) {
buildContext.addMessage(input, 0, 0, "Error compiling LESS source", BuildContext.SEVERITY_ERROR, e);
throw new MojoExecutionException("Error while compiling LESS source: " + file, e);
}
}
} finally {
if (lessCompiler instanceof NodeJsLessCompiler) {
((NodeJsLessCompiler) lessCompiler).close();
}
}

getLog().info("Compilation finished in " + (System.currentTimeMillis() - start) + " ms");
}
}

private Object initLessCompiler() throws MojoExecutionException {
if (nodeExecutable != null) {
NodeJsLessCompiler lessCompiler;
try {
lessCompiler = new NodeJsLessCompiler(compress, encoding, getLog());
} catch (IOException e) {
throw new MojoExecutionException(e.getMessage(), e);
}
if (lessJs != null) {
throw new MojoExecutionException(
"Custom LESS JavaScript is not currently supported when using nodeExecutable");
}
return lessCompiler;
} else {
LessCompiler lessCompiler = new LessCompiler();
lessCompiler.setCompress(compress);
lessCompiler.setEncoding(encoding);
if (lessJs != null) {
try {
lessCompiler.setLessJs(lessJs.toURI().toURL());
} catch (MalformedURLException e) {
throw new MojoExecutionException(
"Error while loading LESS JavaScript: " + lessJs.getAbsolutePath(), e);
}
}
return lessCompiler;
}
}
/**
* The directory for compiled CSS stylesheets.
*
* @parameter expression="${lesscss.outputDirectory}" default-value="${project.build.directory}"
* @required
*/
private File outputDirectory;

/**
* When <code>true</code> the LESS compiler will compress the CSS stylesheets.
*
* @parameter expression="${lesscss.compress}" default-value="false"
*/
private boolean compress;

/**
* The character encoding the LESS compiler will use for writing the CSS stylesheets.
*
* @parameter expression="${lesscss.encoding}" default-value="${project.build.sourceEncoding}"
*/
private String encoding;

/**
* When <code>true</code> forces the LESS compiler to always compile the LESS sources. By default LESS sources are
* only compiled when modified (including imports) or the CSS stylesheet does not exists.
*
* @parameter expression="${lesscss.force}" default-value="false"
*/
private boolean force;

/**
* The location of the LESS JavasSript file.
*
* @parameter
*/
private File lessJs;

/**
* The location of the NodeJS executable.
*
* @parameter
*/
private File nodeExecutable;

/**
* Execute the MOJO.
*
* @throws MojoExecutionException if something unexpected occurs.
*/
public void execute() throws MojoExecutionException {

long start = System.currentTimeMillis();

if (getLog().isDebugEnabled()) {
getLog().debug("sourceDirectory = " + sourceDirectory);
getLog().debug("outputDirectory = " + outputDirectory);
getLog().debug("includes = " + Arrays.toString(includes));
getLog().debug("excludes = " + Arrays.toString(excludes));
getLog().debug("force = " + force);
getLog().debug("lessJs = " + lessJs);
}

String[] files = getIncludedFiles();

if (files == null || files.length < 1) {
getLog().info("Nothing to compile - no LESS sources found");
} else {
if (getLog().isDebugEnabled()) {
getLog().debug("included files = " + Arrays.toString(files));
}

Object lessCompiler = initLessCompiler();
try {
for (String file : files) {
File input = new File(sourceDirectory, file);

buildContext.removeMessages(input);

File output = new File(outputDirectory, file.replace(".less", ".css"));

if (!output.getParentFile().exists() && !output.getParentFile().mkdirs()) {
throw new MojoExecutionException("Cannot create output directory " + output.getParentFile());
}

try {
LessSource lessSource = new LessSource(sourceDirectory, input);

if (output.lastModified() < lessSource.getLastModifiedIncludingImports() || force) {
getLog().info("Compiling LESS source: " + file + "...");
if (lessCompiler instanceof LessCompiler) {
((LessCompiler) lessCompiler).compile(lessSource, output, force);
} else {
((NodeJsLessCompiler) lessCompiler).compile(lessSource, output, force);
}
buildContext.refresh(output);
} else {
getLog().info("Bypassing LESS source: " + file + " (not modified)");
}
} catch (IOException e) {
buildContext.addMessage(input, 0, 0, "Error compiling LESS source", BuildContext.SEVERITY_ERROR, e);
throw new MojoExecutionException("Error while compiling LESS source: " + file, e);
} catch (LessException e) {
String message = e.getMessage();
if (StringUtils.isEmpty(message)) {
message = "Error compiling LESS source";
}
buildContext.addMessage(input, 0, 0, "Error compiling LESS source", BuildContext.SEVERITY_ERROR, e);
throw new MojoExecutionException("Error while compiling LESS source: " + file, e);
} catch (InterruptedException e) {
buildContext.addMessage(input, 0, 0, "Error compiling LESS source", BuildContext.SEVERITY_ERROR, e);
throw new MojoExecutionException("Error while compiling LESS source: " + file, e);
}
}
} finally {
if (lessCompiler instanceof NodeJsLessCompiler) {
((NodeJsLessCompiler) lessCompiler).close();
}
}

getLog().info("Compilation finished in " + (System.currentTimeMillis() - start) + " ms");
}
}

private Object initLessCompiler() throws MojoExecutionException {
if (nodeExecutable != null) {
NodeJsLessCompiler lessCompiler;
try {
lessCompiler = new NodeJsLessCompiler(nodeExecutable, compress, encoding, getLog());
} catch (IOException e) {
throw new MojoExecutionException(e.getMessage(), e);
}
if (lessJs != null) {
throw new MojoExecutionException("Custom LESS JavaScript is not currently supported when using nodeExecutable");
}
return lessCompiler;
} else {
LessCompiler lessCompiler = new LessCompiler();
lessCompiler.setCompress(compress);
lessCompiler.setEncoding(encoding);
if (lessJs != null) {
try {
lessCompiler.setLessJs(lessJs.toURI().toURL());
} catch (MalformedURLException e) {
throw new MojoExecutionException("Error while loading LESS JavaScript: " + lessJs.getAbsolutePath(), e);
}
}
return lessCompiler;
}
}
}
8 changes: 5 additions & 3 deletions src/main/java/org/lesscss/mojo/NodeJsLessCompiler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,10 @@ public class NodeJsLessCompiler {
private final boolean compress;
private final String encoding;
private final File tempDir;

public NodeJsLessCompiler(boolean compress, String encoding, Log log) throws IOException {
private final File nodeExecutable;

public NodeJsLessCompiler(File nodeExecutable, boolean compress, String encoding, Log log) throws IOException {
this.nodeExecutable = nodeExecutable;
this.compress = compress;
this.encoding = encoding;
this.log = log;
Expand Down Expand Up @@ -128,7 +130,7 @@ private String compile(String input) throws LessException, IOException, Interrup
File outputFile = File.createTempFile("lessc-output-", ".css");
File lesscJsFile = new File(tempDir, "lessc.js");

ProcessBuilder pb = new ProcessBuilder("node", lesscJsFile.getAbsolutePath(),
ProcessBuilder pb = new ProcessBuilder(nodeExecutable.getAbsolutePath(), lesscJsFile.getAbsolutePath(),
inputFile.getAbsolutePath(), outputFile.getAbsolutePath(), String.valueOf(compress));
pb.redirectErrorStream(true);
Process process = pb.start();
Expand Down
Loading