Skip to content
Browse files

fix MPS-13086 : Show-stopper

  • Loading branch information...
1 parent 0ad7d81 commit 4cc194177996ba25354de6eba91822e836819f2a Mihail Muhin committed Jul 6, 2011
View
1 core/kernel/source/jetbrains/mps/compiler/JavaCompiler.java
@@ -33,6 +33,7 @@
import java.util.*;
public class JavaCompiler {
+ private static Logger LOG = Logger.getLogger(JavaCompiler.class);
private Map<String, CompilationUnit> myCompilationUnits = new HashMap<String, CompilationUnit>();
private List<CompilationResult> myCompilationResults = new ArrayList<CompilationResult>();
private Map<String, byte[]> myClasses = new HashMap<String, byte[]>();
View
11 core/kernel/source/jetbrains/mps/make/ModuleMaker.java
@@ -110,6 +110,15 @@ public void clean(final Set<IModule> modules, @NotNull final ProgressIndicator i
}
private jetbrains.mps.plugin.CompilationResult compile(Set<IModule> modules) {
+ HashSet<IModule> filtered = new HashSet<IModule>();
+ for (IModule m : modules) {
+ if (m.isPackaged()) continue;
+ filtered.add(m);
+ LOG.warning("Module " + m.getModuleFqName() + " was excluded from compilation cycle because it's packaged");
+ }
+
+ modules = filtered;
+
boolean hasAnythingToCompile = false;
for (IModule m : modules) {
@@ -359,7 +368,7 @@ private void invalidateClasspath(Set<IModule> modules) {
for (IModule m : modules) {
m.invalidateClassPath();
}
- for (IModule m: MPSModuleRepository.getInstance().getAllModules()){
+ for (IModule m : MPSModuleRepository.getInstance().getAllModules()) {
m.updateClassPath();
}
}

0 comments on commit 4cc1941

Please sign in to comment.
Something went wrong with that request. Please try again.