mirror/Purpur
2
0
Fork 0
mirror of https://github.com/PurpurMC/Purpur.git synced 2025-02-23 13:09:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

updating submodules breaks things, switch code back to non-submodule for time being

Browse Source
This commit is contained in:
Ben Kerllenevich 2021-06-13 08:39:12 -04:00
parent 345abf2b7d
commit 0554f1f067
2 changed files with 55 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Paper

@ -1 +1 @@
Subproject commit 76a75fc35ad59bf0eab753a8c0f149376368cfaa
Subproject commit 19da14ee00f93cc6b3e234162062a818df1f97d2

58
build.gradle.kts
View File

@ -52,19 +52,68 @@ subprojects {
}
}
/*
val paperDir = layout.projectDirectory.dir("Paper")
val paperBranch = "dev/1.17"
val initSubmodules by tasks.registering {
group = "paperweight"
outputs.upToDateWhen { false }
doLast {
paperDir.asFile.mkdirs()
Git(paperDir)("submodule", "update", "--init", "--recursive").executeOut()
Git(layout.projectDirectory)("submodule", "update", "--init", "--recursive").executeOut()
}
}
val upstreamUpdate by tasks.registering {
group = "paperweight"
outputs.upToDateWhen { false }
finalizedBy(cleanUpstreamCaches)
doLast {
Git(paperDir)("fetch").executeOut()
Git(paperDir)("clean", "-fd").executeOut()
Git(paperDir)("reset", "--hard", "origin/$paperBranch").executeOut()
Git(layout.projectDirectory)("add", "--force", paperDir.asFile.name).executeOut()
Git(layout.projectDirectory)("submodule", "update", "--init", "--recursive").executeOut()
}
}
val cleanUpstreamCaches by tasks.registering(GradleBuild::class) {
dir = paperDir.asFile
tasks = listOf("cleanCache")
}
val upstreamCommit by tasks.registering {
group = "paperweight"
outputs.upToDateWhen { false }
doLast {
val old = Git(layout.projectDirectory)("ls-tree", "HEAD", paperDir.asFile.name).readText()
?.substringAfter("commit ")?.substringBefore("\t")
val changes = Git(paperDir)("log", "--oneline", "$old...HEAD").readText()
changes ?: run {
println("No changes to commit?")
return@doLast
}
val commitMessage = """
|Updated Upstream (Paper)
|
|Upstream has released updates that appear to apply and compile correctly.
|
|Paper Changes:
|$changes
""".trimMargin()
Git(layout.projectDirectory)("commit", "-m", commitMessage).executeOut()
}
}
*/
paperweight {
serverProject.set(project(":Purpur-Server"))
/* // this is the code for without submodules in case we ever want to use it
usePaperUpstream(providers.gradleProperty("paperRef")) {
withPaperPatcher {
apiPatchDir.set(layout.projectDirectory.dir("patches/api"))
@ -74,8 +123,8 @@ paperweight {
serverOutputDir.set(layout.projectDirectory.dir("Purpur-Server"))
}
}
*/
/*
upstreams {
register("paper") {
upstreamDataTask {
@ -98,4 +147,5 @@ paperweight {
}
}
}
}
*/
}