gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[libeufin] branch master updated (a0c46719 -> 7d925f01)


From: gnunet
Subject: [libeufin] branch master updated (a0c46719 -> 7d925f01)
Date: Thu, 19 Jan 2023 14:20:25 +0100

This is an automated email from the git hooks/post-receive script.

ms pushed a change to branch master
in repository libeufin.

    from a0c46719 Ignoring test without assert.
     new 008979f7 Build system.
     new 7d925f01 Providing "make dist" based on Git.

The 2 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.


Summary of changes:
 Makefile     |  8 +++++-
 README       | 21 ++++++++++++++--
 build.gradle | 80 +++++++-----------------------------------------------------
 3 files changed, 35 insertions(+), 74 deletions(-)

diff --git a/Makefile b/Makefile
index 91576dbf..51ec2ca6 100644
--- a/Makefile
+++ b/Makefile
@@ -4,11 +4,17 @@ escaped_pwd = $(shell pwd | sed 's/\//\\\//g')
 
 all: assemble
 install: install-nexus install-sandbox install-cli
+git-archive-all = 
./build-system/taler-build-scripts/archive-with-submodules/git_archive_all.py
 
 
 .PHONY: dist
 dist:
-       @./gradlew -q dist
+       @mkdir -p build/distributions
+       @$(git-archive-all) --include ./configure 
build/distributions/libeufin-$(shell ./gradlew -q 
libeufinVersion)-sources.tar.gz
+
+.PHONY: exec-arch
+exec-arch:
+       @./gradlew -q execArch
 
 .PHONY: deb
 deb: dist
diff --git a/README b/README
index 0ea44866..6cf9dc97 100644
--- a/README
+++ b/README
@@ -26,7 +26,24 @@ Exporting a dist-file
 =====================
 
 $ ./bootstrap
-$ ./configure # prefix not relevant for dist.
 $ make dist
 
-The Zip file should be contained into the build/distributions/ folder.
+The TGZ file should be found at: 
build/distributions/libeufin-$VERSION-sources.tar.gz
+
+Exporting an archive with the three executables
+===============================================
+
+Such archive contains the compiled Sandbox and Nexus,
+and the CLI script.
+
+$ ./bootstrap # Needed to silence 'GNU make'
+$ make exec-arch
+
+Alternatively, the same archive is produced by:
+
+$ ./gradlew execArch
+
+The archive should be found at: build/distributions/libeufin-$VERSION.zip
+
+After extracting the compressed files, run the three
+executable found under the "bin/" folder.
diff --git a/build.gradle b/build.gradle
index d5628e23..424de014 100644
--- a/build.gradle
+++ b/build.gradle
@@ -41,6 +41,13 @@ task versionFile() {
     new File("${projectDir}/util/src/main/resources", "version.txt").text = 
getRootProject().version
 }
 
+// See: 
https://stackoverflow.com/questions/24936781/gradle-plugin-project-version-number
+task libeufinVersion {
+    doLast {
+        println project.version
+    }
+}
+
 task replaceVersionCli(type: Copy) {
     from file("cli/bin/libeufin-cli")
     into file("${project.buildDir}/generated/python")
@@ -52,7 +59,7 @@ classes {
     dependsOn replaceVersionCli
 }
 
-task dist(type: Zip) {
+task execArch(type: Zip) {
     dependsOn versionFile
     dependsOn replaceVersionCli
     evaluationDependsOn("nexus")
@@ -78,73 +85,4 @@ task dist(type: Zip) {
       rename { "bin/libeufin-cli" }
     }
     into(topDir)
-}
-
-task libeufinSrcJar(type: Jar) {
-    archiveClassifier = "sources"
-    from project("sandbox").sourceSets.main.java.srcDirs
-    from project("nexus").sourceSets.main.java.srcDirs
-    from("sandbox") {
-        include("build.gradle")
-        into("sandbox")
-    }
-    from("nexus") {
-        include("build.gradle")
-        into("nexus")
-    }
-    from "build.gradle"
-    from "settings.gradle"
-}
-
-publishing {
-    publications {
-        mavenJava(MavenPublication) {
-            artifactId = 'libeufin'
-            // from components.java
-            artifact libeufinSrcJar
-            versionMapping {
-                usage('java-api') {
-                    fromResolutionOf('runtimeClasspath')
-                }
-                usage('java-runtime') {
-                    fromResolutionResult()
-                }
-            }
-            pom {
-                name = 'libeufin'
-                description = 'Implementation of EBICS'
-                url = 'https://libeufin.tech/'
-                licenses {
-                    license {
-                        name = 'GNU Affero General Public License, Version 
3.0+'
-                        url = 'https://www.gnu.org/licenses/agpl-3.0.txt'
-                    }
-                }
-                scm {
-                    connection = 'scm:git:git://git.taler.net/libeufin.git'
-                    developerConnection = 
'scm:git:ssh://git.taler.net/libeufin.git'
-                    url = 'https://git.taler.net/libeufin.git/'
-                }
-            }
-        }
-    }
-    repositories {
-        maven {
-            // change URLs to point to your repos, e.g. http://my.org/repo
-            def releasesRepoUrl = layout.buildDirectory.dir('repos/releases')
-            def snapshotsRepoUrl = layout.buildDirectory.dir('repos/snapshots')
-            url = version.endsWith('SNAPSHOT') ? snapshotsRepoUrl : 
releasesRepoUrl
-        }
-    }
-}
-
-//signing {
-//    sign publishing.publications.mavenJava
-//}
-
-
-javadoc {
-    if(JavaVersion.current().isJava9Compatible()) {
-        options.addBooleanOption('html5', true)
-    }
-}
+}
\ No newline at end of file

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]