Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/java-ebuilder:master commit in: src/main/resources/, src/main/java/org/gentoo/java/ebuilder/
Date: Wed, 30 Oct 2019 17:35:24
Message-Id: 1475723034.b4b960aa7c929ff7884195dd077698b965605e99.mgorny@gentoo
1 commit: b4b960aa7c929ff7884195dd077698b965605e99
2 Author: Benda Xu <heroxbd <AT> gentoo <DOT> org>
3 AuthorDate: Thu Oct 6 03:01:27 2016 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Thu Oct 6 03:03:54 2016 +0000
6 URL: https://gitweb.gentoo.org/proj/java-ebuilder.git/commit/?id=b4b960aa
7
8 add an option --cache-file to specify cache file.
9
10 src/main/java/org/gentoo/java/ebuilder/Config.java | 11 ++++++++++-
11 src/main/java/org/gentoo/java/ebuilder/Main.java | 7 ++++++-
12 src/main/resources/usage.txt | 3 ++-
13 3 files changed, 18 insertions(+), 3 deletions(-)
14
15 diff --git a/src/main/java/org/gentoo/java/ebuilder/Config.java b/src/main/java/org/gentoo/java/ebuilder/Config.java
16 index 557117a..4127266 100644
17 --- a/src/main/java/org/gentoo/java/ebuilder/Config.java
18 +++ b/src/main/java/org/gentoo/java/ebuilder/Config.java
19 @@ -18,7 +18,7 @@ public class Config {
20 /**
21 * Path to portage ebuild cache.
22 */
23 - private final Path cacheFile = Paths.get(System.getProperty("user.home"),
24 + private Path cacheFile = Paths.get(System.getProperty("user.home"),
25 ".java-ebuilder/cache");
26 /**
27 * URI that goes to SRC_URI.
28 @@ -99,6 +99,15 @@ public class Config {
29 return cacheFile;
30 }
31
32 + /**
33 + * Setter for {@link #cacheFile}.
34 + *
35 + * @param cacheFile {@link #cacheFile}
36 + */
37 + public void setCacheFile(final Path cacheFile) {
38 + this.cacheFile = cacheFile;
39 + }
40 +
41 /**
42 * Getter for {@link #downloadUri}.
43 *
44
45 diff --git a/src/main/java/org/gentoo/java/ebuilder/Main.java b/src/main/java/org/gentoo/java/ebuilder/Main.java
46 index 5bf1490..0a69442 100644
47 --- a/src/main/java/org/gentoo/java/ebuilder/Main.java
48 +++ b/src/main/java/org/gentoo/java/ebuilder/Main.java
49 @@ -220,12 +220,17 @@ public class Main {
50 i++;
51 config.addPomFile(Paths.get(args[i]));
52 break;
53 - case "-portage-tree":
54 + case "--portage-tree":
55 case "-t":
56 i++;
57 config.setPortageTree(Paths.get(args[i]).toAbsolutePath().
58 normalize());
59 break;
60 + case "--cache-file":
61 + i++;
62 + config.setCacheFile(Paths.get(args[i]).toAbsolutePath().
63 + normalize());
64 + break;
65 case "--refresh-cache":
66 case "-c":
67 config.setRefreshCache(true);
68
69 diff --git a/src/main/resources/usage.txt b/src/main/resources/usage.txt
70 index a728607..40e1914 100644
71 --- a/src/main/resources/usage.txt
72 +++ b/src/main/resources/usage.txt
73 @@ -9,6 +9,7 @@ Usage: jar <args>
74 times)
75 --portage-tree|-t path to portage tree that should be parsed when
76 refreshing cache (default is /usr/portage)
77 +--cache-file location of output cache file (default is ~/.java-ebuilder/cache)
78 --refresh-cache|-c refreshes java ebuild cache
79 --slot|-s <slot> SLOT number
80 ---workdir|-w <dir> path to workdir (default is current directory)
81 \ No newline at end of file
82 +--workdir|-w <dir> path to workdir (default is current directory)