You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by rn...@apache.org on 2023/11/29 15:59:38 UTC
(couchdb) branch nouveau-dist created (now d2a956bd3)
This is an automated email from the ASF dual-hosted git repository.
rnewson pushed a change to branch nouveau-dist
in repository https://gitbox.apache.org/repos/asf/couchdb.git
at d2a956bd3 build dist zip
This branch includes the following new commits:
new d2a956bd3 build dist zip
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
(couchdb) 01/01: build dist zip
Posted by rn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rnewson pushed a commit to branch nouveau-dist
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit d2a956bd30ee00edf61029c1cc3b12aae851be31
Author: Robert Newson <rn...@apache.org>
AuthorDate: Wed Nov 29 15:40:48 2023 +0000
build dist zip
also ditch the uberjar/shadow thing, it isn't helpful.
---
Makefile | 5 ++---
Makefile.win | 5 ++---
dev/run | 12 ++++--------
nouveau/build.gradle | 6 ------
4 files changed, 8 insertions(+), 20 deletions(-)
diff --git a/Makefile b/Makefile
index 359cd19d6..a8a04f826 100644
--- a/Makefile
+++ b/Makefile
@@ -429,9 +429,8 @@ endif
endif
ifeq ($(with_nouveau), 1)
- @mkdir -p rel/couchdb/nouveau/
- @cp nouveau/build/libs/server-*-dist.jar rel/couchdb/nouveau/
- @cp nouveau/nouveau.yaml rel/couchdb/nouveau/
+ @cd nouveau && ./gradlew distZip
+ @cp nouveau/build/distributions/server-*.zip rel/couchdb/nouveau.zip
endif
@echo "... done"
diff --git a/Makefile.win b/Makefile.win
index 8f214e325..b21f72b1c 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -387,9 +387,8 @@ endif
endif
ifeq ($(with_nouveau), 1)
- -@mkdir -p rel\couchdb\nouveau
- @cp nouveau\build\libs\server-*-dist.jar rel\couchdb\nouveau
- @cp nouveau\nouveau.yaml rel\couchdb\nouveau
+ @cd nouveau && .\gradlew distZip
+ @copy nouveau\build\distributions\server-*.zip rel\couchdb\nouveau.zip
endif
@echo ... done
diff --git a/dev/run b/dev/run
index fcafcf572..c5e0a6ad8 100755
--- a/dev/run
+++ b/dev/run
@@ -509,15 +509,11 @@ def boot_haproxy(ctx):
def boot_nouveau(ctx):
if not ctx["with_nouveau"]:
return
-
- version = "1.0-SNAPSHOT"
cmd = [
- "java",
- "-server",
- "-jar",
- "build/libs/server-%s-dist.jar" % version,
- "server",
- "nouveau.yaml",
+ "./gradlew",
+ "run",
+ "--args",
+ "server nouveau.yaml",
]
logfname = os.path.join(ctx["devdir"], "logs", "nouveau.log")
log = open(logfname, "w")
diff --git a/nouveau/build.gradle b/nouveau/build.gradle
index 119e8687d..eb76d04d9 100644
--- a/nouveau/build.gradle
+++ b/nouveau/build.gradle
@@ -1,7 +1,6 @@
plugins {
id 'application'
id 'com.diffplug.spotless' version '6.18.0'
- id 'com.github.johnrengelman.shadow' version '8.1.1'
id 'jacoco'
}
@@ -72,11 +71,6 @@ testing {
}
}
-shadowJar {
- archiveClassifier.set('dist')
- mergeServiceFiles()
-}
-
tasks.withType(JavaCompile) {
options.encoding = 'UTF-8'
options.deprecation = true