Skip to content

allow to include same file from multiple files #133

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.

Sign up for GitHub

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

Merged
holgerbrandl merged 4 commits into from
Jul 2, 2018
Merged

allow to include same file from multiple files #133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d030c33
allow to include same file from multiple files
oshai Jun 27, 2018
8fc94a2
change include urls to use distinctBy file name
oshai Jun 28, 2018
d4d2958
removed unused val
oshai Jun 28, 2018
24c1646
add multiple include file
oshai Jun 28, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/main/kotlin/kscript/app/AppHelpers.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,23 +241,23 @@ sourceSets.main.java.srcDirs 'src'
// https://stackoverflow.com/questions/17926459/creating-a-symbolic-link-with-java
createSymLink(File(this, scriptFile.name), scriptFile)


// also symlink all includes
includeURLs.forEach {
val includeFileName = it.toURI().path.split("/").last()

includeURLs.distinctBy { it.fileName() }
.forEach {
val includeFile = when {
it.protocol == "file" -> File(it.toURI())
else -> fetchFromURL(it.toString())
}

createSymLink(File(this, includeFileName), includeFile)
createSymLink(File(this, it.fileName()), includeFile)
}
}

return "idea ${tmpProjectDir.absolutePath}"
}

private fun URL.fileName() = this.toURI().path.split("/").last()

private fun createSymLink(link: File, target: File) {
try {
Expand Down Expand Up @@ -367,4 +367,4 @@ exec java -jar ${'$'}0 "${'$'}@"
}

infoMsg("Finished packaging into ${pckgedJar}")
}
}
6 changes: 6 additions & 0 deletions test/resources/diamond.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#!/usr/bin/env kscript


@file:Include("includes/include_3.kt")
@file:Include("includes/include_3.kt")