Do not package sources separately by default

diff --git a/src/org/argeo/build/Make.java b/src/org/argeo/build/Make.java
index 4d9caf93145e8bc717bf90c415519896a9cf174b..56230ea5fb9444634b5b0c9ab843b002b65983c4 100644 (file)
--- 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 4f0089a3204fb8e1803b155f99e33efa4117303d..35413fe336df06dee5008f9fba2b827eba98e8a0 100644 (file)
--- 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);