From d2d2f3c8a258d660ed8cdad87057127f1d05eb3a Mon Sep 17 00:00:00 2001
From: Josef Eisl <josef.eisl@oracle.com>
Date: Thu, 30 Nov 2023 10:01:31 +0100
Subject: [PATCH] svm: move the in-source resource with space into a checked in
 jar

---
 .../jar-with-space-in-resource-dir.jar            | Bin 0 -> 962 bytes
 .../jar-with-space-in-resource-dir.jar.sha512     |   1 +
 substratevm/mx.substratevm/suite.py               |   9 +++++++++
 .../src/resources/dir with space/.mxkeep          |   1 -
 4 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 substratevm/mx.substratevm/jar-with-space-in-resource-dir.jar
 create mode 100644 substratevm/mx.substratevm/jar-with-space-in-resource-dir.jar.sha512
 delete mode 100644 substratevm/src/com.oracle.svm.test/src/resources/dir with space/.mxkeep

diff --git a/substratevm/mx.substratevm/jar-with-space-in-resource-dir.jar b/substratevm/mx.substratevm/jar-with-space-in-resource-dir.jar
new file mode 100644
index 0000000000000000000000000000000000000000..d4dfbc94e599707c5f5c9610878dced3b574be58
GIT binary patch
literal 962
zcmWIWW@Zs#;Nak3;PI;qXFvj+3@i-3t|5-Po_=on|4uP5Ff#;rvvYt{FhP|C;M6Pv
zQ~}rQ>*(j{<{BKL=j-;__snS@Z(Y5MyxzK6=gyqp9At3C_`%a6JuhD!Pv48Bt5~>Z
zyq0_ssgc35beTql%Cr|670*;(XMQUBSi}gne|71R$96!|ZGjkMKNkZ7&`qCxQ5_Ey
zWhhE5&Mz%WPA%3)xbp>?Izbe5dbt(Zsi_6LCl2y981OJ32(=O6c2Nv%Uf|j{@x`}-
z^S7(SqUJTqsM@VN^wmlDoB=COyP)BbRx{482Xg-~R~yAle$5ODqb|0s${_c-qPP*=
zZb=loQ!<Mb$}>wc6p9NHlT-0HSplCm+W3HxNrVA4k-$;_D3PE7c&vkxOn^74R^-S7
zB@qMw1s7Z^Qi1`Qz{P+&k`X5C1u~JN9APsk;E|&Q6zK@?6v#yAg9ae7wb<efp*@ii
jSvy87;&z1s!VDm520mlpj$&m4X<`GyPM~^aa4Y}-J{;H<

literal 0
HcmV?d00001

diff --git a/substratevm/mx.substratevm/jar-with-space-in-resource-dir.jar.sha512 b/substratevm/mx.substratevm/jar-with-space-in-resource-dir.jar.sha512
new file mode 100644
index 000000000000..6b33c66f3d17
--- /dev/null
+++ b/substratevm/mx.substratevm/jar-with-space-in-resource-dir.jar.sha512
@@ -0,0 +1 @@
+270bffd158c92b04b16db147f4ef336dcb4d830bf3503cc25be1227b351597a3254544b3c4a5183dcc53f2f3ab10b282722dbf7f1b5e9d9a2741878a7057eb40
\ No newline at end of file
diff --git a/substratevm/mx.substratevm/suite.py b/substratevm/mx.substratevm/suite.py
index c21b5ce51a94..95a15778069d 100644
--- a/substratevm/mx.substratevm/suite.py
+++ b/substratevm/mx.substratevm/suite.py
@@ -194,6 +194,14 @@
                 }
             }
         },
+        "SVM_TEST_RESOURCE_WITH_SPACE": {
+            # This jar only contains a resource with a space in its path.
+            # We cannot have folder with spaces in the source tree, as it
+            # does not work well with certain build tools, for example
+            # make. [GR-50375]
+            "path": "mx.substratevm/jar-with-space-in-resource-dir.jar",
+            "digest": "sha512:270bffd158c92b04b16db147f4ef336dcb4d830bf3503cc25be1227b351597a3254544b3c4a5183dcc53f2f3ab10b282722dbf7f1b5e9d9a2741878a7057eb40",
+        },
     },
 
     "projects": {
@@ -2000,6 +2008,7 @@
             "com.oracle.svm.test",
             "com.oracle.svm.configure.test",
             "com.oracle.svm.graal.test",
+            "SVM_TEST_RESOURCE_WITH_SPACE",
           ],
           "distDependencies": [
             "mx:JUNIT_TOOL",
diff --git a/substratevm/src/com.oracle.svm.test/src/resources/dir with space/.mxkeep b/substratevm/src/com.oracle.svm.test/src/resources/dir with space/.mxkeep
deleted file mode 100644
index 5c74e3c55f30..000000000000
--- a/substratevm/src/com.oracle.svm.test/src/resources/dir with space/.mxkeep	
+++ /dev/null
@@ -1 +0,0 @@
-This file instructs mx to create a jar entry for the parent directory
\ No newline at end of file