You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@daffodil.apache.org by "tuxji (via GitHub)" <gi...@apache.org> on 2023/02/21 19:22:34 UTC
[GitHub] [daffodil] tuxji opened a new pull request, #968: Rename daffodil-runtime2
tuxji opened a new pull request, #968:
URL: https://github.com/apache/daffodil/pull/968
As discussed on the dev list, perform the following renames:
- module daffodil-runtime2 to daffodil-codegen-c
- package org/apache/daffodil/runtime2 to org/apache/daffodil/codegen/c
- Runtime2 classes to DaffodilC (stays consistent with TDMLImplementation.DaffodilC and DaffodilC<rest of class name> looks better than CodeGenC<rest of class name>)
Goal is that no functionality should change as a result of the renames. However, we do need to make sure all places mentioning runtime2 are updated as part of this issue (Confluence, website, design notes).
DAFFODIL-2796
build.sbt: Rename genRuntime2Examples to genCExamples, runtime2 to codeGenC, etc.
cliTest/Test**: Fix all packages to match tests' parent directories (noticed IDEA warning while updating TestCLIGenerateC). Also fix other IDEA warnings while updating these tests.
Compiler.scala: Fix IDEA warnings (getBinding method is unused code, so delete it) while updating runtime2 class name.
ISRM_green_to_orange_60000, etc.: Move their data files into data/ and their infosets files into infosets/ subdirectories.
Rat.scala: Replace lines excluding ISRM_green_to_orange_60000, etc., with line excluding their data/ subdirectory.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@daffodil.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [daffodil] tuxji commented on a diff in pull request #968: Rename daffodil-runtime2
Posted by "tuxji (via GitHub)" <gi...@apache.org>.
tuxji commented on code in PR #968:
URL: https://github.com/apache/daffodil/pull/968#discussion_r1115117882
##########
daffodil-test/src/test/scala/org/apache/daffodil/codegen/c/TestCollisions.scala:
##########
@@ -24,10 +24,10 @@ import org.junit.AfterClass
import org.junit.Test
object TestCollisions {
- val testDir = "/org/apache/daffodil/runtime2/"
- val runner = Runner(testDir, "collisions.tdml", TDMLImplementation.DaffodilC)
+ val testDir = "/org/apache/daffodil/codegen/c/"
+ val runner: Runner = Runner(testDir, "collisions.tdml", TDMLImplementation.DaffodilC)
Review Comment:
Yeah. Do you notice that IDEA was happy to define val testDir without a type? In Scala, class String is final. I bet that if we made class Runner final, IDEA would let us define val runner without a type too. Want me to make that change in this PR?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@daffodil.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [daffodil] mbeckerle commented on a diff in pull request #968: Rename daffodil-runtime2
Posted by "mbeckerle (via GitHub)" <gi...@apache.org>.
mbeckerle commented on code in PR #968:
URL: https://github.com/apache/daffodil/pull/968#discussion_r1115253624
##########
daffodil-test/src/test/scala/org/apache/daffodil/codegen/c/TestCollisions.scala:
##########
@@ -24,10 +24,10 @@ import org.junit.AfterClass
import org.junit.Test
object TestCollisions {
- val testDir = "/org/apache/daffodil/runtime2/"
- val runner = Runner(testDir, "collisions.tdml", TDMLImplementation.DaffodilC)
+ val testDir = "/org/apache/daffodil/codegen/c/"
+ val runner: Runner = Runner(testDir, "collisions.tdml", TDMLImplementation.DaffodilC)
Review Comment:
No, I think we should just ignore this suggestion from IDEA.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@daffodil.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [daffodil] mbeckerle commented on a diff in pull request #968: Rename daffodil-runtime2
Posted by "mbeckerle (via GitHub)" <gi...@apache.org>.
mbeckerle commented on code in PR #968:
URL: https://github.com/apache/daffodil/pull/968#discussion_r1115066845
##########
daffodil-test/src/test/scala/org/apache/daffodil/codegen/c/TestCollisions.scala:
##########
@@ -24,10 +24,10 @@ import org.junit.AfterClass
import org.junit.Test
object TestCollisions {
- val testDir = "/org/apache/daffodil/runtime2/"
- val runner = Runner(testDir, "collisions.tdml", TDMLImplementation.DaffodilC)
+ val testDir = "/org/apache/daffodil/codegen/c/"
+ val runner: Runner = Runner(testDir, "collisions.tdml", TDMLImplementation.DaffodilC)
Review Comment:
IntelliJ makes this particular recommendation blindly. I don't like this.
This particular suggestion, that all public members have a type, really should not do so if it requires this java-ish repetitiveness where you have ": Runner = Runner(...".
It is simply clutter.
##########
project/Rat.scala:
##########
@@ -40,7 +40,7 @@ object Rat {
file("daffodil-cli/src/windows/dialog.bmp"),
// generated_code.[ch] examples
- file("daffodil-runtime2/src/test/c/examples"),
+ file("daffodil-codegen-c/src/test/c/examples"),
Review Comment:
Leave it alone unless you want to retest it :-)
##########
project/Rat.scala:
##########
@@ -112,58 +112,7 @@ object Rat {
file("daffodil-tdml-lib/src/test/resources/test/tdml/test.txt"),
file("daffodil-tdml-processor/src/test/resources/test/tdml/test.bin"),
file("daffodil-tdml-processor/src/test/resources/test/tdml/test.txt"),
- file(
- "daffodil-test/src/test/resources/org/apache/daffodil/runtime2/ISRM_green_to_orange_60000.0.dat",
- ),
- file(
- "daffodil-test/src/test/resources/org/apache/daffodil/runtime2/ISRM_green_to_orange_60000.1.dat",
- ),
- file(
- "daffodil-test/src/test/resources/org/apache/daffodil/runtime2/ISRM_orange_to_green_60002.dat",
- ),
- file(
- "daffodil-test/src/test/resources/org/apache/daffodil/runtime2/MPU_green_to_orange_60004.dat",
- ),
- file(
- "daffodil-test/src/test/resources/org/apache/daffodil/runtime2/MPU_orange_to_green_60006.0.dat",
- ),
- file(
- "daffodil-test/src/test/resources/org/apache/daffodil/runtime2/MPU_orange_to_green_60006.1.dat",
- ),
- file("daffodil-test/src/test/resources/org/apache/daffodil/runtime2/collisions.dat"),
- file("daffodil-test/src/test/resources/org/apache/daffodil/runtime2/egress_xdcc_bw.11.dat"),
- file("daffodil-test/src/test/resources/org/apache/daffodil/runtime2/egress_xdcc_bw.12.dat"),
- file("daffodil-test/src/test/resources/org/apache/daffodil/runtime2/egress_xdcc_bw.13.dat"),
- file("daffodil-test/src/test/resources/org/apache/daffodil/runtime2/egress_xdcc_bw.14.dat"),
- file("daffodil-test/src/test/resources/org/apache/daffodil/runtime2/egress_xdcc_bw.15.dat"),
- file("daffodil-test/src/test/resources/org/apache/daffodil/runtime2/egress_xdcc_bw.16.dat"),
- file("daffodil-test/src/test/resources/org/apache/daffodil/runtime2/egress_xdcc_bw.17.dat"),
- file("daffodil-test/src/test/resources/org/apache/daffodil/runtime2/egress_xdcc_bw.18.dat"),
- file("daffodil-test/src/test/resources/org/apache/daffodil/runtime2/egress_xdcc_bw.19.dat"),
- file("daffodil-test/src/test/resources/org/apache/daffodil/runtime2/egress_xdcc_bw.20.dat"),
- file(
- "daffodil-test/src/test/resources/org/apache/daffodil/runtime2/ingress_xdcc_bw.111.dat",
- ),
- file(
- "daffodil-test/src/test/resources/org/apache/daffodil/runtime2/ingress_xdcc_bw.112.dat",
- ),
- file(
- "daffodil-test/src/test/resources/org/apache/daffodil/runtime2/ingress_xdcc_bw.113.dat",
- ),
- file(
- "daffodil-test/src/test/resources/org/apache/daffodil/runtime2/ingress_xdcc_bw.114.dat",
- ),
- file(
- "daffodil-test/src/test/resources/org/apache/daffodil/runtime2/ingress_xdcc_bw.115.dat",
- ),
- file(
- "daffodil-test/src/test/resources/org/apache/daffodil/runtime2/ingress_xdcc_bw.116.dat",
- ),
- file("daffodil-test/src/test/resources/org/apache/daffodil/runtime2/orion.aptina.dat"),
- file("daffodil-test/src/test/resources/org/apache/daffodil/runtime2/orion.camera.dat"),
- file("daffodil-test/src/test/resources/org/apache/daffodil/runtime2/orion.command.dat"),
- file("daffodil-test/src/test/resources/org/apache/daffodil/runtime2/orion.limits.dat"),
- file("daffodil-test/src/test/resources/org/apache/daffodil/runtime2/orion.video.dat"),
+ file("daffodil-test/src/test/resources/org/apache/daffodil/codegen/c/data"),
Review Comment:
Yeah. The infoset directory is really to make it easier if you change things majorly, and you want to bulk replace them all.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@daffodil.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [daffodil] stevedlawrence commented on a diff in pull request #968: Rename daffodil-runtime2
Posted by "stevedlawrence (via GitHub)" <gi...@apache.org>.
stevedlawrence commented on code in PR #968:
URL: https://github.com/apache/daffodil/pull/968#discussion_r1113628476
##########
project/Rat.scala:
##########
@@ -40,7 +40,7 @@ object Rat {
file("daffodil-cli/src/windows/dialog.bmp"),
// generated_code.[ch] examples
- file("daffodil-runtime2/src/test/c/examples"),
+ file("daffodil-codegen-c/src/test/c/examples"),
Review Comment:
I don't think it's necessary to make the changes. If the goal is to be historical, we probably do want it to match what it was as the time of use. Just wanted to bring it up since it was a place I saw runtime2 stuff.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@daffodil.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [daffodil] stevedlawrence commented on a diff in pull request #968: Rename daffodil-runtime2
Posted by "stevedlawrence (via GitHub)" <gi...@apache.org>.
stevedlawrence commented on code in PR #968:
URL: https://github.com/apache/daffodil/pull/968#discussion_r1113509182
##########
project/Rat.scala:
##########
@@ -112,58 +112,7 @@ object Rat {
file("daffodil-tdml-lib/src/test/resources/test/tdml/test.txt"),
file("daffodil-tdml-processor/src/test/resources/test/tdml/test.bin"),
file("daffodil-tdml-processor/src/test/resources/test/tdml/test.txt"),
- file(
- "daffodil-test/src/test/resources/org/apache/daffodil/runtime2/ISRM_green_to_orange_60000.0.dat",
- ),
- file(
- "daffodil-test/src/test/resources/org/apache/daffodil/runtime2/ISRM_green_to_orange_60000.1.dat",
- ),
- file(
- "daffodil-test/src/test/resources/org/apache/daffodil/runtime2/ISRM_orange_to_green_60002.dat",
- ),
- file(
- "daffodil-test/src/test/resources/org/apache/daffodil/runtime2/MPU_green_to_orange_60004.dat",
- ),
- file(
- "daffodil-test/src/test/resources/org/apache/daffodil/runtime2/MPU_orange_to_green_60006.0.dat",
- ),
- file(
- "daffodil-test/src/test/resources/org/apache/daffodil/runtime2/MPU_orange_to_green_60006.1.dat",
- ),
- file("daffodil-test/src/test/resources/org/apache/daffodil/runtime2/collisions.dat"),
- file("daffodil-test/src/test/resources/org/apache/daffodil/runtime2/egress_xdcc_bw.11.dat"),
- file("daffodil-test/src/test/resources/org/apache/daffodil/runtime2/egress_xdcc_bw.12.dat"),
- file("daffodil-test/src/test/resources/org/apache/daffodil/runtime2/egress_xdcc_bw.13.dat"),
- file("daffodil-test/src/test/resources/org/apache/daffodil/runtime2/egress_xdcc_bw.14.dat"),
- file("daffodil-test/src/test/resources/org/apache/daffodil/runtime2/egress_xdcc_bw.15.dat"),
- file("daffodil-test/src/test/resources/org/apache/daffodil/runtime2/egress_xdcc_bw.16.dat"),
- file("daffodil-test/src/test/resources/org/apache/daffodil/runtime2/egress_xdcc_bw.17.dat"),
- file("daffodil-test/src/test/resources/org/apache/daffodil/runtime2/egress_xdcc_bw.18.dat"),
- file("daffodil-test/src/test/resources/org/apache/daffodil/runtime2/egress_xdcc_bw.19.dat"),
- file("daffodil-test/src/test/resources/org/apache/daffodil/runtime2/egress_xdcc_bw.20.dat"),
- file(
- "daffodil-test/src/test/resources/org/apache/daffodil/runtime2/ingress_xdcc_bw.111.dat",
- ),
- file(
- "daffodil-test/src/test/resources/org/apache/daffodil/runtime2/ingress_xdcc_bw.112.dat",
- ),
- file(
- "daffodil-test/src/test/resources/org/apache/daffodil/runtime2/ingress_xdcc_bw.113.dat",
- ),
- file(
- "daffodil-test/src/test/resources/org/apache/daffodil/runtime2/ingress_xdcc_bw.114.dat",
- ),
- file(
- "daffodil-test/src/test/resources/org/apache/daffodil/runtime2/ingress_xdcc_bw.115.dat",
- ),
- file(
- "daffodil-test/src/test/resources/org/apache/daffodil/runtime2/ingress_xdcc_bw.116.dat",
- ),
- file("daffodil-test/src/test/resources/org/apache/daffodil/runtime2/orion.aptina.dat"),
- file("daffodil-test/src/test/resources/org/apache/daffodil/runtime2/orion.camera.dat"),
- file("daffodil-test/src/test/resources/org/apache/daffodil/runtime2/orion.command.dat"),
- file("daffodil-test/src/test/resources/org/apache/daffodil/runtime2/orion.limits.dat"),
- file("daffodil-test/src/test/resources/org/apache/daffodil/runtime2/orion.video.dat"),
+ file("daffodil-test/src/test/resources/org/apache/daffodil/codegen/c/data"),
Review Comment:
It would be nice if we could do something like this for the rest of Daffodil--some convention where it's understood everything with a with a certain name/directory is ALv2 licensed, but cannot have a licenese it it.
That said, I imagine this was the reason for the data/infoset split? I've found that I generally prefer all data and infoset files to be in the same directory. I don't feel strongly about it, but I've found the extra level of indirection usually just gets in the way and doesn't really add much.
##########
daffodil-cli/src/test/scala/org/apache/daffodil/cli/cliTest/TestCLIGenerateC.scala:
##########
@@ -31,22 +32,18 @@ import org.junit.Test
*/
class TestCLIGenerateC {
- @Test def test_CLI_Generate_schema(): Unit = {
- val schema = path(
- "daffodil-runtime2/src/test/resources/org/apache/daffodil/runtime2/ex_nums.dfdl.xsd",
- )
+ val schema: Path = path(
+ "daffodil-codegen-c/src/test/resources/org/apache/daffodil/codegen/c/ex_nums.dfdl.xsd",
+ )
Review Comment:
I would prefer we don't include this change in this PR. If we want to reduce duplication, we should do for all of our CLI tests at the same PR in a consistent way. Changing only one test suite is what got us into the state we were in where every CLI test did something slightly different and it was a maintenance nightmare.
In general, I'm also not a huge fan of defining this path once globally. It's a lot of duplication, but it makes it much easier to debug tests when all the necessary input/output information is right in the test and we don't have to go searching for where variables are defined. It also gets confusing if we end up testing more schemas, which leads to `val schem1 = ...`, `val schma2 = ...`, which just gets confusing and unhelpful.
##########
project/Rat.scala:
##########
@@ -40,7 +40,7 @@ object Rat {
file("daffodil-cli/src/windows/dialog.bmp"),
// generated_code.[ch] examples
- file("daffodil-runtime2/src/test/c/examples"),
+ file("daffodil-codegen-c/src/test/c/examples"),
Review Comment:
The osgi-refactor script has a Rat.scala file that references "runtime2". How do we want to handle that? I assume no changes and it's only there for historical reasons?
##########
daffodil-cli/src/test/scala/org/apache/daffodil/cli/cliTest/TestBlob.scala:
##########
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.daffodil.cliTest
+package org.apache.daffodil.cli.cliTest
Review Comment:
Was this put in the `cliTest` package for a reason, like some issue with OSGI?
##########
DEVELOP.md:
##########
@@ -224,6 +224,7 @@ daffodil/
│ ├── bin.NOTICE - Contains notices of Daffodil and subcomponents
│ ├── build.sbt - Tells sbt how to build CLI and installers
│ └── src/ - Contains CLI source code, tests, scripts, etc.
+├── daffodil-codegen-c/ - Contains Daffodil's C code generator
Review Comment:
In the `Documetation` section of this file there is a "Daffodil Runtime 2" link to confluence. We should rename that confluence page and update the link as part of this PR.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@daffodil.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [daffodil] tuxji merged pull request #968: Rename daffodil-runtime2
Posted by "tuxji (via GitHub)" <gi...@apache.org>.
tuxji merged PR #968:
URL: https://github.com/apache/daffodil/pull/968
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@daffodil.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [daffodil] tuxji commented on a diff in pull request #968: Rename daffodil-runtime2
Posted by "tuxji (via GitHub)" <gi...@apache.org>.
tuxji commented on code in PR #968:
URL: https://github.com/apache/daffodil/pull/968#discussion_r1113584070
##########
daffodil-cli/src/test/scala/org/apache/daffodil/cli/cliTest/TestCLIGenerateC.scala:
##########
@@ -31,22 +32,18 @@ import org.junit.Test
*/
class TestCLIGenerateC {
- @Test def test_CLI_Generate_schema(): Unit = {
- val schema = path(
- "daffodil-runtime2/src/test/resources/org/apache/daffodil/runtime2/ex_nums.dfdl.xsd",
- )
+ val schema: Path = path(
+ "daffodil-codegen-c/src/test/resources/org/apache/daffodil/codegen/c/ex_nums.dfdl.xsd",
+ )
Review Comment:
Sure, I'll remove the schema change from the PR.
##########
daffodil-cli/src/test/scala/org/apache/daffodil/cli/cliTest/TestBlob.scala:
##########
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.daffodil.cliTest
+package org.apache.daffodil.cli.cliTest
Review Comment:
The tests were always in package `org.apache.daffodil.cliTest` even before the OSGi refactoring was done. The refactoring scripts added a `cli` directory and moved all the files down one level below the `cli` directory, but they didn't touch these tests' package lines.
OSGi loaders are fine as long as everything in daffodil-cli starts with the same package (org.apache.daffodil.cli) and nothing else anywhere else starts with the same package. Whatever names we choose after `cli` is up to us and doubly so for tests, which are rarely packaged into jars, making them invisible to OSGi loaders anyway. If we want to, we can remove the `cliTest` directory and move the tests up one level into the `cli` directory instead.
##########
project/Rat.scala:
##########
@@ -112,58 +112,7 @@ object Rat {
file("daffodil-tdml-lib/src/test/resources/test/tdml/test.txt"),
file("daffodil-tdml-processor/src/test/resources/test/tdml/test.bin"),
file("daffodil-tdml-processor/src/test/resources/test/tdml/test.txt"),
- file(
- "daffodil-test/src/test/resources/org/apache/daffodil/runtime2/ISRM_green_to_orange_60000.0.dat",
- ),
- file(
- "daffodil-test/src/test/resources/org/apache/daffodil/runtime2/ISRM_green_to_orange_60000.1.dat",
- ),
- file(
- "daffodil-test/src/test/resources/org/apache/daffodil/runtime2/ISRM_orange_to_green_60002.dat",
- ),
- file(
- "daffodil-test/src/test/resources/org/apache/daffodil/runtime2/MPU_green_to_orange_60004.dat",
- ),
- file(
- "daffodil-test/src/test/resources/org/apache/daffodil/runtime2/MPU_orange_to_green_60006.0.dat",
- ),
- file(
- "daffodil-test/src/test/resources/org/apache/daffodil/runtime2/MPU_orange_to_green_60006.1.dat",
- ),
- file("daffodil-test/src/test/resources/org/apache/daffodil/runtime2/collisions.dat"),
- file("daffodil-test/src/test/resources/org/apache/daffodil/runtime2/egress_xdcc_bw.11.dat"),
- file("daffodil-test/src/test/resources/org/apache/daffodil/runtime2/egress_xdcc_bw.12.dat"),
- file("daffodil-test/src/test/resources/org/apache/daffodil/runtime2/egress_xdcc_bw.13.dat"),
- file("daffodil-test/src/test/resources/org/apache/daffodil/runtime2/egress_xdcc_bw.14.dat"),
- file("daffodil-test/src/test/resources/org/apache/daffodil/runtime2/egress_xdcc_bw.15.dat"),
- file("daffodil-test/src/test/resources/org/apache/daffodil/runtime2/egress_xdcc_bw.16.dat"),
- file("daffodil-test/src/test/resources/org/apache/daffodil/runtime2/egress_xdcc_bw.17.dat"),
- file("daffodil-test/src/test/resources/org/apache/daffodil/runtime2/egress_xdcc_bw.18.dat"),
- file("daffodil-test/src/test/resources/org/apache/daffodil/runtime2/egress_xdcc_bw.19.dat"),
- file("daffodil-test/src/test/resources/org/apache/daffodil/runtime2/egress_xdcc_bw.20.dat"),
- file(
- "daffodil-test/src/test/resources/org/apache/daffodil/runtime2/ingress_xdcc_bw.111.dat",
- ),
- file(
- "daffodil-test/src/test/resources/org/apache/daffodil/runtime2/ingress_xdcc_bw.112.dat",
- ),
- file(
- "daffodil-test/src/test/resources/org/apache/daffodil/runtime2/ingress_xdcc_bw.113.dat",
- ),
- file(
- "daffodil-test/src/test/resources/org/apache/daffodil/runtime2/ingress_xdcc_bw.114.dat",
- ),
- file(
- "daffodil-test/src/test/resources/org/apache/daffodil/runtime2/ingress_xdcc_bw.115.dat",
- ),
- file(
- "daffodil-test/src/test/resources/org/apache/daffodil/runtime2/ingress_xdcc_bw.116.dat",
- ),
- file("daffodil-test/src/test/resources/org/apache/daffodil/runtime2/orion.aptina.dat"),
- file("daffodil-test/src/test/resources/org/apache/daffodil/runtime2/orion.camera.dat"),
- file("daffodil-test/src/test/resources/org/apache/daffodil/runtime2/orion.command.dat"),
- file("daffodil-test/src/test/resources/org/apache/daffodil/runtime2/orion.limits.dat"),
- file("daffodil-test/src/test/resources/org/apache/daffodil/runtime2/orion.video.dat"),
+ file("daffodil-test/src/test/resources/org/apache/daffodil/codegen/c/data"),
Review Comment:
I agree that there are a small number of files, it's easier to keep everything in the same directory. When the number of files grows larger, then grouping them into different directories allows us to reduce Rat.scala's size. Another advantage I've noticed is that you can run daffodil parse/unparse and c/daffodil parse/unparse commands on data and infosets without clobbering existing files, which allows you to compare output files to existing files more easily as well. You just have to make sure your parse/unparse commands consistently write their output files to directories where the output files aren't present already.
##########
DEVELOP.md:
##########
@@ -224,6 +224,7 @@ daffodil/
│ ├── bin.NOTICE - Contains notices of Daffodil and subcomponents
│ ├── build.sbt - Tells sbt how to build CLI and installers
│ └── src/ - Contains CLI source code, tests, scripts, etc.
+├── daffodil-codegen-c/ - Contains Daffodil's C code generator
Review Comment:
Good catch, I'd grepped for runtime2 but not "runtime 2" with any separating character. That place's the only place and I'll fix it.
##########
project/Rat.scala:
##########
@@ -40,7 +40,7 @@ object Rat {
file("daffodil-cli/src/windows/dialog.bmp"),
// generated_code.[ch] examples
- file("daffodil-runtime2/src/test/c/examples"),
+ file("daffodil-codegen-c/src/test/c/examples"),
Review Comment:
I know, I saw the runtime2 still mentioned in the scripts too. I left the scripts alone because they're historical artifacts that @mbeckerle wanted to keep around in case someone needs to develop new refactoring scripts again. It would've been easy enough to get them out of git history, but only for someone who remembers that the scripts were there. I have no objections changing runtime2 in them just to have a clean slate, however.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@daffodil.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org