Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New lff autoformatter for Lingua Franca files #1422

Merged
merged 31 commits into from
Oct 28, 2022
Merged

New lff autoformatter for Lingua Franca files #1422

merged 31 commits into from
Oct 28, 2022

Conversation

cmnrd
Copy link
Collaborator

@cmnrd cmnrd commented Oct 21, 2022

This PR refactors the org.lflang.cli package.

  1. It includes the org.lflang.cli package as a subpackage in org.lflang. This closes Move contents of org.lflang.lfc to a subpackage lfc within org.lflang #1421.
  2. It simplifies the gradle build such that a single jar (org.lflang-0.3.1-SNAPSHOT.jar) is created. This jar includes both the lfc and lff main classes. The main build task is now called buildAll. buildLfc is still available but shows a deprecation warning.
  3. It introduces an lff script to invoke the lingua franca formatter. This closes Create lff script #1369.
  4. It renames the build script to build-lf-cli and drops the --run option. Note that the old build script is still available, but prints a deprecation warning. The --run option was dropped because it would be unclear which command to run. Also the run tasks that we provide for gradle already implement this functionality.

There are still a couple of unresolved issues though:

@cmnrd cmnrd added this to the 0.4.0 milestone Oct 21, 2022
@axmmisaka
Copy link
Collaborator

Haha, @cmnrd is faster than me on this…… I’ll review this PR then

@lhstrh
Copy link
Member

lhstrh commented Oct 21, 2022 via email

@cmnrd
Copy link
Collaborator Author

cmnrd commented Oct 25, 2022

@axmmisaka Do you have access to a Windows machine? You could fix the lfc.ps1 script and add a similar one for lff

@axmmisaka
Copy link
Collaborator

@axmmisaka Do you have access to a Windows machine? You could fix the lfc.ps1 script and add a similar one for lff

Yes! I’ll take care of it

@axmmisaka
Copy link
Collaborator

axmmisaka commented Oct 27, 2022

Just as a reminder things like this needs to be changed as well

@axmmisaka
Copy link
Collaborator

axmmisaka commented Oct 27, 2022

As of c036e4c, ./gradlew buildAll does not produce jar - ./gradlew assemble is required.

org.lflang/build.gradle Outdated Show resolved Hide resolved
Copy link
Member

@lhstrh lhstrh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚀 🚀 🚀

@lhstrh lhstrh added feature New feature enhancement Enhancement of existing feature refactoring Code quality enhancement and removed feature New feature labels Oct 28, 2022
@cmnrd
Copy link
Collaborator Author

cmnrd commented Oct 28, 2022

As far as I am concerned this is ready to be merged! The only point that is still unclear to me is whether the changes here affect the release toolflow. @lhstrh can you comment on this and perhaps open an issue in the workflow repo?

@lhstrh
Copy link
Member

lhstrh commented Oct 28, 2022

As far as I am concerned this is ready to be merged! The only point that is still unclear to me is whether the changes here affect the release toolflow. @lhstrh can you comment on this and perhaps open an issue in the workflow repo?

There might be some issue, but those will surface once I create a draft PR. This should not be a reason to hold up this PR and would only amount to changes required in the release-tools repo.

@lhstrh lhstrh changed the title Introduce an lff script and move org.lflang.cli as a subpackage into org.lflang New lff script and org.lflang.cli moved into org.lflang as subpackage Oct 28, 2022
@lhstrh lhstrh merged commit bbbfad6 into master Oct 28, 2022
@lhstrh lhstrh deleted the refactor-cli branch October 28, 2022 16:30
@lhstrh lhstrh removed the refactoring Code quality enhancement label Jan 26, 2023
@lhstrh lhstrh changed the title New lff script and org.lflang.cli moved into org.lflang as subpackage New lff autoformatter for Lingua Franca files Jan 26, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement Enhancement of existing feature
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Move contents of org.lflang.lfc to a subpackage lfc within org.lflang Create lff script
4 participants