From: Mathieu <mbaudier@argeo.org>
Date: Fri, 10 Mar 2023 13:08:03 +0000 (+0100)
Subject: Do not package sources separately by default
X-Git-Tag: v2.3.5~115
X-Git-Url: https://git.argeo.org/?a=commitdiff_plain;h=3714839e09d67535491b15ef560b2cb3fdf482db;p=cc0%2Fargeo-build.git

Do not package sources separately by default
---

diff --git a/src/org/argeo/build/Make.java b/src/org/argeo/build/Make.java
index 4d9caf9..56230ea 100644
--- a/src/org/argeo/build/Make.java
+++ b/src/org/argeo/build/Make.java
@@ -83,13 +83,9 @@ public class Make {
 
 	/** Constructor initialises the base directories. */
 	public Make() throws IOException {
-		if (System.getenv(ENV_BUILD_SOURCE_BUNDLES) != null) {
-			sourceBundles = Boolean.parseBoolean(System.getenv(ENV_BUILD_SOURCE_BUNDLES));
-			if (sourceBundles)
-				logger.log(Level.INFO, "Sources will be packaged separately");
-		} else {
-			sourceBundles = true;
-		}
+		sourceBundles = Boolean.parseBoolean(System.getenv(ENV_BUILD_SOURCE_BUNDLES));
+		if (sourceBundles)
+			logger.log(Level.INFO, "Sources will be packaged separately");
 
 		execDirectory = Paths.get(System.getProperty("user.dir"));
 		Path sdkMkP = findSdkMk(execDirectory);
diff --git a/src/org/argeo/build/Repackage.java b/src/org/argeo/build/Repackage.java
index 4f0089a..35413fe 100644
--- a/src/org/argeo/build/Repackage.java
+++ b/src/org/argeo/build/Repackage.java
@@ -93,13 +93,9 @@ public class Repackage {
 	private final boolean sourceBundles;
 
 	public Repackage(Path a2Base, Path descriptorsBase) {
-		if (System.getenv(ENV_BUILD_SOURCE_BUNDLES) != null) {
-			sourceBundles = Boolean.parseBoolean(System.getenv(ENV_BUILD_SOURCE_BUNDLES));
-			if (sourceBundles)
-				logger.log(Level.INFO, "Sources will be packaged separately");
-		} else {
-			sourceBundles = true;
-		}
+		sourceBundles = Boolean.parseBoolean(System.getenv(ENV_BUILD_SOURCE_BUNDLES));
+		if (sourceBundles)
+			logger.log(Level.INFO, "Sources will be packaged separately");
 
 		Objects.requireNonNull(a2Base);
 		Objects.requireNonNull(descriptorsBase);