From 50c16f25bc9e4483acc96718e8c4aecbe300f24d Mon Sep 17 00:00:00 2001
From: Jie Kang <jkang@redhat.com>
Date: Dec 19 2018 20:36:28 +0000
Subject: [PATCH 1/3] Update flatpak files


---

diff --git a/flathub.json b/flathub.json
new file mode 100644
index 0000000..0b69b95
--- /dev/null
+++ b/flathub.json
@@ -0,0 +1,3 @@
+{
+    "only-arches": ["x86_64"]
+}
\ No newline at end of file
diff --git a/org.openjdk.JMC.appdata.xml b/org.openjdk.JMC.appdata.xml
new file mode 100644
index 0000000..60444c2
--- /dev/null
+++ b/org.openjdk.JMC.appdata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="runtime">
+  <id>org.openjdk.JMC</id>
+  <metadata_license>CC0-1.0</metadata_license>
+  <project_license>UPL</project_license>
+  <name>Java Mission Control</name>
+  <summary>Java Mission Control</summary>
+  <launchable type="desktop-id">org.opendjk.JMC.desktop</launchable>
+  <description>
+    <p>
+      A profiler for the HotSpot JVM.
+    </p>
+  </description>
+</component>
\ No newline at end of file
diff --git a/org.openjdk.JMC.desktop b/org.openjdk.JMC.desktop
new file mode 100644
index 0000000..685c593
--- /dev/null
+++ b/org.openjdk.JMC.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Java Mission Control
+Comment=Analyze performance of Java applications
+Exec=jmc
+Icon=org.openjdk.JMC
+Terminal=false
+Type=Application
+Categories=Development;Java;Profiling;
\ No newline at end of file
diff --git a/org.openjdk.jmc.appdata.xml b/org.openjdk.jmc.appdata.xml
deleted file mode 100644
index 72e97ec..0000000
--- a/org.openjdk.jmc.appdata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component type="runtime">
-  <id>org.openjdk.jmc</id>
-  <metadata_license>CC0-1.0</metadata_license>
-  <project_license>UPL</project_license>
-  <name>Java Mission Control</name>
-  <summary>Java Mission Control</summary>
-  <description>
-    <p>
-      A profiler for the HotSpot JVM.
-    </p>
-  </description>
-</component>
\ No newline at end of file
diff --git a/org.openjdk.jmc.desktop b/org.openjdk.jmc.desktop
deleted file mode 100644
index 822bcc0..0000000
--- a/org.openjdk.jmc.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=Java Mission Control
-Comment=Analyze performance of Java applications
-Exec=org.openjdk.jmc
-Icon=org.openjdk.jmc
-Terminal=false
-Type=Application
-Categories=Development;Java;Profiling;
\ No newline at end of file
diff --git a/org.openjdk.jmc.json b/org.openjdk.jmc.json
index 0ec3bf3..f3c06f1 100644
--- a/org.openjdk.jmc.json
+++ b/org.openjdk.jmc.json
@@ -1,25 +1,59 @@
 {
-    "app-id": "org.openjdk.jmc",
+    "app-id": "org.openjdk.JMC",
     "runtime": "org.freedesktop.Platform",
     "runtime-version": "18.08",
     "sdk": "org.freedesktop.Sdk",
+    "separate-locales": "false",
     "command": "jmc",
     "finish-args": [
-        "--socket=x11"
+        "--device=all",
+        "--device=dri",
+        "--socket=x11",
+        "--filesystem=host",
+        "--share=ipc",
+        "--share=network"
      ],
     "modules": [
-
         {
             "name": "jmc",
             "buildsystem": "simple",
             "build-commands": [
-                "tar xvf jmc.tar.gz --dest=${FLATPAK_DEST}/app"
-                
+                "tar xvf jmc.tar.gz --dest=${FLATPAK_DEST}/jmc",
+                "ln -s ${FLATPAK_DEST}/jmc/jmc ${FLATPAK_DEST}/bin/jmc",
+                "mv ${FLATPAK_DEST}/jmc/icon.xpm ${FLATPAK_DEST}/share/icons/hicolor/48x48/org.openjdk.JMC.xpm"
             ],
             "sources": [
                 {
                     "type": "archive",
-                    "path": "jmc.tar.gz"
+                    "path": "org.openjdk.jmc-linux.gtk.x86_64.tar.gz"
+                }
+            ]
+        },
+        {
+            "name": "desktop",
+            "buildsystem": "simple",
+            "build-commands": [
+                "mkdir -p ${FLATPAK_DEST}/share/applications",
+                "install -Dm0644 -t ${FLATPAK_DEST}/share/applications/org.openjdk.JMC.desktop org.openjdk.JMC.desktop "
+            ],
+            "sources": [
+                {
+                    "type": "file",
+                    "path" : "org.openjdk.JMC.desktop"
+                }
+            ]
+        },
+        {
+            "name": "appdata",
+            "buildsystem": "simple",
+            "build-commands": [
+                "mkdir -p ${FLATPAK_DEST}/share/appdata",
+                "install -Dm0644 -t ${FLATPAK_DEST}/share/metainfo org.openjdk.JMC.appdata.xml"
+            ],
+            "sources": [
+                {
+                    "type": "file",
+                    "path": "org.openjdk.JMC.appdata.xml"
                 }
             ]
         }

From b0babf52c965339f0f84107502f84c6ad57b0d1b Mon Sep 17 00:00:00 2001
From: Jie Kang <jkang@redhat.com>
Date: Dec 20 2018 18:26:33 +0000
Subject: [PATCH 2/3] Rename jmc flatpak json file


---

diff --git a/org.openjdk.JMC.json b/org.openjdk.JMC.json
new file mode 100644
index 0000000..f3c06f1
--- /dev/null
+++ b/org.openjdk.JMC.json
@@ -0,0 +1,61 @@
+{
+    "app-id": "org.openjdk.JMC",
+    "runtime": "org.freedesktop.Platform",
+    "runtime-version": "18.08",
+    "sdk": "org.freedesktop.Sdk",
+    "separate-locales": "false",
+    "command": "jmc",
+    "finish-args": [
+        "--device=all",
+        "--device=dri",
+        "--socket=x11",
+        "--filesystem=host",
+        "--share=ipc",
+        "--share=network"
+     ],
+    "modules": [
+        {
+            "name": "jmc",
+            "buildsystem": "simple",
+            "build-commands": [
+                "tar xvf jmc.tar.gz --dest=${FLATPAK_DEST}/jmc",
+                "ln -s ${FLATPAK_DEST}/jmc/jmc ${FLATPAK_DEST}/bin/jmc",
+                "mv ${FLATPAK_DEST}/jmc/icon.xpm ${FLATPAK_DEST}/share/icons/hicolor/48x48/org.openjdk.JMC.xpm"
+            ],
+            "sources": [
+                {
+                    "type": "archive",
+                    "path": "org.openjdk.jmc-linux.gtk.x86_64.tar.gz"
+                }
+            ]
+        },
+        {
+            "name": "desktop",
+            "buildsystem": "simple",
+            "build-commands": [
+                "mkdir -p ${FLATPAK_DEST}/share/applications",
+                "install -Dm0644 -t ${FLATPAK_DEST}/share/applications/org.openjdk.JMC.desktop org.openjdk.JMC.desktop "
+            ],
+            "sources": [
+                {
+                    "type": "file",
+                    "path" : "org.openjdk.JMC.desktop"
+                }
+            ]
+        },
+        {
+            "name": "appdata",
+            "buildsystem": "simple",
+            "build-commands": [
+                "mkdir -p ${FLATPAK_DEST}/share/appdata",
+                "install -Dm0644 -t ${FLATPAK_DEST}/share/metainfo org.openjdk.JMC.appdata.xml"
+            ],
+            "sources": [
+                {
+                    "type": "file",
+                    "path": "org.openjdk.JMC.appdata.xml"
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/org.openjdk.jmc.json b/org.openjdk.jmc.json
deleted file mode 100644
index f3c06f1..0000000
--- a/org.openjdk.jmc.json
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-    "app-id": "org.openjdk.JMC",
-    "runtime": "org.freedesktop.Platform",
-    "runtime-version": "18.08",
-    "sdk": "org.freedesktop.Sdk",
-    "separate-locales": "false",
-    "command": "jmc",
-    "finish-args": [
-        "--device=all",
-        "--device=dri",
-        "--socket=x11",
-        "--filesystem=host",
-        "--share=ipc",
-        "--share=network"
-     ],
-    "modules": [
-        {
-            "name": "jmc",
-            "buildsystem": "simple",
-            "build-commands": [
-                "tar xvf jmc.tar.gz --dest=${FLATPAK_DEST}/jmc",
-                "ln -s ${FLATPAK_DEST}/jmc/jmc ${FLATPAK_DEST}/bin/jmc",
-                "mv ${FLATPAK_DEST}/jmc/icon.xpm ${FLATPAK_DEST}/share/icons/hicolor/48x48/org.openjdk.JMC.xpm"
-            ],
-            "sources": [
-                {
-                    "type": "archive",
-                    "path": "org.openjdk.jmc-linux.gtk.x86_64.tar.gz"
-                }
-            ]
-        },
-        {
-            "name": "desktop",
-            "buildsystem": "simple",
-            "build-commands": [
-                "mkdir -p ${FLATPAK_DEST}/share/applications",
-                "install -Dm0644 -t ${FLATPAK_DEST}/share/applications/org.openjdk.JMC.desktop org.openjdk.JMC.desktop "
-            ],
-            "sources": [
-                {
-                    "type": "file",
-                    "path" : "org.openjdk.JMC.desktop"
-                }
-            ]
-        },
-        {
-            "name": "appdata",
-            "buildsystem": "simple",
-            "build-commands": [
-                "mkdir -p ${FLATPAK_DEST}/share/appdata",
-                "install -Dm0644 -t ${FLATPAK_DEST}/share/metainfo org.openjdk.JMC.appdata.xml"
-            ],
-            "sources": [
-                {
-                    "type": "file",
-                    "path": "org.openjdk.JMC.appdata.xml"
-                }
-            ]
-        }
-    ]
-}
\ No newline at end of file

From f5f229f81f5d152a2456918c9ea6778ae28d2ab3 Mon Sep 17 00:00:00 2001
From: Jie Kang <jkang@redhat.com>
Date: Dec 20 2018 22:50:10 +0000
Subject: [PATCH 3/3] Update flatpak json file. Update README with instructions


---

diff --git a/README.md b/README.md
index 22e4f0c..b60282d 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,26 @@
 # README
 
-Flatpak Files for Java Mission Control
+Flatpak Files for Java Mission Control (JMC)
+
+This is for experimental purposes. Do not expect any support.
+
+
+## Build
+
+The build expects release tarballs (not source) of JMC and JDK 11 with the names:
+
+1. org.openjdk.jmc-linux.gtk.x86_64.tar.gz : Acquired from a JMC build
+2. OpenJDK11U-jdk_x64_linux_hotspot_11.0.1_13.tar.gz : Acquired from AdoptOpenJDK https://adoptopenjdk.net/
+
+### Build Locally
+
+```
+$ mkdir -p target
+$ flatpak-builder ./target/ ./org.openjdk.JMC.json 
+```
+
+### Run Locally
+
+```
+$ flatpak-builder --run ./target/ org.openjdk.JMC.json jmc
+```
diff --git a/jmc b/jmc
new file mode 100755
index 0000000..1fd7398
--- /dev/null
+++ b/jmc
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+/app/jmc/jmc -vm /app/jdk/bin
diff --git a/org.openjdk.JMC.json b/org.openjdk.JMC.json
index f3c06f1..8b8c260 100644
--- a/org.openjdk.JMC.json
+++ b/org.openjdk.JMC.json
@@ -18,14 +18,22 @@
             "name": "jmc",
             "buildsystem": "simple",
             "build-commands": [
-                "tar xvf jmc.tar.gz --dest=${FLATPAK_DEST}/jmc",
-                "ln -s ${FLATPAK_DEST}/jmc/jmc ${FLATPAK_DEST}/bin/jmc",
-                "mv ${FLATPAK_DEST}/jmc/icon.xpm ${FLATPAK_DEST}/share/icons/hicolor/48x48/org.openjdk.JMC.xpm"
+                "install -dm0755 ${FLATPAK_DEST}/jmc",
+                "tar xvf org.openjdk.jmc-linux.gtk.x86_64.tar.gz -C ${FLATPAK_DEST}/jmc",
+                "rm org.openjdk.jmc-linux.gtk.x86_64.tar.gz",
+                "install -dm0755 ${FLATPAK_DEST}/share/icons/hicolor/48x48",
+                "mv ${FLATPAK_DEST}/jmc/icon.xpm ${FLATPAK_DEST}/share/icons/hicolor/48x48/org.openjdk.JMC.xpm",
+                "install -dm0755 ${FLATPAK_DEST}/bin",
+                "install -Dm0766 -t ${FLATPAK_DEST}/bin jmc"
             ],
             "sources": [
                 {
-                    "type": "archive",
+                    "type": "file",
                     "path": "org.openjdk.jmc-linux.gtk.x86_64.tar.gz"
+                },
+                {
+                    "type": "file",
+                    "path": "jmc"
                 }
             ]
         },
@@ -33,8 +41,8 @@
             "name": "desktop",
             "buildsystem": "simple",
             "build-commands": [
-                "mkdir -p ${FLATPAK_DEST}/share/applications",
-                "install -Dm0644 -t ${FLATPAK_DEST}/share/applications/org.openjdk.JMC.desktop org.openjdk.JMC.desktop "
+                "install -dm0755 ${FLATPAK_DEST}/share/applications",
+                "install -Dm0644 -t ${FLATPAK_DEST}/share/applications org.openjdk.JMC.desktop "
             ],
             "sources": [
                 {
@@ -47,7 +55,7 @@
             "name": "appdata",
             "buildsystem": "simple",
             "build-commands": [
-                "mkdir -p ${FLATPAK_DEST}/share/appdata",
+                "install -dm0755 ${FLATPAK_DEST}/share/appdata",
                 "install -Dm0644 -t ${FLATPAK_DEST}/share/metainfo org.openjdk.JMC.appdata.xml"
             ],
             "sources": [
@@ -56,6 +64,21 @@
                     "path": "org.openjdk.JMC.appdata.xml"
                 }
             ]
+        },
+        {
+            "name": "jdk",
+            "buildsystem": "simple",
+            "build-commands": [
+                "install -dm0755 ${FLATPAK_DEST}/jdk",
+                "tar xvf OpenJDK11U-jdk_x64_linux_hotspot_11.0.1_13.tar.gz -C ${FLATPAK_DEST}/jdk --strip-components=1",
+                "rm OpenJDK11U-jdk_x64_linux_hotspot_11.0.1_13.tar.gz"
+            ],
+            "sources": [
+                {
+                    "type": "file",
+                    "path": "OpenJDK11U-jdk_x64_linux_hotspot_11.0.1_13.tar.gz"
+                }
+            ]
         }
     ]
 }
\ No newline at end of file