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

xjc generation changes #24

Merged
merged 6 commits into from
Nov 18, 2024
Merged

xjc generation changes #24

merged 6 commits into from
Nov 18, 2024

Conversation

ds58
Copy link
Collaborator

@ds58 ds58 commented Nov 18, 2024

  • We now commit the generated xjc files to vcs
  • We now call cppbuild.bash on gradle import
  • We now generate the xjc files via command line xjc, I found this to be less flaky overall. It will not run if xjc is not available on the system.

cppbuild.bash Outdated
' "$file"

# Delete the Generated on: line so we don't constantly have new vcs changes to these files
sed -i '/\/\/ Generated on:/d' "$file"
Copy link
Member

Choose a reason for hiding this comment

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

🙏

file(dest).mkdirs()
fun runScript(scriptPath: String, envVars: Map<String, String> = emptyMap(), vararg args: String) {
val isWindows = System.getProperty("os.name").lowercase().contains("win")
val bashCommand = if (isWindows) "C:\\Program Files\\Git\\git-bash.exe" else "bash"
Copy link
Member

Choose a reason for hiding this comment

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

Wouldn't it be more reliable to write a powershell?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

No, because bash is not available on the default Path

@ds58 ds58 merged commit 33e7b6b into develop Nov 18, 2024
2 checks passed
@ds58 ds58 deleted the xjc-changes branch November 18, 2024 17:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants