From 3714839e09d67535491b15ef560b2cb3fdf482db Mon Sep 17 00:00:00 2001 From: Mathieu Date: Fri, 10 Mar 2023 14:08:03 +0100 Subject: [PATCH] Do not package sources separately by default --- src/org/argeo/build/Make.java | 10 +++------- src/org/argeo/build/Repackage.java | 10 +++------- 2 files changed, 6 insertions(+), 14 deletions(-) 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); -- 2.39.2