Add icon, improve build scripts

README.md

@@ -1,7 +1,7 @@
 # Microscopic Traffic Simulation
 with OpenStreetMap data.
 
-![Teaser: New York](teaser.png "Teaser: New York")
+![Teaser: New York](resources/teaser.png "Teaser: New York")
 
 ## News
 Testing the simulation execution for determinism has finished. According

examples/mapviewer/src/main/java/microtrafficsim/examples/mapviewer/MapViewerExample.java

@@ -122,6 +122,7 @@ private TileBasedMapViewer setUpMapViewer(MapStyleSheet style) throws Unsupporte
     private JFrame setUpFrame(MapViewer viewer) {
         /* create and initialize the JFrame */
         JFrame frame = new JFrame(getDefaultFrameTitle());
+        frame.setIconImage(new ImageIcon(MapViewerExample.class.getResource("/icon/128x128.png")).getImage());
         frame.setSize(viewer.getInitialWindowWidth(), viewer.getInitialWindowHeight());
         frame.add(viewer.getVisualizationPanel());
 

examples/simulation/src/main/java/microtrafficsim/examples/simulation/SimulationExample.java

@@ -141,6 +141,7 @@ private TileBasedMapViewer setUpMapViewer(SimulationConfig config) throws Unsupp
     private JFrame setUpFrame(MapViewer viewer) {
         /* create and initialize the JFrame */
         JFrame frame = new JFrame("MicroTrafficSim - Map Viewer Example");
+        frame.setIconImage(new ImageIcon(SimulationExample.class.getResource("/icon/128x128.png")).getImage());
         frame.setSize(viewer.getInitialWindowWidth(), viewer.getInitialWindowHeight());
         frame.add(viewer.getVisualizationPanel());
 

microtrafficsim-ui/build.gradle

@@ -29,9 +29,6 @@ def main = 'microtrafficsim.ui.Main'
 
 
 mainClassName = "${main}"
-macAppBundle {
-    mainClassName = "${main}"
-}
 jar {
      manifest {
          attributes "Main-Class": "${main}"
@@ -42,6 +39,16 @@ jar {
      }
  }
 
+macAppBundle {
+    appName = 'microtrafficsim'
+    dmgName = "${distName}_${distVersion}-${distRelease}_all.app"
+
+    icon = "${rootProject.projectDir}/resources/icon/microtrafficsim.icns"
+    version = "${distVersion}-${distRelease}"
+
+    mainClassName = "${main}"
+    bundleJRE = false
+}
 
 ospackage {
     packageName = "${distName}"
@@ -76,22 +83,17 @@ task distRpm(type: Rpm) {
 
 task distDeb(type: Deb) {
     dependsOn startScripts
-}
 
-task distApp(type: Zip) {
-    dependsOn createApp
-
-    from fileTree("${->project.buildDir}/${->project.macAppBundle.appOutputDir}/${->project.macAppBundle.appName}.app") {
-        into 'microtrafficsim.app'
-    }
-
-    destinationDir = file("${->project.buildDir}/distributions")
-    archiveName = "${distName}_${distVersion}-${distRelease}_all.app.zip"
+    packageGroup 'science'
 }
 
 distZip {
     archiveName = "$distName"
 
+    into("${archiveName}/icon") {
+        from "${rootProject.projectDir}/resources/icon/png"
+    }
+
     doLast {
         def name = "${distName}_${distVersion}-${distRelease}_all.zip"
         archivePath.renameTo(file("${->project.buildDir}/distributions/${name}"))
@@ -115,20 +117,30 @@ task writeArchPkgbuild() {
         pkgbuild <<= "pkgver=${distVersion}\n"
         pkgbuild <<= "pkgrel=${distRelease}\n"
         pkgbuild <<= "pkgdesc='Microscopic Traffic Simulation using OpenStreetMap'\n"
+        pkgbuild <<= "categories=\"Application;Science\"\n"
         pkgbuild <<= "arch=('any')\n"
         pkgbuild <<= "url='https://github.com/sgs-us/microtrafficsim/'\n"
         pkgbuild <<= "license=('GPL-3.0')\n"
         pkgbuild <<= "\n"
         pkgbuild <<= "depends=('java-environment')\n"
+        pkgbuild <<= "makedepends=('gendesk')\n"
         pkgbuild <<= "source=(\"${distZipUrl}\")\n"
         pkgbuild <<= "sha256sums=('${distZipSha256}')\n"
         pkgbuild <<= "\n"
+        pkgbuild <<= "build() {\n"
+        pkgbuild <<= "    mv \"\${pkgname}/icon/512x512.png\" \${pkgname}.png\n"
+        pkgbuild <<= "    rm -r \"\${pkgname}/icon\"\n"
+        pkgbuild <<= "    rm \"\${pkgname}/bin/\${pkgname}.bat\"\n"
+        pkgbuild <<= "    gendesk -f -n --pkgname \"\${pkgname}\" --pkgdesc \"\${pkgdesc}\" --categories \"\${categories}\"\n"
+        pkgbuild <<= "}\n"
+        pkgbuild <<= "\n"
         pkgbuild <<= "package() {\n"
         pkgbuild <<= "    mkdir -p \"\${pkgdir}/usr/\"{bin,share}\n"
         pkgbuild <<= "    cp -r \"\${pkgname}\" \"\${pkgdir}/usr/share/\"\n"
-        pkgbuild <<= "    rm \"\${pkgdir}/usr/share/\${pkgname}/bin/\${pkgname}.bat\"\n"
         pkgbuild <<= "    chmod 755 \"\${pkgdir}/usr/share/\${pkgname}/bin/\${pkgname}\"\n"
         pkgbuild <<= "    ln -s \"/usr/share/\${pkgname}/bin/\${pkgname}\" \"\${pkgdir}/usr/bin/\${pkgname}\"\n"
+        pkgbuild <<= "    install -Dm644 \"\${pkgname}.desktop\" \"\${pkgdir}/usr/share/applications/\${pkgname}.desktop\"\n"
+        pkgbuild <<= "    install -Dm644 \"\${pkgname}.png\" \"\${pkgdir}/usr/share/pixmaps/\${pkgname}.png\"\n"
         pkgbuild <<= "}\n"
 
         file("$tmpdir/PKGBUILD").write(pkgbuild.toString())
@@ -152,7 +164,7 @@ task distAll {
     dependsOn distRpm
     dependsOn distDeb
     dependsOn distArchPkg
-    dependsOn distApp
+    dependsOn createAppZip
 }
 
 

microtrafficsim-ui/src/main/java/microtrafficsim/ui/gui/statemachine/impl/SimulationController.java

@@ -142,7 +142,8 @@ public SimulationController(BuildSetup buildSetup) {
         overlay.setSimulation(simulation);
 
         /* gui */
-        frame       = new JFrame(FrameTitle.DEFAULT.get());
+        frame = new JFrame(FrameTitle.DEFAULT.get());
+        frame.setIconImage(new ImageIcon(SimulationController.class.getResource("/icon/128x128.png")).getImage());
         frame.addWindowListener(new WindowAdapter() {
             @Override
             public void windowActivated(WindowEvent e) {