sigmasternchen/xtext-core
1
0
Fork 0
mirror of https://github.com/sigmasternchen/xtext-core synced 2025-03-16 00:38:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[splitting] Use '/bin/' etc. as search strings instead of 'bin' when adding removal paths

Browse source
This commit is contained in:
Miro Spönemann 2016-06-13 16:46:25 +02:00
parent 090dac24e1
commit 3f46ccb3f2
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
splitting/src/org/eclipse/xtext/splitting/GenerateRemovals.java
View file

@ -67,13 +67,13 @@ public class GenerateRemovals {
while ((line = reader.readLine()) != null) {
String file = line.replaceAll("\"|\\\\.", "");
for (String genDir : REMOVE_DIRS) {
int genDirIndex = file.indexOf(genDir);
if (genDirIndex > 0) {
int genDirIndex = file.indexOf("/" + genDir + "/");
if (genDirIndex >= 0) {
for (String targetRepo : ValidateSplitting.REPOSITORIES) {
Set<String> repoRemovals = removalPaths.get(targetRepo);
Matcher matcher = segmentPattern.matcher(file);
boolean foundRemoval = false;
int genDirEndIndex = genDirIndex + genDir.length();
int genDirEndIndex = genDirIndex + genDir.length() + 1;
while (!foundRemoval && matcher.find() && matcher.start() <= genDirEndIndex) {
if (repoRemovals.contains(file.substring(0, matcher.start())))
foundRemoval = true;