From 84fa50b5c2556c2ed49e2b5c4a13fa81875accd8 Mon Sep 17 00:00:00 2001 From: Norbert Renner Date: Fri, 20 May 2022 17:36:35 +0200 Subject: [PATCH] Adopt standalone task to brouter gradle build --- gulpfile.js | 14 ++++---------- package.json | 2 +- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index 0c7d042..924dbbf 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -421,18 +421,12 @@ gulp.task('release:zip_standalone', function () { var root = gulp.src(['resources/standalone/run.sh', 'resources/standalone/segments4']); var serverRoot = gulp - .src( - [ - 'misc/readmes/profile_developers_guide.txt', - 'brouter-server/target/brouter-server-*-jar-with-dependencies.jar', - ], - { - cwd: path.join(process.cwd(), '../brouter'), - } - ) + .src(['misc/readmes/profile_developers_guide.txt', 'brouter-server/build/libs/brouter-*-all.jar'], { + cwd: path.join(process.cwd(), '../brouter'), + }) .pipe( rename(function (path) { - if (path.basename.startsWith('brouter-server-')) { + if (path.basename.startsWith('brouter-') && path.basename.endsWith('-all')) { path.basename = 'brouter'; } }) diff --git a/package.json b/package.json index 24b0be1..527b2ce 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "lint": "eslint .", "prettier": "prettier --write '**/*'", "serve": "gulp serve watch", - "standalone": "mvn clean install -f ../brouter -pl '!brouter-routing-app' -Dmaven.javadoc.skip=true && ../brouter/misc/scripts/generate_profile_variants.sh && gulp release:zip_standalone" + "standalone": "../brouter/gradlew -p ../brouter clean build && ../brouter/misc/scripts/generate_profile_variants.sh && gulp release:zip_standalone" }, "husky": { "hooks": {