projects
/
cc0
/
argeo-build.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6cdb72c
)
Subdirectory makefile working
author
Mathieu Baudier <mbaudier@argeo.org>
Sun, 9 Oct 2022 12:24:50 +0000
(14:24 +0200)
committer
Mathieu Baudier <mbaudier@argeo.org>
Sun, 9 Oct 2022 12:24:50 +0000
(14:24 +0200)
src/org/argeo/build/Make.java
patch
|
blob
|
history
diff --git
a/src/org/argeo/build/Make.java
b/src/org/argeo/build/Make.java
index 7e29e14544febeaef93905a89f267dcf043b1ca6..9200a42a6c1b388c754076f42d4025ca546a80ea 100644
(file)
--- a/
src/org/argeo/build/Make.java
+++ b/
src/org/argeo/build/Make.java
@@
-127,7
+127,7
@@
public class Make {
// sources
for (String bundle : bundles) {
StringBuilder sb = new StringBuilder();
// sources
for (String bundle : bundles) {
StringBuilder sb = new StringBuilder();
- sb.append(
sdkSrcBase
.resolve(bundle).resolve("src"));
+ sb.append(
execDirectory
.resolve(bundle).resolve("src"));
sb.append("[-d");
compilerArgs.add(sb.toString());
sb = new StringBuilder();
sb.append("[-d");
compilerArgs.add(sb.toString());
sb = new StringBuilder();
@@
-211,7
+211,7
@@
public class Make {
* JAR PACKAGING
*/
void createBundle(String bundle, String category) throws IOException {
* JAR PACKAGING
*/
void createBundle(String bundle, String category) throws IOException {
- Path source =
sdkSrcBase
.resolve(bundle);
+ Path source =
execDirectory
.resolve(bundle);
Path compiled = buildBase.resolve(bundle);
String bundleSymbolicName = source.getFileName().toString();
Path compiled = buildBase.resolve(bundle);
String bundleSymbolicName = source.getFileName().toString();