Skip to content

Commit 55cc6f4

Browse files
committed
Attempt to remove copyJars() from SequenceAnalysis gradle build
1 parent b1289f4 commit 55cc6f4

File tree

2 files changed

+3
-25
lines changed

2 files changed

+3
-25
lines changed

SequenceAnalysis/build.gradle

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -200,20 +200,4 @@ if (project.findProject(BuildUtils.getTestProjectPath(project.gradle)) != null &
200200
}
201201
}
202202
}
203-
}
204-
205-
project.tasks.register("copyJars", Copy)
206-
{ CopySpec copy ->
207-
copy.group = "Build"
208-
copy.description = "Copy commons-math3 JAR to module's lib directory"
209-
210-
copy.setDuplicatesStrategy(DuplicatesStrategy.EXCLUDE)
211-
copy.from(project.configurations.external)
212-
copy.into new File("${project.labkey.explodedModuleLibDir}")
213-
copy.include {
214-
"**commons-math3-**.jar"
215-
}
216-
}
217-
218-
project.tasks.named('module').configure { dependsOn(project.tasks.copyJars) }
219-
project.tasks.named('copyJars').configure { mustRunAfter(project.tasks.populateExplodedLib) }
203+
}

SequenceAnalysis/src/org/labkey/sequenceanalysis/run/util/FastqcRunner.java

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,8 @@ private List<String> getBaseParams() throws FileNotFoundException
374374
throw new RuntimeException("Not found: " + htsjdkJar.getPath());
375375
}
376376

377-
File commonsMath = new File(libDir, "commons-math3-3.6.1.jar");
377+
File apiLibDir = new File(ModuleLoader.getInstance().getModule("api").getExplodedPath(), "lib");
378+
File commonsMath = new File(apiLibDir, "commons-math3-3.6.1.jar");
378379
if (!commonsMath.exists())
379380
{
380381
throw new RuntimeException("Not found: " + commonsMath.getPath());
@@ -386,13 +387,6 @@ private List<String> getBaseParams() throws FileNotFoundException
386387
throw new RuntimeException("Not found: " + jhdf5.getPath());
387388
}
388389

389-
// NOTE: FastQC expects an alternate package name within this JAR, so use their packaged code instead:
390-
// File base64 = new File(libDir, "base64-2.3.8.jar");
391-
// if (!base64.exists())
392-
// {
393-
// throw new RuntimeException("Not found: " + base64.getPath());
394-
// }
395-
396390
List<String> classPath = new ArrayList<>();
397391
classPath.add(".");
398392
classPath.add(fastqcDir.getPath());

0 commit comments

Comments
 (0)