From 08e99fe8c746b2e93702b3d348bb6b03f71c24f2 Mon Sep 17 00:00:00 2001 From: scroix Date: Sat, 6 Apr 2024 16:04:59 +1100 Subject: [PATCH] Manually 'rebase' in preparation for PR --- gradle/wrapper/gradle-wrapper.properties | 3 +- gradlew | 272 +++++++++-------------- gradlew.bat | 38 ++-- nodel-jyhost/build.gradle | 97 ++++---- nodel-webui-js/build.gradle | 158 +++++-------- nodel-webui-js/package.json | 3 + 6 files changed, 238 insertions(+), 333 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index c7d437bb..0ebb3108 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.4-bin.zip -networkTimeout=10000 +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 65dcd68d..83f2acfd 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ -#!/bin/sh +#!/usr/bin/env sh # -# Copyright © 2015-2021 the original authors. +# Copyright 2015 the original author or authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,113 +17,78 @@ # ############################################################################## -# -# Gradle start up script for POSIX generated by Gradle. -# -# Important for running: -# -# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is -# noncompliant, but you have some other compliant shell such as ksh or -# bash, then to run this script, type that shell name before the whole -# command line, like: -# -# ksh Gradle -# -# Busybox and similar reduced shells will NOT work, because this script -# requires all of these POSIX shell features: -# * functions; -# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», -# «${var#prefix}», «${var%suffix}», and «$( cmd )»; -# * compound commands having a testable exit status, especially «case»; -# * various built-in commands including «command», «set», and «ulimit». -# -# Important for patching: -# -# (2) This script targets any POSIX shell, so it avoids extensions provided -# by Bash, Ksh, etc; in particular arrays are avoided. -# -# The "traditional" practice of packing multiple parameters into a -# space-separated string is a well documented source of bugs and security -# problems, so this is (mostly) avoided, by progressively accumulating -# options in "$@", and eventually passing that to Java. -# -# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, -# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; -# see the in-line comments for details. -# -# There are tweaks for specific operating systems such as AIX, CygWin, -# Darwin, MinGW, and NonStop. -# -# (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt -# within the Gradle project. -# -# You can find Gradle at https://github.com/gradle/gradle/. -# +## +## Gradle start up script for UN*X +## ############################################################################## # Attempt to set APP_HOME - # Resolve links: $0 may be a link -app_path=$0 - -# Need this for daisy-chained symlinks. -while - APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path - [ -h "$app_path" ] -do - ls=$( ls -ld "$app_path" ) - link=${ls#*' -> '} - case $link in #( - /*) app_path=$link ;; #( - *) app_path=$APP_HOME$link ;; - esac +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null -# This is normally unused -# shellcheck disable=SC2034 -APP_BASE_NAME=${0##*/} -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD=maximum +MAX_FD="maximum" warn () { echo "$*" -} >&2 +} die () { echo echo "$*" echo exit 1 -} >&2 +} # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "$( uname )" in #( - CYGWIN* ) cygwin=true ;; #( - Darwin* ) darwin=true ;; #( - MSYS* | MINGW* ) msys=true ;; #( - NONSTOP* ) nonstop=true ;; +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - # Determine the Java command to use to start the JVM. if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD=$JAVA_HOME/jre/sh/java + JAVACMD="$JAVA_HOME/jre/sh/java" else - JAVACMD=$JAVA_HOME/bin/java + JAVACMD="$JAVA_HOME/bin/java" fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -132,7 +97,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD=java + JAVACMD="java" which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the @@ -140,105 +105,84 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then - case $MAX_FD in #( - max*) - # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 - MAX_FD=$( ulimit -H -n ) || - warn "Could not query maximum file descriptor limit" - esac - case $MAX_FD in #( - '' | soft) :;; #( - *) - # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 - ulimit -n "$MAX_FD" || - warn "Could not set maximum file descriptor limit to $MAX_FD" - esac +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi fi -# Collect all arguments for the java command, stacking in reverse order: -# * args from the command line -# * the main class name -# * -classpath -# * -D...appname settings -# * --module-path (only if needed) -# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi # For Cygwin or MSYS, switch paths to Windows format before running java -if "$cygwin" || "$msys" ; then - APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) - CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) - - JAVACMD=$( cygpath --unix "$JAVACMD" ) - +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi # Now convert the arguments - kludge to limit ourselves to /bin/sh - for arg do - if - case $arg in #( - -*) false ;; # don't mess with options #( - /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath - [ -e "$t" ] ;; #( - *) false ;; - esac - then - arg=$( cygpath --path --ignore --mixed "$arg" ) + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" fi - # Roll the args list around exactly as many times as the number of - # args, so each arg winds up back in the position where it started, but - # possibly modified. - # - # NB: a `for` loop captures its iteration list before it begins, so - # changing the positional parameters here affects neither the number of - # iterations, nor the values presented in `arg`. - shift # remove old arg - set -- "$@" "$arg" # push replacement arg + i=$((i+1)) done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac fi -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. - -set -- \ - "-Dorg.gradle.appname=$APP_BASE_NAME" \ - -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ - "$@" - -# Stop when "xargs" is not available. -if ! command -v xargs >/dev/null 2>&1 -then - die "xargs is not available" -fi +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=$(save "$@") -# Use "xargs" to parse quoted args. -# -# With -n1 it outputs one arg per line, with the quotes and backslashes removed. -# -# In Bash we could simply go: -# -# readarray ARGS < <( xargs -n1 <<<"$var" ) && -# set -- "${ARGS[@]}" "$@" -# -# but POSIX shell has neither arrays nor command substitution, so instead we -# post-process each arg (as a line of input to sed) to backslash-escape any -# character that might be a shell metacharacter, then use eval to reverse -# that process (while maintaining the separation between arguments), and wrap -# the whole thing up as a single "set" statement. -# -# This will of course break if any of these variables contains a newline or -# an unmatched quote. -# +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" -eval "set -- $( - printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | - xargs -n1 | - sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | - tr '\n' ' ' - )" '"$@"' +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index 93e3f59f..9618d8d9 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%"=="" @echo off +@if "%DEBUG%" == "" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,14 +25,10 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%"=="" set DIRNAME=. -@rem This is normally unused +if "%DIRNAME%" == "" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" @@ -41,7 +37,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if %ERRORLEVEL% equ 0 goto execute +if "%ERRORLEVEL%" == "0" goto init echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -55,7 +51,7 @@ goto fail set JAVA_HOME=%JAVA_HOME:"=% set JAVA_EXE=%JAVA_HOME%/bin/java.exe -if exist "%JAVA_EXE%" goto execute +if exist "%JAVA_EXE%" goto init echo. echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% @@ -65,26 +61,38 @@ echo location of your Java installation. goto fail +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + :execute @rem Setup the command line set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% :end @rem End local scope for the variables with windows NT shell -if %ERRORLEVEL% equ 0 goto mainEnd +if "%ERRORLEVEL%"=="0" goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -set EXIT_CODE=%ERRORLEVEL% -if %EXIT_CODE% equ 0 set EXIT_CODE=1 -if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% -exit /b %EXIT_CODE% +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/nodel-jyhost/build.gradle b/nodel-jyhost/build.gradle index b4265d59..7349892d 100644 --- a/nodel-jyhost/build.gradle +++ b/nodel-jyhost/build.gradle @@ -1,87 +1,82 @@ -plugins { - id 'java' - id 'application' - id 'maven-publish' - id 'eclipse' -} +apply plugin: 'java' +apply plugin: 'application' +apply plugin: 'maven' +apply plugin: 'eclipse' repositories { mavenCentral() } -application { - mainClass = 'org.nodel.jyhost.Launch' -} +def gitBranch = 'git rev-parse --abbrev-ref HEAD'.execute().text.trim() +def gitId = 'git rev-parse HEAD'.execute().text.trim() +def gitRev = 'git rev-list --count HEAD'.execute().text.trim() + +def branch = gitBranch +if (branch.equals("master")) + branch = "dev" + +def rev = gitRev +// strip out non-alphanumeric (e.g. the '+' in '1234+') +rev = rev.replaceAll(/[^a-zA-Z0-9]/, '') + +def buildSummary = gitId + +mainClassName = "org.nodel.jyhost.Launch" jar { from "$buildDir/output" - archiveBaseName = 'nodel-jyhost' + baseName = 'nodel-jyhost' manifest { - attributes 'Implementation-Title': 'Nodel JyHost', - 'Implementation-Version': archiveVersion - } + attributes 'Implementation-Title': 'Nodel JyHost', + 'Implementation-Version': version + } } -tasks.register('fatJar', Jar) { +task fatJar(type: Jar) { manifest { - attributes 'Implementation-Title': 'Nodel JyHost', - 'Implementation-Version': archiveVersion, - 'Main-Class': application.mainClassName + attributes 'Implementation-Title': 'Nodel JyHost', + 'Implementation-Version': version, + 'Main-Class': mainClassName } - archiveAppendix = rootProject.ext.branch - archiveBaseName = 'nodelhost' - archiveClassifier = 'rev' + rootProject.ext.rev - destinationDirectory = new File(buildDir, 'distributions/standalone') - from { configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) } } + appendix = branch + baseName = 'nodelhost' + classifier = 'rev' + rev + destinationDir new File(buildDir, 'distributions/standalone') + from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } } with jar exclude 'META-INF/*.RSA', 'META-INF/*.SF','META-INF/*.DSA' - duplicatesStrategy = DuplicatesStrategy.EXCLUDE } -tasks.register('unversioned', Copy) { - dependsOn 'fatJar' +task unversioned(dependsOn:'fatJar', type: Copy) { from(new File(buildDir, 'distributions/standalone')) { - rename '.*($archiveVersion)*', 'nodelhost.jar' + rename '.*($version)*', 'nodelhost.jar' } into new File(buildDir, 'distributions/standalone') } -tasks.build { - finalizedBy 'fatJar' -} - -tasks.named('distTar') { - duplicatesStrategy = DuplicatesStrategy.EXCLUDE -} - -tasks.named('distZip') { - duplicatesStrategy = DuplicatesStrategy.EXCLUDE -} +build.finalizedBy(fatJar) dependencies { - implementation project(':nodel-webui-js') - implementation project(':nodel-framework') - implementation 'commons-daemon:commons-daemon:1.0.15' - implementation 'org.slf4j:slf4j-api:1.7.10' - implementation 'org.python:jython-standalone:2.5.4-rc1' + compile project(':nodel-webui-js') + compile project(':nodel-framework') + compile 'commons-daemon:commons-daemon:1.0.15' + compile 'org.slf4j:slf4j-api:1.7.10' + compile 'org.python:jython-standalone:2.5.4-rc1' // for the Nodel HTTP client: - implementation group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.5' + compile group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.5' // convenience dependency: required *only* for 'recipe sync' node - implementation 'org.eclipse.jgit:org.eclipse.jgit:3.7.1.+' + compile 'org.eclipse.jgit:org.eclipse.jgit:3.7.1.+' - // convenience dependency: required for new SNMP-based nodes - implementation('org.snmp4j:snmp4j:2.5.8') { + // convenience dependency: required for new SNMP-based nodes + compile('org.snmp4j:snmp4j:2.5.8') { exclude group:'log4j', module:'log4j' // (brings one extra dependency: log4j; can explicity exclude it because it's optional at runtime) } // convenience dependency: JWTs (JSON Web Tokens), see https://github.com/museumsvictoria/nodel/discussions/297 implementation 'io.jsonwebtoken:jjwt-api:0.11.5' runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.11.5' - runtimeOnly 'io.jsonwebtoken:jjwt-orgjson:0.11.5' - - // Add joda-time dependency - implementation 'joda-time:joda-time:2.10.14' -} \ No newline at end of file + runtimeOnly 'io.jsonwebtoken:jjwt-orgjson:0.11.5' +} diff --git a/nodel-webui-js/build.gradle b/nodel-webui-js/build.gradle index 86b893b6..9f9ad0f1 100644 --- a/nodel-webui-js/build.gradle +++ b/nodel-webui-js/build.gradle @@ -1,153 +1,109 @@ import org.apache.tools.ant.filters.ReplaceTokens +import org.joda.time.DateTime; buildscript { repositories { mavenCentral() + jcenter() + gradlePluginPortal() } dependencies { - classpath 'joda-time:joda-time:2.10.10' + classpath 'joda-time:joda-time:2.6' } } plugins { id 'java' id 'eclipse' - id 'maven-publish' - id 'com.github.node-gradle.node' version '7.0.2' + id 'maven' + id 'com.github.node-gradle.node' version '3.0.1' } -repositories { - mavenCentral() -} - -dependencies { - implementation 'joda-time:joda-time:2.10.10' - implementation 'org.joda:joda-convert:2.2.1' -} - -node { - version = '12.19.0' - download = true - - workDir = file("${project.buildDir}/nodejs") - nodeProjectDir = file("${project.projectDir}") -} - -class FileChecker { - def nodeModulesDir - def srcDir - def packageJson - def packageLockJson - def gruntFile - - FileChecker(Project project) { - nodeModulesDir = project.file("${project.projectDir}/node_modules") - srcDir = project.file('src') - packageJson = project.file('package.json') - packageLockJson = project.file('package-lock.json') - gruntFile = project.file('Gruntfile.js') - } +def hostname = InetAddress.getLocalHost().getHostName().toUpperCase(); - def checkFilesChanged() { - if (!nodeModulesDir.exists()) { - return true - } else { - def srcDirModified = srcDir.exists() && srcDir.lastModified() > nodeModulesDir.lastModified() - def packageJsonModified = packageJson.exists() && packageJson.lastModified() > nodeModulesDir.lastModified() - def packageLockJsonModified = packageLockJson.exists() && packageLockJson.lastModified() > nodeModulesDir.lastModified() - def gruntFileModified = gruntFile.exists() && gruntFile.lastModified() > nodeModulesDir.lastModified() +def now = DateTime.now().toString(); - def filesChanged = srcDirModified || packageJsonModified || packageLockJsonModified || gruntFileModified +def gitBranch = 'git rev-parse --abbrev-ref HEAD'.execute().text.trim() +def gitId = 'git rev-parse HEAD'.execute().text.trim() +def gitRev = 'git rev-list --count HEAD'.execute().text.trim() +def gitOrigin = 'git config --get remote.origin.url'.execute().text.trim() - return filesChanged - } - } -} +def branch = gitBranch +if (branch.equals("master")) + branch = "dev" -def fileChecker = new FileChecker(project) +def rev = gitRev +// strip out non-alphanumeric (e.g. the '+' in '1234+') +rev = rev.replaceAll(/[^a-zA-Z0-9]/, '') -tasks.register('gruntRun', NpxTask) { - def shouldInstall = fileChecker.checkFilesChanged() +def buildSummary = gitId - if (shouldInstall) { - dependsOn clean, npmInstall - } +if (!branch.equals("stable")) + version project.version + "-" + branch + "_r" + rev - command = "grunt" - inputs.property('filesChanged', shouldInstall) - inputs.dir("node_modules") - outputs.dir("build/grunt") +node { + version = '12.19.0' + download = true - onlyIf { shouldInstall } + workDir = file("${project.buildDir}/nodejs") + nodeModulesDir = file("${project.projectDir}") +} - doLast { - if (shouldInstall) { - logger.info('Running Grunt build task as files have changed or node_modules is missing.') - } else { - logger.info('Skipping Grunt build task as no files have changed and node_modules is present.') - } - } +task gruntRun(type: NpmTask, dependsOn: [npmInstall]) { + args = ['run-script', 'run-grunt'] } -tasks.named('clean', Delete) { +clean.doFirst { delete "${projectDir}/node_modules/" - delete "${projectDir}/build/grunt/" + delete "${projectDir}/temp/" } -tasks.register('copyContent', Copy) { - dependsOn gruntRun - from file("${project.buildDir}/grunt") - into file("${project.buildDir}/www-content_stage") +task copyContent(type: Copy, dependsOn: [gruntRun]) { + from new File(project.buildDir, 'grunt') + into new File(project.buildDir, 'www-content_stage') exclude 'build.json' } -tasks.register('filterContentTemplates', Copy) { +task filterContentTemplates(type: Copy) { from 'src' - into file("${project.buildDir}/www-content_stage") + into new File(project.buildDir, 'www-content_stage') include 'build.json' filter(ReplaceTokens, tokens: [ - buildSummary: (project.name + "-" + project.version + " " + rootProject.ext.buildSummary + " (" + rootProject.ext.hostname + ") " + rootProject.ext.now).toString(), - buildOrigin : rootProject.ext.gitInfo.origin.toString(), - buildProject: project.name.toString(), - buildBranch : rootProject.ext.branch.toString(), - buildVersion: rootProject.ext.version.toString(), - buildId : rootProject.ext.buildSummary.toString(), - buildRev : rootProject.ext.rev.toString(), - buildHost : rootProject.ext.hostname.toString(), - buildDate : rootProject.ext.now.toString() + buildSummary: project.name + "-" + project.version + " " + buildSummary + " (" + hostname + ") " + now, + buildOrigin: gitOrigin, + buildProject: project.name, + buildBranch : branch, + buildVersion: project.version, + buildId : buildSummary, + buildRev : rev, + buildHost : hostname, + buildDate : now ]) } -tasks.register('zipContentInterface', Zip) { - dependsOn copyContent, filterContentTemplates - from file("${project.buildDir}/www-content_stage") +task zipContentInterface(type: Zip, dependsOn: [copyContent, filterContentTemplates]) { + from new File(project.buildDir, 'www-content_stage') archiveName 'content.zip' - destinationDirectory = file("${project.buildDir}/www-content/org/nodel/host") + destinationDir new File(project.buildDir, 'www-content/org/nodel/host') } -tasks.register('copyBuildInfo', Copy) { - dependsOn copyContent, filterContentTemplates - from file("${project.buildDir}/www-content_stage") +task copyBuildInfo(type: Copy, dependsOn: [copyContent, filterContentTemplates]) { + from new File(project.buildDir, 'www-content_stage') include 'build.json' - into file("${project.buildDir}/www-content/org/nodel") + destinationDir new File(project.buildDir, 'www-content/org/nodel') } sourceSets { main { - resources.srcDirs = [file("${project.buildDir}/www-content")] + resources.srcDir new File(project.buildDir, 'www-content') } } -tasks.named('compileJava') { - dependsOn zipContentInterface, copyBuildInfo -} - -tasks.named('processResources') { - dependsOn zipContentInterface, copyBuildInfo -} +compileJava.dependsOn(zipContentInterface) +compileJava.dependsOn(copyBuildInfo) dependencies { - implementation 'joda-time:joda-time:2.10.10' - implementation 'org.joda:joda-convert:2.2.1' -} \ No newline at end of file + compile 'joda-time:joda-time:2.6' + compile 'org.joda:joda-convert:1.7' +} diff --git a/nodel-webui-js/package.json b/nodel-webui-js/package.json index da475954..d1c755f0 100644 --- a/nodel-webui-js/package.json +++ b/nodel-webui-js/package.json @@ -40,6 +40,9 @@ "grunt-cli": "^1.4.3", "lodash": "^4.17.21" }, + "scripts": { + "run-grunt": "node_modules/.bin/grunt" + }, "license": "MPL-2.0", "repository": { "type": "git",