From fe01e1b81c9b82c75983925f24b066db51e13777 Mon Sep 17 00:00:00 2001
From: OLEGSHA <kvadropups@gmail.com>
Date: Sun, 9 Jan 2022 21:02:56 +0300
Subject: [PATCH] Fixed first-time packaging issue in build script

---
 build.gradle                             | 66 ++++++++----------------
 build_logic/packaging/deb/script.gradle  |  6 ++-
 build_logic/packaging/nsis/script.gradle |  4 ++
 build_logic/packaging/zip/script.gradle  |  4 ++
 4 files changed, 34 insertions(+), 46 deletions(-)

diff --git a/build.gradle b/build.gradle
index 9cc7031..32c3a54 100644
--- a/build.gradle
+++ b/build.gradle
@@ -267,64 +267,40 @@ apply from: 'build_logic/lwjgl.gradle'
 import java.nio.file.*
 import java.nio.file.attribute.*
 
-task createPackagingDirs() {
-	description 'Resets build/tmp/packaging directory.'
-	
-	doLast {
-		def tmpDir = buildDir.toPath().resolve 'tmp/packaging'
-
-		def nuke = new SimpleFileVisitor<Path>() {
-			@Override
-			public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
-				Files.delete(file);
-				return FileVisitResult.CONTINUE;
-			}
-			@Override
-			public FileVisitResult postVisitDirectory(Path dir, IOException e) throws IOException {
-				if (e == null) {
-					Files.delete(dir);
-					return FileVisitResult.CONTINUE;
-				} else {
-					// directory iteration failed
-					throw e;
-				}
-			}
-		}
-		
-		// Fckn nuke tmpDir from orbit
-		// I'm so done with deleting file trees in Java/Groovy/whatever
-		// ...Not using File.deleteDir() because the latter recurses into symlinks, and we don't want to wipe build/libs/lib
-		if (Files.exists(tmpDir)) {
-			Files.walkFileTree tmpDir, nuke
-		}
-		
-        Files.createDirectories tmpDir.resolve('workingDir')
-        Files.createDirectories buildDir.toPath().resolve('packages')
-    }
+task deletePackagingDirs(type: Delete) {
+	description 'Deletes build/tmp/packaging directory.'
+	followSymlinks = false
+	delete 'build/tmp/packaging'
 }
 
-task linkBuildOutputForPackaging() {
+task linkBuildOutputForPackaging {
 	description 'Symlinks the contents of build/libs into packaging working directory.'
 	
     dependsOn build
-    dependsOn createPackagingDirs
+    mustRunAfter deletePackagingDirs
     
     onlyIf { preparePackaging.ext.mode == 'symlink' }
     
+	ext.from = 'build/libs'
+	ext.into = "build/tmp/packaging/workingDir/${ -> preparePackaging.ext.buildDest}"
+	
+	inputs.dir from
+	outputs.dir into
+    
     doLast {
-        def from = buildDir.toPath().resolve 'libs'
-		def into = buildDir.toPath().resolve "tmp/packaging/workingDir/${preparePackaging.ext.buildDest}"
-		
-        Files.createDirectories into
+		def fromPath = Paths.get from
+		def intoPath = Paths.get into
+    
+        Files.createDirectories intoPath
         
-        Files.list(from).each {
+        Files.list(fromPath).each {
 			def fileName = it.fileName.toString()
 			
 			// Exclude all JARs except the current one
 			if (fileName ==~ "${project.name}.*\\.jar" && fileName != tasks.jar.archiveFileName.get())
 				return
-        
-            Files.createSymbolicLink into.resolve(it.fileName), it
+			
+            Files.createSymbolicLink intoPath.resolve(it.fileName), intoPath.relativize(it)
         }
     }
 }
@@ -333,7 +309,7 @@ task copyBuildOutputForPackaging(type: Copy) {
 	description 'Copies the contents of build/libs into packaging working directory.'
 
     dependsOn build
-    dependsOn createPackagingDirs
+    mustRunAfter deletePackagingDirs
     
     onlyIf { preparePackaging.ext.mode == 'copy' }
     
@@ -348,7 +324,7 @@ task preparePackaging {
 	preparePackaging.ext.buildDest = ''
 	preparePackaging.ext.mode = 'symlink'
 	
-	dependsOn createPackagingDirs
+	dependsOn deletePackagingDirs
 	dependsOn linkBuildOutputForPackaging
 	dependsOn copyBuildOutputForPackaging
 }
diff --git a/build_logic/packaging/deb/script.gradle b/build_logic/packaging/deb/script.gradle
index f5c380b..27b67a8 100644
--- a/build_logic/packaging/deb/script.gradle
+++ b/build_logic/packaging/deb/script.gradle
@@ -15,7 +15,7 @@ task packageDeb_configure() {
 	preparePackaging.mustRunAfter packageDeb_configure
 
 	doLast {
-		tasks.preparePackaging.ext.buildDest = '/usr/share/progressia'
+		tasks.preparePackaging.ext.buildDest = 'usr/share/progressia'
 		tasks.preparePackaging.ext.mode = 'copy'
 	}
 }
@@ -31,6 +31,10 @@ task packageDeb(type: Exec) {
 	
 	dependsOn packageDeb_processResources
 	
+	doFirst {
+		mkdir 'build/packages'
+	}
+	
 	executable 'dpkg-deb'
 	args '--root-owner-group'
 	args '--build', 'build/tmp/packaging/workingDir'
diff --git a/build_logic/packaging/nsis/script.gradle b/build_logic/packaging/nsis/script.gradle
index fe03b0f..9e6f430 100644
--- a/build_logic/packaging/nsis/script.gradle
+++ b/build_logic/packaging/nsis/script.gradle
@@ -40,6 +40,10 @@ task packageNsis(type: Exec) {
 	dependsOn packageNsis_generateIcon
 	dependsOn packageNsis_generateLeftSide
 	
+	doFirst {
+		mkdir 'build/packages'
+	}
+	
 	executable 'makensis'
 	args '-NOCONFIG'
 	args "-DPROJECT_NAME=${project.name}"
diff --git a/build_logic/packaging/zip/script.gradle b/build_logic/packaging/zip/script.gradle
index 4975ac8..b757d1d 100644
--- a/build_logic/packaging/zip/script.gradle
+++ b/build_logic/packaging/zip/script.gradle
@@ -36,6 +36,10 @@ task packageZip(type: Zip) {
 		archiveVersion = project.version
 	}
 	
+	doFirst {
+		mkdir 'build/packages'
+	}
+	
 	from 'build/tmp/packaging/workingDir'
 	destinationDirectory = file('build/packages')
 }