Merge branch '23-fix-command-line-tools-for-macos' into 'develop'

Resolve "Remove command line tools for macOS"

Closes #23

See merge request !24

cif/org.eclipse.escet.cif.documentation/asciidoc/tools/cif2yed.asciidoc

@@ -29,7 +29,7 @@ link:http://www.yworks.com/en/products/yfiles/yed/[yEd Graph Editor]
 is an
 application that can be used to view, create, edit, arrange, import and export
 various kinds of diagrams. It is freely available and runs on Windows, Linux,
-and Mac OS X.
+and macOS.
 
 The yEd diagrams are generated as
 link:http://graphml.graphdrawing.org/[GraphML]

cif/org.eclipse.escet.cif.documentation/asciidoc/tools/cifsim/output/svgviz/inkscape.asciidoc

@@ -22,7 +22,7 @@ graphics. One such program is
 link:http://inkscape.org/[Inkscape],
 a free and
 open source vector graphics editor that uses SVG as its native file format, and
-is available for many platforms, including Microsoft Windows, Mac OS X, and
+is available for many platforms, including Microsoft Windows, macOS, and
 Linux. In this documentation, we'll use Inkscape to create and edit SVG images.
 
 It is beyond the scope of this document to explain how Inkscape works. For

common/org.eclipse.escet.common.app.framework/src/org/eclipse/escet/common/app/framework/Paths.java

@@ -78,7 +78,7 @@ public class Paths {
      *     local file system path.
      */
     public static boolean isAbsolute(String path) {
-        // Linux and Mac OS X absolute path, for all supported path separators.
+        // Linux and macOS absolute path, for all supported path separators.
         if (path.startsWith("\\")) {
             return true;
         }

common/org.eclipse.escet.common.app.framework/src/org/eclipse/escet/common/app/framework/io/AppStream.java

@@ -101,7 +101,7 @@ public abstract class AppStream implements Closeable {
     }
 
     /**
-     * Set the 'new line bytes' property of the stream to use Linux (or Mac OS X) new line bytes. Linux new line bytes
+     * Set the 'new line bytes' property of the stream to use Linux (or macOS) new line bytes. Linux new line bytes
      * ('\n') are used when a new line is to be written. The '\n' characters that are written as part of the user
      * provided content are written without modification.
      */

products/org.eclipse.escet.documentation/asciidoc/download-install/index.asciidoc

@@ -42,7 +42,8 @@ checking.
 
 * As command line execution scripts (`bin` directory of the archives),
 allowing execution in a command line terminal or console,
-particularly useful for execution of the tools on headless clusters.
+particularly useful for execution of the tools on headless clusters. The
+command line scripts are only available for Windows and Linux, not for macOS.
 
 indexterm:[dependencies]
 

products/org.eclipse.escet.documentation/asciidoc/download-install/install.asciidoc

@@ -120,7 +120,7 @@ For more information, see the section on starting the Eclipse ESCET IDE
 <<download-install-first-start,for the first time>>.
 
 You can now also use the command line scripts located in the `bin`
-directory. To see which
+directory. These are only available for Windows and Linux, not for macOS. To see which
 tools are available, simply look in this directory. Each of these
 tools can be started with the `-h` or `--help` option to get further
 information. You may want to add the `bin` directory to your `PATH`

products/org.eclipse.escet.product.headless.feature/build.properties

@@ -13,11 +13,8 @@
 bin.includes = feature.xml,\
                feature.properties
 
-root.win32.win32.x86_64.folder.bin=target/bin/win32.win32.x86_64
-root.linux.gtk.x86_64.folder.bin=target/bin/linux.gtk.x86_64
-root.macosx.cocoa.x86_64.folder.bin=target/bin/macosx.cocoa.x86_64
-root.folder.bin=legal
+root.win32.win32.x86_64.folder.bin=target/bin/win32.win32.x86_64,legal
+root.linux.gtk.x86_64.folder.bin=target/bin/linux.gtk.x86_64,legal
 
 # Permissions and links works if product is built on Linux (will not work if built on Windows).
 root.linux.gtk.x86_64.permissions.755=bin/**
-root.macosx.cocoa.x86_64.permissions.755=bin/**

products/org.eclipse.escet.product.headless.feature/src/create_scripts.json

@@ -159,14 +159,6 @@
             "header": "#!/bin/sh\n\n################################################################################\n# Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation\n#\n# See the NOTICE file(s) distributed with this work for additional\n# information regarding copyright ownership.\n#\n# This program and the accompanying materials are made available under the terms\n# of the MIT License which is available at https://opensource.org/licenses/MIT\n#\n# SPDX-License-Identifier: MIT\n################################################################################",
             "eclipse": "\"$(dirname \"$(readlink \"$0\")\")\"/../eclipse",
             "newline": "\n"
-        },
-        {
-            "name": "macosx.cocoa.x86_64",
-            "extension": "",
-            "arguments": "$*",
-            "header": "#!/bin/sh\n\n################################################################################\n# Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation\n#\n# See the NOTICE file(s) distributed with this work for additional\n# information regarding copyright ownership.\n#\n# This program and the accompanying materials are made available under the terms\n# of the MIT License which is available at https://opensource.org/licenses/MIT\n#\n# SPDX-License-Identifier: MIT\n################################################################################",
-            "eclipse": "\"$(dirname \"$(readlink \"$0\")\")\"/../eclipse",
-            "newline": "\n"
         }
     ]
 }
\ No newline at end of file