Merge branch 'master' into daily-builds

wellenvogel · Jun 30, 2023 · 05a3e67 · 05a3e67
2 parents 8a31d5d + 3c052fe
commit 05a3e67
Show file tree

Hide file tree

Showing 6 changed files with 68 additions and 30 deletions.
diff --git a/build.gradle b/build.gradle
@@ -41,7 +41,8 @@ import org.eclipse.jgit.storage.file.FileRepositoryBuilder
 import org.eclipse.jgit.lib.Repository
 import org.eclipse.jgit.lib.ObjectId
 import org.gradle.api.*
-import com.moowork.gradle.node.npm.*
+import com.github.gradle.node.npm.task.*
+
 
 def VARIANTS=[
         [osline:'ubuntu',
@@ -96,20 +97,6 @@ def VARIANTS=[
             ['libwxgtk3.0-gtk3-0v5'],
             ['wx3.0-i18n']
         ]],
-        [osline:'debian',
-         osversion:'buster',
-         arch: 'i386',
-         tag: 2,
-         dockerbase:'i386/debian',
-         dockerfile:'Dockerfile.gtk2',
-         dependencies:[
-                 ['libc6'],
-                 ['libgcc1'],
-                 ['libstdc++6'],
-                 ['libwxbase3.0-0v5'],
-                 ['libwxgtk3.0-0v5'],
-                 ['wx3.0-i18n']
-        ]],
         [osline:'debian',
          osversion:'buster',
          arch: 'amd64',
@@ -193,11 +180,11 @@ buildscript{
     }
     dependencies{
         classpath localGroovy()
-        classpath 'com.netflix.nebula:gradle-ospackage-plugin:7.5.0'
+        classpath 'com.netflix.nebula:gradle-ospackage-plugin:11.1.0'
         classpath 'commons-net:commons-net:3.3'
         classpath 'org.eclipse.jgit:org.eclipse.jgit:4.6.0.201612231935-r'
         classpath group: 'org.ccil.cowan.tagsoup', name: 'tagsoup', version: '1.2.1'
-        classpath "com.moowork.gradle:gradle-node-plugin:1.3.1"
+        classpath "com.github.node-gradle:gradle-node-plugin:5.0.0"
     }
 }
 
@@ -235,11 +222,12 @@ logger.lifecycle "ProjectVersion=${project.avnavVersion}"
 description="AvNav chart provider for o-charts"
 apply plugin: 'java'
 
-apply plugin: 'nebula.ospackage-base'
-apply plugin: 'com.moowork.node'
+apply plugin: 'com.netflix.nebula.ospackage-base'
+apply plugin: 'com.github.node-gradle.node'
 
 
-class MyNpm extends NpmTask{
+abstract class MyNpm extends NpmTask{
+    @Internal
     def subDir
     @InputFiles
     def getInputFiles(){
@@ -271,22 +259,19 @@ class MyNpm extends NpmTask{
 }
 
 project(":gui") {
-    apply plugin: 'com.moowork.node'
+    apply plugin: 'com.github.node-gradle.node'
+
     task viewerRelease(type: MyNpm) {
         subDir = "release"
         args = ["run", "release"]
-        setExecOverrides({
-            it.environment.put('AVNAV_VERSION', rootProject.avnavVersion)
-        })
+        environment=['AVNAV_VERSION': rootProject.avnavVersion]
         dependsOn npmInstall,':cleanGui'
     }
     task viewerDebug(type: MyNpm) {
         mustRunAfter(':cleanGui')
         subDir = "debug"
         args = ["run", "build"]
-        setExecOverrides({
-            it.environment.put('AVNAV_VERSION', rootProject.avnavVersion+"-debug")
-        })
+        environment=['AVNAV_VERSION': rootProject.avnavVersion+"-debug"]
         dependsOn npmInstall
     }
 }
@@ -360,11 +345,17 @@ class DockerTask extends Exec{
     public static def getImageName(osline,osversion,arch,tag){
        return "$dockerRepo/avnavocharts-build-$osline-$osversion-$arch:$tag"
     }
+    @Internal
     def dockerBase
+    @Internal
     def osline
+    @Internal
     def osversion
+    @Internal
     def arch
+    @Internal
     def dockerFile
+    @Internal
     def tag=1
     def getCommandArgs(dockerBase,osversion,uid,gid,uname,dockerFile,imageName){
         return []

diff --git a/buildSrc/src/main/groovy/UploadHtAccess.groovy b/buildSrc/src/main/groovy/UploadHtAccess.groovy
@@ -1,9 +1,12 @@
 import org.gradle.api.DefaultTask
 import org.gradle.api.tasks.TaskAction
+import org.gradle.api.tasks.*
 
 class UploadHtAccess extends UploadTask{
 
+    @Internal
     def sourceName=null
+    @Internal
     def version=null
 
     static def createHtAccess(src,dest,version){

diff --git a/buildSrc/src/main/groovy/UploadSftp.groovy b/buildSrc/src/main/groovy/UploadSftp.groovy
@@ -6,6 +6,7 @@ import org.gradle.api.DefaultTask
 import org.gradle.api.file.FileTree
 import org.gradle.api.file.FileVisitDetails
 import org.gradle.api.tasks.TaskAction
+import org.gradle.api.tasks.Internal
 
 import java.security.MessageDigest
 
@@ -166,20 +167,32 @@ class UploadSftp extends DefaultTask{
         is.close();
         return rt
     }
+    @Internal
     def server="www.wellenvogel.net"
+    @Internal
     def base="/www/software/avnav/downloads"
+    @Internal
     def user
+    @Internal
     def passwd
+    @Internal
     def privateKey
+    @Internal
     def baseDir="daily"
+    @Internal
     def useHashes=false
+    @Internal
     def hashFileName="_hashes"
-
+    @Internal
     File inputFile
+    @Internal
     def getTargetName=null
+    @Internal
     FileTree inputFiles
+    @Internal
     boolean deleteTargetDir=false
 
+    @Internal
     def getRealBase(){
         def envBase=System.getenv("AVNAV_REPO_BASE");
         if (envBase != null) base=envBase

diff --git a/buildSrc/src/main/groovy/UploadTask.groovy b/buildSrc/src/main/groovy/UploadTask.groovy
@@ -6,6 +6,7 @@ import org.gradle.api.DefaultTask
 import org.gradle.api.file.FileTree
 import org.gradle.api.file.FileVisitDetails
 import org.gradle.api.tasks.TaskAction
+import org.gradle.api.tasks.*
 
 import java.security.MessageDigest
 
@@ -73,6 +74,8 @@ class UploadTask extends DefaultTask{
     private void createRemoteDir(FTPClient client,String path){
         if (createdDirs.contains(path)) {
             client.changeWorkingDirectory(path)
+            String wd=client.printWorkingDirectory()
+            logger.info("current working dir=$wd")
             return
         }
         boolean abs=false
@@ -169,19 +172,31 @@ class UploadTask extends DefaultTask{
         ftp.completePendingCommand();
         return rt
     }
+    @Internal
     def server="www.wellenvogel.net"
+    @Internal
     def base="/www/software/avnav/downloads"
+    @Internal
     def baseDir="daily"
+    @Internal
     def user
+    @Internal
     def passwd
+    @Internal
     def useHashes=false
+    @Internal
     def hashFileName="_hashes"
 
+    @Internal
     File inputFile
+    @Internal
     def getTargetName=null
+    @Internal
     FileTree inputFiles
+    @Internal
     boolean deleteTargetDir=false
 
+    @Internal
     def getRealBase(){
         def envBase=System.getenv("AVNAV_REPO_BASE");
         if (envBase != null) base=envBase

diff --git a/docker/Dockerfile.wx32 b/docker/Dockerfile.wx32
@@ -0,0 +1,16 @@
+#arm32v7/debian,arm64v8/debian,ubuntu
+ARG OSLINE=arm32v7/debian
+#bookworm,24.04?
+ARG OSVERSION=bookworm
+
+FROM ${OSLINE}:${OSVERSION}
+
+RUN apt-get update #&& apt-get upgrade
+
+#ugly hack for ubuntu:focal
+RUN echo "Europe/Berlin" > /etc/timezone
+RUN ln -sf /usr/share/zoneinfo/Europe/Berlin /etc/localtime
+
+RUN DEBIAN_FRONTEND=noninteractive apt-get install -y build-essential cmake gettext git-core libarchive-dev libbz2-dev libcurl4-openssl-dev libssl-dev libelf-dev libexif-dev lsb-release portaudio19-dev libwxsvg-dev libsqlite3-dev libtinyxml-dev libunarr-dev libsndfile1-dev libwxgtk3.2-dev libwxgtk-webview3.2-dev libcairo2-dev libgdk-pixbuf2.0-dev libgl1-mesa-dev liblz4-dev liblzma-dev libpango1.0-dev libglib2.0-dev libglew-dev
+
+CMD /bin/bash
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sun Feb 26 20:43:53 CET 2017
+#Tue Jun 27 19:38:54 CEST 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip