From 4fe40dadd75c0dc701126bd075626d8fc4d35208 Mon Sep 17 00:00:00 2001
From: Geert Bevin <gbevin@uwyn.com>
Date: Tue, 27 Aug 2024 21:45:28 -0400
Subject: [PATCH] Use recursive jar directory in IDEA project libraries so that
 modules can be picked up. Updated wrapper so that old IDEA projects get
 updated for recursive scanning.

---
 src/main/java/rife/bld/wrapper/Wrapper.java   | 46 +++++++++++++++++--
 .../bld/app/idea/libraries/compile.xml        |  8 ++--
 .../bld/app/idea/libraries/runtime.xml        |  4 +-
 .../templates/bld/app/idea/libraries/test.xml |  8 ++--
 .../bld/base/idea/libraries/compile.xml       |  8 ++--
 .../bld/base/idea/libraries/runtime.xml       |  4 +-
 .../bld/base/idea/libraries/test.xml          |  8 ++--
 .../bld/lib/idea/libraries/compile.xml        |  8 ++--
 .../bld/lib/idea/libraries/runtime.xml        |  4 +-
 .../templates/bld/lib/idea/libraries/test.xml |  8 ++--
 .../rife2_hello/idea/libraries/compile.xml    |  8 ++--
 .../rife2_hello/idea/libraries/runtime.xml    |  4 +-
 .../rife2_hello/idea/libraries/standalone.xml |  4 +-
 .../bld/rife2_hello/idea/libraries/test.xml   |  8 ++--
 14 files changed, 84 insertions(+), 46 deletions(-)

diff --git a/src/main/java/rife/bld/wrapper/Wrapper.java b/src/main/java/rife/bld/wrapper/Wrapper.java
index 74d20a2..c677fde 100644
--- a/src/main/java/rife/bld/wrapper/Wrapper.java
+++ b/src/main/java/rife/bld/wrapper/Wrapper.java
@@ -120,6 +120,10 @@ public void createWrapperFiles(File destinationDirectory, String version)
     private static final Pattern BLD_JAR_PATTERN = Pattern.compile("/\\.bld/dist/bld-[^\"/!]+(?<!sources)\\.jar");
     private static final Pattern BLD_SOURCES_JAR_PATTERN = Pattern.compile("/\\.bld/dist/bld-[^\"/!]+-sources\\.jar");
     private static final Pattern BLD_PROPERTY_VERSION_PATTERN = Pattern.compile(".*bld\\.version.*");
+    private static final Pattern JAR_DIRECTORY_LIB_COMPILE_RECURSIVE_PATTERN = Pattern.compile("<jarDirectory\\s+url=\"file://\\$PROJECT_DIR\\$/lib/compile\"\\s+recursive=\"false\"");
+    private static final Pattern JAR_DIRECTORY_LIB_PROVIDED_RECURSIVE_PATTERN = Pattern.compile("<jarDirectory\\s+url=\"file://\\$PROJECT_DIR\\$/lib/provided\"\\s+recursive=\"false\"");
+    private static final Pattern JAR_DIRECTORY_LIB_RUNTIME_RECURSIVE_PATTERN = Pattern.compile("<jarDirectory\\s+url=\"file://\\$PROJECT_DIR\\$/lib/runtime\"\\s+recursive=\"false\"");
+    private static final Pattern JAR_DIRECTORY_LIB_TEST_RECURSIVE_PATTERN = Pattern.compile("<jarDirectory\\s+url=\"file://\\$PROJECT_DIR\\$/lib/test\"\\s+recursive=\"false\"");
 
     /**
      * Upgraded the IDEA bld files that were generated with a previous version.
@@ -131,15 +135,49 @@ public void createWrapperFiles(File destinationDirectory, String version)
      */
     public void upgradeIdeaBldLibrary(File destinationDirectory, String version)
     throws IOException {
-        var file = new File(destinationDirectory, Path.of("libraries", "bld.xml").toString());
-        if (file.exists()) {
+        var libraries_bld = new File(destinationDirectory, Path.of("libraries", "bld.xml").toString());
+        if (libraries_bld.exists()) {
             try {
-                var content = FileUtils.readString(file);
+                var content = FileUtils.readString(libraries_bld);
                 content = BLD_JAR_PATTERN.matcher(content).replaceAll("/.bld/dist/bld-" + version + ".jar");
                 content = BLD_SOURCES_JAR_PATTERN.matcher(content).replaceAll("/.bld/dist/bld-" + version + "-sources.jar");
                 content = RIFE2_JAR_PATTERN.matcher(content).replaceAll("/.bld/dist/bld-" + version + ".jar");
                 content = RIFE2_SOURCES_JAR_PATTERN.matcher(content).replaceAll("/.bld/dist/bld-" + version + "-sources.jar");
-                FileUtils.writeString(content, file);
+                FileUtils.writeString(content, libraries_bld);
+            } catch (FileUtilsErrorException e) {
+                throw new IOException(e);
+            }
+        }
+
+        var libraries_compile = new File(destinationDirectory, Path.of("libraries", "compile.xml").toString());
+        if (libraries_compile.exists()) {
+            try {
+                var content = FileUtils.readString(libraries_compile);
+                content = JAR_DIRECTORY_LIB_COMPILE_RECURSIVE_PATTERN.matcher(content).replaceAll("<jarDirectory url=\"file://\\$PROJECT_DIR\\$/lib/compile\" recursive=\"true\"");
+                content = JAR_DIRECTORY_LIB_PROVIDED_RECURSIVE_PATTERN.matcher(content).replaceAll("<jarDirectory url=\"file://\\$PROJECT_DIR\\$/lib/provided\" recursive=\"true\"");
+                FileUtils.writeString(content, libraries_compile);
+            } catch (FileUtilsErrorException e) {
+                throw new IOException(e);
+            }
+        }
+
+        var libraries_runtime = new File(destinationDirectory, Path.of("libraries", "runtime.xml").toString());
+        if (libraries_runtime.exists()) {
+            try {
+                var content = FileUtils.readString(libraries_runtime);
+                content = JAR_DIRECTORY_LIB_RUNTIME_RECURSIVE_PATTERN.matcher(content).replaceAll("<jarDirectory url=\"file://\\$PROJECT_DIR\\$/lib/runtime\" recursive=\"true\"");
+                FileUtils.writeString(content, libraries_runtime);
+            } catch (FileUtilsErrorException e) {
+                throw new IOException(e);
+            }
+        }
+
+        var libraries_test = new File(destinationDirectory, Path.of("libraries", "test.xml").toString());
+        if (libraries_test.exists()) {
+            try {
+                var content = FileUtils.readString(libraries_test);
+                content = JAR_DIRECTORY_LIB_TEST_RECURSIVE_PATTERN.matcher(content).replaceAll("<jarDirectory url=\"file://\\$PROJECT_DIR\\$/lib/test\" recursive=\"true\"");
+                FileUtils.writeString(content, libraries_test);
             } catch (FileUtilsErrorException e) {
                 throw new IOException(e);
             }
diff --git a/src/main/resources/templates/bld/app/idea/libraries/compile.xml b/src/main/resources/templates/bld/app/idea/libraries/compile.xml
index 143dc93..5316b95 100644
--- a/src/main/resources/templates/bld/app/idea/libraries/compile.xml
+++ b/src/main/resources/templates/bld/app/idea/libraries/compile.xml
@@ -9,9 +9,9 @@
       <root url="file://$PROJECT_DIR$/lib/compile" />
       <root url="file://$PROJECT_DIR$/lib/provided" />
     </SOURCES>
-    <jarDirectory url="file://$PROJECT_DIR$/lib/compile" recursive="false" />
-    <jarDirectory url="file://$PROJECT_DIR$/lib/compile" recursive="false" type="SOURCES" />
-    <jarDirectory url="file://$PROJECT_DIR$/lib/provided" recursive="false" />
-    <jarDirectory url="file://$PROJECT_DIR$/lib/provided" recursive="false" type="SOURCES" />
+    <jarDirectory url="file://$PROJECT_DIR$/lib/compile" recursive="true" />
+    <jarDirectory url="file://$PROJECT_DIR$/lib/compile" recursive="true" type="SOURCES" />
+    <jarDirectory url="file://$PROJECT_DIR$/lib/provided" recursive="true" />
+    <jarDirectory url="file://$PROJECT_DIR$/lib/provided" recursive="true" type="SOURCES" />
   </library>
 </component>
\ No newline at end of file
diff --git a/src/main/resources/templates/bld/app/idea/libraries/runtime.xml b/src/main/resources/templates/bld/app/idea/libraries/runtime.xml
index 2ae5c4b..d4069f2 100644
--- a/src/main/resources/templates/bld/app/idea/libraries/runtime.xml
+++ b/src/main/resources/templates/bld/app/idea/libraries/runtime.xml
@@ -8,7 +8,7 @@
     <SOURCES>
       <root url="file://$PROJECT_DIR$/lib/runtime" />
     </SOURCES>
-    <jarDirectory url="file://$PROJECT_DIR$/lib/runtime" recursive="false" />
-    <jarDirectory url="file://$PROJECT_DIR$/lib/runtime" recursive="false" type="SOURCES" />
+    <jarDirectory url="file://$PROJECT_DIR$/lib/runtime" recursive="true" />
+    <jarDirectory url="file://$PROJECT_DIR$/lib/runtime" recursive="true" type="SOURCES" />
   </library>
 </component>
\ No newline at end of file
diff --git a/src/main/resources/templates/bld/app/idea/libraries/test.xml b/src/main/resources/templates/bld/app/idea/libraries/test.xml
index c16475a..05f52ce 100644
--- a/src/main/resources/templates/bld/app/idea/libraries/test.xml
+++ b/src/main/resources/templates/bld/app/idea/libraries/test.xml
@@ -10,9 +10,9 @@
       <root url="file://$PROJECT_DIR$/lib/test" />
       <root url="file://$PROJECT_DIR$/lib/provided" />
     </SOURCES>
-    <jarDirectory url="file://$PROJECT_DIR$/lib/test" recursive="false" />
-    <jarDirectory url="file://$PROJECT_DIR$/lib/test" recursive="false" type="SOURCES" />
-    <jarDirectory url="file://$PROJECT_DIR$/lib/provided" recursive="false" />
-    <jarDirectory url="file://$PROJECT_DIR$/lib/provided" recursive="false" type="SOURCES" />
+    <jarDirectory url="file://$PROJECT_DIR$/lib/test" recursive="true" />
+    <jarDirectory url="file://$PROJECT_DIR$/lib/test" recursive="true" type="SOURCES" />
+    <jarDirectory url="file://$PROJECT_DIR$/lib/provided" recursive="true" />
+    <jarDirectory url="file://$PROJECT_DIR$/lib/provided" recursive="true" type="SOURCES" />
   </library>
 </component>
\ No newline at end of file
diff --git a/src/main/resources/templates/bld/base/idea/libraries/compile.xml b/src/main/resources/templates/bld/base/idea/libraries/compile.xml
index 143dc93..5316b95 100644
--- a/src/main/resources/templates/bld/base/idea/libraries/compile.xml
+++ b/src/main/resources/templates/bld/base/idea/libraries/compile.xml
@@ -9,9 +9,9 @@
       <root url="file://$PROJECT_DIR$/lib/compile" />
       <root url="file://$PROJECT_DIR$/lib/provided" />
     </SOURCES>
-    <jarDirectory url="file://$PROJECT_DIR$/lib/compile" recursive="false" />
-    <jarDirectory url="file://$PROJECT_DIR$/lib/compile" recursive="false" type="SOURCES" />
-    <jarDirectory url="file://$PROJECT_DIR$/lib/provided" recursive="false" />
-    <jarDirectory url="file://$PROJECT_DIR$/lib/provided" recursive="false" type="SOURCES" />
+    <jarDirectory url="file://$PROJECT_DIR$/lib/compile" recursive="true" />
+    <jarDirectory url="file://$PROJECT_DIR$/lib/compile" recursive="true" type="SOURCES" />
+    <jarDirectory url="file://$PROJECT_DIR$/lib/provided" recursive="true" />
+    <jarDirectory url="file://$PROJECT_DIR$/lib/provided" recursive="true" type="SOURCES" />
   </library>
 </component>
\ No newline at end of file
diff --git a/src/main/resources/templates/bld/base/idea/libraries/runtime.xml b/src/main/resources/templates/bld/base/idea/libraries/runtime.xml
index 2ae5c4b..d4069f2 100644
--- a/src/main/resources/templates/bld/base/idea/libraries/runtime.xml
+++ b/src/main/resources/templates/bld/base/idea/libraries/runtime.xml
@@ -8,7 +8,7 @@
     <SOURCES>
       <root url="file://$PROJECT_DIR$/lib/runtime" />
     </SOURCES>
-    <jarDirectory url="file://$PROJECT_DIR$/lib/runtime" recursive="false" />
-    <jarDirectory url="file://$PROJECT_DIR$/lib/runtime" recursive="false" type="SOURCES" />
+    <jarDirectory url="file://$PROJECT_DIR$/lib/runtime" recursive="true" />
+    <jarDirectory url="file://$PROJECT_DIR$/lib/runtime" recursive="true" type="SOURCES" />
   </library>
 </component>
\ No newline at end of file
diff --git a/src/main/resources/templates/bld/base/idea/libraries/test.xml b/src/main/resources/templates/bld/base/idea/libraries/test.xml
index c16475a..05f52ce 100644
--- a/src/main/resources/templates/bld/base/idea/libraries/test.xml
+++ b/src/main/resources/templates/bld/base/idea/libraries/test.xml
@@ -10,9 +10,9 @@
       <root url="file://$PROJECT_DIR$/lib/test" />
       <root url="file://$PROJECT_DIR$/lib/provided" />
     </SOURCES>
-    <jarDirectory url="file://$PROJECT_DIR$/lib/test" recursive="false" />
-    <jarDirectory url="file://$PROJECT_DIR$/lib/test" recursive="false" type="SOURCES" />
-    <jarDirectory url="file://$PROJECT_DIR$/lib/provided" recursive="false" />
-    <jarDirectory url="file://$PROJECT_DIR$/lib/provided" recursive="false" type="SOURCES" />
+    <jarDirectory url="file://$PROJECT_DIR$/lib/test" recursive="true" />
+    <jarDirectory url="file://$PROJECT_DIR$/lib/test" recursive="true" type="SOURCES" />
+    <jarDirectory url="file://$PROJECT_DIR$/lib/provided" recursive="true" />
+    <jarDirectory url="file://$PROJECT_DIR$/lib/provided" recursive="true" type="SOURCES" />
   </library>
 </component>
\ No newline at end of file
diff --git a/src/main/resources/templates/bld/lib/idea/libraries/compile.xml b/src/main/resources/templates/bld/lib/idea/libraries/compile.xml
index 143dc93..5316b95 100644
--- a/src/main/resources/templates/bld/lib/idea/libraries/compile.xml
+++ b/src/main/resources/templates/bld/lib/idea/libraries/compile.xml
@@ -9,9 +9,9 @@
       <root url="file://$PROJECT_DIR$/lib/compile" />
       <root url="file://$PROJECT_DIR$/lib/provided" />
     </SOURCES>
-    <jarDirectory url="file://$PROJECT_DIR$/lib/compile" recursive="false" />
-    <jarDirectory url="file://$PROJECT_DIR$/lib/compile" recursive="false" type="SOURCES" />
-    <jarDirectory url="file://$PROJECT_DIR$/lib/provided" recursive="false" />
-    <jarDirectory url="file://$PROJECT_DIR$/lib/provided" recursive="false" type="SOURCES" />
+    <jarDirectory url="file://$PROJECT_DIR$/lib/compile" recursive="true" />
+    <jarDirectory url="file://$PROJECT_DIR$/lib/compile" recursive="true" type="SOURCES" />
+    <jarDirectory url="file://$PROJECT_DIR$/lib/provided" recursive="true" />
+    <jarDirectory url="file://$PROJECT_DIR$/lib/provided" recursive="true" type="SOURCES" />
   </library>
 </component>
\ No newline at end of file
diff --git a/src/main/resources/templates/bld/lib/idea/libraries/runtime.xml b/src/main/resources/templates/bld/lib/idea/libraries/runtime.xml
index 2ae5c4b..d4069f2 100644
--- a/src/main/resources/templates/bld/lib/idea/libraries/runtime.xml
+++ b/src/main/resources/templates/bld/lib/idea/libraries/runtime.xml
@@ -8,7 +8,7 @@
     <SOURCES>
       <root url="file://$PROJECT_DIR$/lib/runtime" />
     </SOURCES>
-    <jarDirectory url="file://$PROJECT_DIR$/lib/runtime" recursive="false" />
-    <jarDirectory url="file://$PROJECT_DIR$/lib/runtime" recursive="false" type="SOURCES" />
+    <jarDirectory url="file://$PROJECT_DIR$/lib/runtime" recursive="true" />
+    <jarDirectory url="file://$PROJECT_DIR$/lib/runtime" recursive="true" type="SOURCES" />
   </library>
 </component>
\ No newline at end of file
diff --git a/src/main/resources/templates/bld/lib/idea/libraries/test.xml b/src/main/resources/templates/bld/lib/idea/libraries/test.xml
index c16475a..05f52ce 100644
--- a/src/main/resources/templates/bld/lib/idea/libraries/test.xml
+++ b/src/main/resources/templates/bld/lib/idea/libraries/test.xml
@@ -10,9 +10,9 @@
       <root url="file://$PROJECT_DIR$/lib/test" />
       <root url="file://$PROJECT_DIR$/lib/provided" />
     </SOURCES>
-    <jarDirectory url="file://$PROJECT_DIR$/lib/test" recursive="false" />
-    <jarDirectory url="file://$PROJECT_DIR$/lib/test" recursive="false" type="SOURCES" />
-    <jarDirectory url="file://$PROJECT_DIR$/lib/provided" recursive="false" />
-    <jarDirectory url="file://$PROJECT_DIR$/lib/provided" recursive="false" type="SOURCES" />
+    <jarDirectory url="file://$PROJECT_DIR$/lib/test" recursive="true" />
+    <jarDirectory url="file://$PROJECT_DIR$/lib/test" recursive="true" type="SOURCES" />
+    <jarDirectory url="file://$PROJECT_DIR$/lib/provided" recursive="true" />
+    <jarDirectory url="file://$PROJECT_DIR$/lib/provided" recursive="true" type="SOURCES" />
   </library>
 </component>
\ No newline at end of file
diff --git a/src/main/resources/templates/bld/rife2_hello/idea/libraries/compile.xml b/src/main/resources/templates/bld/rife2_hello/idea/libraries/compile.xml
index 143dc93..5316b95 100644
--- a/src/main/resources/templates/bld/rife2_hello/idea/libraries/compile.xml
+++ b/src/main/resources/templates/bld/rife2_hello/idea/libraries/compile.xml
@@ -9,9 +9,9 @@
       <root url="file://$PROJECT_DIR$/lib/compile" />
       <root url="file://$PROJECT_DIR$/lib/provided" />
     </SOURCES>
-    <jarDirectory url="file://$PROJECT_DIR$/lib/compile" recursive="false" />
-    <jarDirectory url="file://$PROJECT_DIR$/lib/compile" recursive="false" type="SOURCES" />
-    <jarDirectory url="file://$PROJECT_DIR$/lib/provided" recursive="false" />
-    <jarDirectory url="file://$PROJECT_DIR$/lib/provided" recursive="false" type="SOURCES" />
+    <jarDirectory url="file://$PROJECT_DIR$/lib/compile" recursive="true" />
+    <jarDirectory url="file://$PROJECT_DIR$/lib/compile" recursive="true" type="SOURCES" />
+    <jarDirectory url="file://$PROJECT_DIR$/lib/provided" recursive="true" />
+    <jarDirectory url="file://$PROJECT_DIR$/lib/provided" recursive="true" type="SOURCES" />
   </library>
 </component>
\ No newline at end of file
diff --git a/src/main/resources/templates/bld/rife2_hello/idea/libraries/runtime.xml b/src/main/resources/templates/bld/rife2_hello/idea/libraries/runtime.xml
index 2ae5c4b..d4069f2 100644
--- a/src/main/resources/templates/bld/rife2_hello/idea/libraries/runtime.xml
+++ b/src/main/resources/templates/bld/rife2_hello/idea/libraries/runtime.xml
@@ -8,7 +8,7 @@
     <SOURCES>
       <root url="file://$PROJECT_DIR$/lib/runtime" />
     </SOURCES>
-    <jarDirectory url="file://$PROJECT_DIR$/lib/runtime" recursive="false" />
-    <jarDirectory url="file://$PROJECT_DIR$/lib/runtime" recursive="false" type="SOURCES" />
+    <jarDirectory url="file://$PROJECT_DIR$/lib/runtime" recursive="true" />
+    <jarDirectory url="file://$PROJECT_DIR$/lib/runtime" recursive="true" type="SOURCES" />
   </library>
 </component>
\ No newline at end of file
diff --git a/src/main/resources/templates/bld/rife2_hello/idea/libraries/standalone.xml b/src/main/resources/templates/bld/rife2_hello/idea/libraries/standalone.xml
index 643da27..9100291 100644
--- a/src/main/resources/templates/bld/rife2_hello/idea/libraries/standalone.xml
+++ b/src/main/resources/templates/bld/rife2_hello/idea/libraries/standalone.xml
@@ -7,7 +7,7 @@
     <SOURCES>
       <root url="file://$PROJECT_DIR$/lib/standalone" />
     </SOURCES>
-    <jarDirectory url="file://$PROJECT_DIR$/lib/standalone" recursive="false" />
-    <jarDirectory url="file://$PROJECT_DIR$/lib/standalone" recursive="false" type="SOURCES" />
+    <jarDirectory url="file://$PROJECT_DIR$/lib/standalone" recursive="true" />
+    <jarDirectory url="file://$PROJECT_DIR$/lib/standalone" recursive="true" type="SOURCES" />
   </library>
 </component>
\ No newline at end of file
diff --git a/src/main/resources/templates/bld/rife2_hello/idea/libraries/test.xml b/src/main/resources/templates/bld/rife2_hello/idea/libraries/test.xml
index c16475a..05f52ce 100644
--- a/src/main/resources/templates/bld/rife2_hello/idea/libraries/test.xml
+++ b/src/main/resources/templates/bld/rife2_hello/idea/libraries/test.xml
@@ -10,9 +10,9 @@
       <root url="file://$PROJECT_DIR$/lib/test" />
       <root url="file://$PROJECT_DIR$/lib/provided" />
     </SOURCES>
-    <jarDirectory url="file://$PROJECT_DIR$/lib/test" recursive="false" />
-    <jarDirectory url="file://$PROJECT_DIR$/lib/test" recursive="false" type="SOURCES" />
-    <jarDirectory url="file://$PROJECT_DIR$/lib/provided" recursive="false" />
-    <jarDirectory url="file://$PROJECT_DIR$/lib/provided" recursive="false" type="SOURCES" />
+    <jarDirectory url="file://$PROJECT_DIR$/lib/test" recursive="true" />
+    <jarDirectory url="file://$PROJECT_DIR$/lib/test" recursive="true" type="SOURCES" />
+    <jarDirectory url="file://$PROJECT_DIR$/lib/provided" recursive="true" />
+    <jarDirectory url="file://$PROJECT_DIR$/lib/provided" recursive="true" type="SOURCES" />
   </library>
 </component>
\ No newline at end of file