Fix TruffleSqueak icon.

.gitignore

@@ -46,4 +46,3 @@ lib/**/*.dylib
 lib/**/*.so
 trufflesqueak*.zip
 trufflesqueak*.jar
-/src/de.hpi.swa.trufflesqueak/src/resources/trufflesqueak-icon.png

mx.trufflesqueak/suite.py

@@ -18,8 +18,6 @@
     "trufflesqueak:dependencyMap": {
         "cuis_test_image": "CuisTestImage-6.0-5053.zip",
         "cuis_test_image_tag": "21.3.0",
-        "icon": "trufflesqueak-icon.png",
-        "icon_tag": "21.0.0.1",
         "test_image": "TruffleSqueakTestImage-6.0-22104-64bit.zip",
         "test_image_tag": "22.3.0",
     },
@@ -123,7 +121,10 @@
     "projects": {
         "de.hpi.swa.trufflesqueak": {
             "subDir": "src",
-            "sourceDirs": ["src"],
+            "sourceDirs": [
+                "src",
+                "resources",
+            ],
             "dependencies": [
                 "TRUFFLESQUEAK_SHARED",
                 "truffle:TRUFFLE_API",

mx.trufflesqueak/utils.sh

@@ -145,19 +145,6 @@ download-asset() {
     "https://github.com/${GITHUB_SLUG}/releases/download/${git_tag}/${filename}"
 }
 
-download-trufflesqueak-icon() {
-  local target="${BASE_DIRECTORY}/src/resources/trufflesqueak-icon.png"
-
-  if ls -1 ${target} 2>/dev/null; then
-    echo "[TruffleSqueak icon already downloaded]"
-    return
-  fi
-
-  mkdir -p $(dirname "${target}") || true
-  download-asset "${DEP_ICON}" "${DEP_ICON_TAG}" "${target}"
-  echo "[TruffleSqueak icon (${DEP_ICON_TAG}) downloaded successfully]"
-}
-
 enable-jdk() {
   add-path "$1/bin"
   set-env "JAVA_HOME" "$(resolve-path "$1")"
@@ -248,7 +235,6 @@ set-up-dependencies() {
   set-up-mx
   shallow-clone-graal
   set-up-labsjdk "labsjdk-ce-${java_version:4}"
-  download-trufflesqueak-icon
   download-trufflesqueak-test-image
   if [[ "${kind}" != "jar" ]]; then
     set-env "STANDALONE_TARGET" "$(filename-standalone "${kind}")"

src/de.hpi.swa.trufflesqueak/src/META-INF/native-image/resource-config.json

@@ -8,9 +8,7 @@
         "pattern": "\\QMETA-INF/services/com.oracle.truffle.api.instrumentation.TruffleInstrument$Provider\\E"
       },
       { "pattern": "\\QMETA-INF/services/java.nio.file.spi.FileSystemProvider\\E" },
-      { "pattern": "\\Qcom/oracle/truffle/nfi/backend/libffi/LibFFILanguage.class\\E" },
-      { "pattern": "\\Qde/hpi/swa/trufflesqueak/image/PrepareHeadlessImage.st\\E" },
-      { "pattern": "\\Qde/hpi/swa/trufflesqueak/io/trufflesqueak-icon.png\\E" }
+      { "pattern": "\\Qcom/oracle/truffle/nfi/backend/libffi/LibFFILanguage.class\\E" }
     ]
   },
   "bundles": [{ "name": "sun.awt.resources.awt", "classNames": ["sun.awt.resources.awt"] }]

src/de.hpi.swa.trufflesqueak/src/de/hpi/swa/trufflesqueak/io/SqueakDisplay.java

@@ -114,7 +114,7 @@ private static void tryToSetTaskbarIcon() {
             try {
                 final Taskbar taskbar = Taskbar.getTaskbar();
                 if (taskbar.isSupported(Feature.ICON_IMAGE)) {
-                    taskbar.setIconImage(Toolkit.getDefaultToolkit().getImage(SqueakDisplay.class.getResource("/resources/trufflesqueak-icon.png")));
+                    taskbar.setIconImage(Toolkit.getDefaultToolkit().getImage(SqueakDisplay.class.getResource("/trufflesqueak-icon.png")));
                 }
             } catch (Exception e) {
                 // Never fail if the taskbar icon cannot be set.