Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
R
ros2rag
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
JastAdd
ros2rag
Commits
4201f067
Commit
4201f067
authored
5 years ago
by
René Schöne
Browse files
Options
Downloads
Patches
Plain Diff
Resolve problem with relative paths, second try.
- use absolute paths
parent
ed680b38
No related branches found
No related tags found
No related merge requests found
Pipeline
#6611
passed
5 years ago
Stage: build
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
buildSrc/src/main/java/org/jastadd/relast/plugin/RelastTest.java
+12
-7
12 additions, 7 deletions
...c/src/main/java/org/jastadd/relast/plugin/RelastTest.java
ros2rag.tests/build.gradle
+1
-0
1 addition, 0 deletions
ros2rag.tests/build.gradle
with
13 additions
and
7 deletions
buildSrc/src/main/java/org/jastadd/relast/plugin/RelastTest.java
+
12
−
7
View file @
4201f067
...
@@ -13,6 +13,7 @@ import java.nio.file.*;
...
@@ -13,6 +13,7 @@ import java.nio.file.*;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.Arrays
;
import
java.util.Arrays
;
import
java.util.List
;
import
java.util.List
;
import
java.util.stream.Collectors
;
/**
/**
* RelAst Test Task
* RelAst Test Task
...
@@ -165,6 +166,10 @@ public class RelastTest extends DefaultTask {
...
@@ -165,6 +166,10 @@ public class RelastTest extends DefaultTask {
private
final
String
[]
genSuffixes
=
{
".ast"
,
".jadd"
,
"RefResolver.jadd"
,
"ResolverStubs.jrag"
,
"Serializer.jadd"
};
private
final
String
[]
genSuffixes
=
{
".ast"
,
".jadd"
,
"RefResolver.jadd"
,
"ResolverStubs.jrag"
,
"Serializer.jadd"
};
private
Path
pathToAbsoluteProject
(
String
filename
)
{
return
Paths
.
get
(
getProject
().
getProjectDir
().
getAbsolutePath
(),
filename
);
}
@TaskAction
@TaskAction
void
runTest
()
throws
IOException
{
void
runTest
()
throws
IOException
{
setGroup
(
"verification"
);
setGroup
(
"verification"
);
...
@@ -179,7 +184,7 @@ public class RelastTest extends DefaultTask {
...
@@ -179,7 +184,7 @@ public class RelastTest extends DefaultTask {
// first, delete generated files
// first, delete generated files
List
<
Path
>
genFiles
=
new
ArrayList
<>();
List
<
Path
>
genFiles
=
new
ArrayList
<>();
for
(
String
suffix
:
genSuffixes
)
{
for
(
String
suffix
:
genSuffixes
)
{
genFiles
.
add
(
P
ath
s
.
get
(
a
bsoluteProject
Path
,
getGrammarName
()
+
suffix
));
genFiles
.
add
(
p
ath
ToA
bsoluteProject
(
getGrammarName
()
+
suffix
));
}
}
if
(
isVerbose
())
{
if
(
isVerbose
())
{
System
.
out
.
println
(
"gen files: "
+
genFiles
);
System
.
out
.
println
(
"gen files: "
+
genFiles
);
...
@@ -191,8 +196,8 @@ public class RelastTest extends DefaultTask {
...
@@ -191,8 +196,8 @@ public class RelastTest extends DefaultTask {
}
}
});
});
// create output directories, if not existing
// create output directories, if not existing
createDirectory
(
P
ath
s
.
ge
t
(
getOutputDir
()));
createDirectory
(
p
ath
ToAbsoluteProjec
t
(
getOutputDir
()));
createDirectory
(
P
ath
s
.
ge
t
(
getGrammarName
()).
getParent
());
createDirectory
(
p
ath
ToAbsoluteProjec
t
(
getGrammarName
()).
getParent
());
if
(
isVerbose
())
{
if
(
isVerbose
())
{
System
.
out
.
println
(
"Pre processing, running relast"
);
System
.
out
.
println
(
"Pre processing, running relast"
);
}
}
...
@@ -209,7 +214,7 @@ public class RelastTest extends DefaultTask {
...
@@ -209,7 +214,7 @@ public class RelastTest extends DefaultTask {
}
else
{
}
else
{
javaExecSpec
.
setMain
(
"org.jastadd.relast.compiler.Compiler"
);
javaExecSpec
.
setMain
(
"org.jastadd.relast.compiler.Compiler"
);
}
}
args
.
addAll
(
getRelastFiles
());
args
.
addAll
(
getRelastFiles
()
.
stream
().
map
(
this
::
pathToAbsoluteProject
).
collect
(
Collectors
.
toList
())
);
args
.
add
(
"--quiet"
);
args
.
add
(
"--quiet"
);
if
(
isWriteToFile
())
{
if
(
isWriteToFile
())
{
args
.
add
(
"--file"
);
args
.
add
(
"--file"
);
...
@@ -229,7 +234,7 @@ public class RelastTest extends DefaultTask {
...
@@ -229,7 +234,7 @@ public class RelastTest extends DefaultTask {
if
(
isSet
(
getSerializer
()))
{
if
(
isSet
(
getSerializer
()))
{
args
.
add
(
"--serializer="
+
getSerializer
());
args
.
add
(
"--serializer="
+
getSerializer
());
}
}
args
.
add
(
"--grammarName="
+
getGrammarName
());
args
.
add
(
"--grammarName="
+
pathToAbsoluteProject
(
getGrammarName
())
)
;
if
(
isVerbose
())
{
if
(
isVerbose
())
{
System
.
out
.
println
(
"Start relast with args: "
+
args
);
System
.
out
.
println
(
"Start relast with args: "
+
args
);
}
}
...
@@ -250,13 +255,13 @@ public class RelastTest extends DefaultTask {
...
@@ -250,13 +255,13 @@ public class RelastTest extends DefaultTask {
javaExecSpec
.
setClasspath
(
runtimeClasspath
);
javaExecSpec
.
setClasspath
(
runtimeClasspath
);
javaExecSpec
.
setMain
(
"org.jastadd.JastAdd"
);
javaExecSpec
.
setMain
(
"org.jastadd.JastAdd"
);
List
<
Object
>
args
=
new
ArrayList
<>();
List
<
Object
>
args
=
new
ArrayList
<>();
args
.
add
(
"--o="
+
getOutputDir
());
args
.
add
(
"--o="
+
pathToAbsoluteProject
(
getOutputDir
())
)
;
args
.
add
(
"--package="
+
getPackageName
());
args
.
add
(
"--package="
+
getPackageName
());
if
(
isSet
(
getJastAddList
()))
{
if
(
isSet
(
getJastAddList
()))
{
args
.
add
(
"--List="
+
getJastAddList
());
args
.
add
(
"--List="
+
getJastAddList
());
}
}
args
.
addAll
(
genFiles
);
args
.
addAll
(
genFiles
);
args
.
addAll
(
getMoreInputFiles
());
args
.
addAll
(
getMoreInputFiles
()
.
stream
().
map
(
this
::
pathToAbsoluteProject
).
collect
(
Collectors
.
toList
())
);
if
(
isVerbose
())
{
if
(
isVerbose
())
{
System
.
out
.
println
(
"Start JastAdd with args: "
+
args
);
System
.
out
.
println
(
"Start JastAdd with args: "
+
args
);
}
}
...
...
This diff is collapsed.
Click to expand it.
ros2rag.tests/build.gradle
+
1
−
0
View file @
4201f067
...
@@ -87,6 +87,7 @@ task preprocessExampleTest(type: JavaExec, group: 'verification') {
...
@@ -87,6 +87,7 @@ task preprocessExampleTest(type: JavaExec, group: 'verification') {
//}
//}
task
compileExampleTest
(
type:
RelastTest
)
{
task
compileExampleTest
(
type:
RelastTest
)
{
verbose
=
true
useJastAddNames
=
true
useJastAddNames
=
true
relastFiles
'src/test/02-after-ros2rag/example/Grammar.relast'
relastFiles
'src/test/02-after-ros2rag/example/Grammar.relast'
grammarName
=
'src/test/03-after-relast/example/example'
grammarName
=
'src/test/03-after-relast/example/example'
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment