build files update

bardsoftware · Feb 13, 2022 · 2726085 · 2726085
1 parent 940c18a
commit 2726085
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 11 deletions.
diff --git a/ganttproject-builder/build.gradle b/ganttproject-builder/build.gradle
@@ -152,6 +152,7 @@ task distDebPre {
             commandLine "mv"
             args "deb/usr/share/doc/ganttproject/CHANGELOG.gz", "deb/usr/share/doc/ganttproject/changelog.Debian.gz"
         }
+        mkdir("${rootProject.buildDir}/distributions")
     }
 }
 

diff --git a/ganttproject-builder/build.xml b/ganttproject-builder/build.xml
@@ -56,7 +56,7 @@
              homepage="https://www.ganttproject.biz/"
              section="editors"
              priority="optional"
-             depends="openjdk-11-jre | openjdk-11-jdk | java11-runtime | bellsoft-java11-runtime | zulu-11 | java-11-amazon-corretto-jdk | adoptopenjdk-11-hotspot-jre"
+             depends="java11-runtime | bellsoft-java11-runtime | zulu11-jre | zulu17-jre"
              conflicts="ganttproject-praha"
              replaces="ganttproject-praha"
              postrm="${distDebWork}/postrm"

diff --git a/ganttproject/build.gradle b/ganttproject/build.gradle
@@ -90,16 +90,6 @@ sourceSets {
     test.kotlin.srcDirs += "src/test/java"
 }
 
-task updateVersion {
-    doFirst {
-        def gpVersionFile = new File("${projectDir}/src/net/sourceforge/ganttproject/GPVersion.java")
-        def gpversion = gpVersionFile.getText('UTF-8')
-            .replaceAll('.*BUILD.NUMBER.*', "  public static String BUILD = \"${rootProject.buildNum}\"; // BUILD NUMBER")
-        gpVersionFile.write(gpversion, 'UTF-8')
-    }
-}
-
-
 task copyPluginFiles(dependsOn: jar) {
     doLast {
         println ">>> Installing $project.name"
@@ -124,6 +114,7 @@ task copyPluginFiles(dependsOn: jar) {
             from(jar.outputs.getFiles().getFiles().flatten())
             from(configurations.compileClasspath.minus(configurations.providedCompile)) {
                 include "*.jar"
+                exclude "eclipsito.jar"
             }
             rename { filename -> filename + ".lib" }
         }
-Original file line number
+Diff line change
@@ Expand Up / @@ -152,6 +152,7 @@ task distDebPre { @@
                 commandLine "mv"
                 args "deb/usr/share/doc/ganttproject/CHANGELOG.gz", "deb/usr/share/doc/ganttproject/changelog.Debian.gz"
             }
+            mkdir("${rootProject.buildDir}/distributions")
         }
     }
@@ Expand Down @@