Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add ARM variants for MacOS and Linux #7

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,4 @@ Corel Auto-Preserve/
*_SAVE*
*.versionsBackup
.metadata
.tycho-consumer-pom.xml
24 changes: 12 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ Typical use cases:
mvn org.apache.maven.plugins:maven-dependency-plugin:3.3.0:unpack -Dartifact=com.github.a-langer:org.eclipse.oomph.console.product:LATEST:tar.gz:macosx.cocoa.x86_64 -DoutputDirectory=./ -Dproject.basedir=./
# Windows (powershell)
mvn "org.apache.maven.plugins:maven-dependency-plugin:3.3.0:unpack" "-Dartifact=com.github.a-langer:org.eclipse.oomph.console.product:LATEST:zip:win32.win32.x86_64" "-DoutputDirectory=./" "-Dproject.basedir=./"

# Linux/MacOS binary
./eclipse-installer/eclipse-inst
# Windows binary
Expand All @@ -42,12 +42,12 @@ Typical use cases:

```bash
# Install "Eclipse IDE for Java Developers"
./eclipse-inst -nosplash -application org.eclipse.oomph.console.application -vmargs \
./eclipse-inst -vmargs \
-Doomph.installation.location="$PWD/ide" \
-Doomph.product.id="epp.package.java"

# Install "Eclipse IDE for PHP Developers"
./eclipse-inst -nosplash -application org.eclipse.oomph.console.application -vmargs \
./eclipse-inst -vmargs \
-Doomph.installation.location="$PWD/ide" \
-Doomph.product.id="epp.package.php"
```
Expand All @@ -56,14 +56,14 @@ Typical use cases:

```bash
# Install "SWTBot testing tool" over "Eclipse IDE for Java Developers"
./eclipse-inst -nosplash -application org.eclipse.oomph.console.application -vmargs \
./eclipse-inst -vmargs \
-Doomph.installation.location="$PWD/ide" \
-Doomph.product.id="epp.package.java" \
-Doomph.project.id="swtbot" \
-Doomph.workspace.location="$PWD/workspace"

# Install "Model Workflow Engine" over "Eclipse IDE for Java Developers"
./eclipse-inst -nosplash -application org.eclipse.oomph.console.application -vmargs \
./eclipse-inst -vmargs \
-Doomph.installation.location="$PWD/ide" \
-Doomph.product.id="epp.package.java" \
-Doomph.project.id="MWE" \
Expand All @@ -74,7 +74,7 @@ Typical use cases:

```bash
# Install "SWTBot testing tool", "Business Intelligence Reporting Tool" and "Model Workflow Engine" over "Eclipse IDE for Java Developers"
./eclipse-inst -nosplash -application org.eclipse.oomph.console.application -vmargs \
./eclipse-inst -vmargs \
-Doomph.installation.location="$PWD/ide" \
-Doomph.product.id="epp.package.java" \
-Doomph.project.id="swtbot,birt,MWE" \
Expand All @@ -86,7 +86,7 @@ Typical use cases:

```bash
# Install "Bash Editor" over "Eclipse IDE for Java Developers" from setup model located in directory "$PWD/setups/"
./eclipse-inst -nosplash -application org.eclipse.oomph.console.application -vmargs \
./eclipse-inst -vmargs \
-Doomph.redirection.setups="index:/->http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/" \
-Doomph.redirection.setupsDir="index:/->$PWD/setups/" \
-Doomph.installation.location="$PWD/ide" \
Expand All @@ -100,7 +100,7 @@ Typical use cases:

```bash
# Install "Business Intelligence Reporting Tool" over "Eclipse IDE for Eclipse Committers" from Configuration
./eclipse-inst -nosplash -application org.eclipse.oomph.console.application -vmargs \
./eclipse-inst -vmargs \
-Doomph.configuration.setups="https://raw.githubusercontent.com/eclipse/birt/master/build/org.eclipse.birt.releng/BIRTConfiguration.setup" \
-Doomph.installation.location="$PWD/ide" \
-Doomph.workspace.location="$PWD/workspace" \
Expand Down Expand Up @@ -244,8 +244,8 @@ The Console Oomph Installer settings (see also [Eclipse runtime options](https:/
* `<Any jvm options>` - any jvm options will be bind to setup model variables, ex.:

```bash
-Dmy.project.option1="my-value1"
-Dmy.project.option2="my-value2"
-Dmy.project.option1="my-value1"
-Dmy.project.option2="my-value2"
-Dmy.project.option3="my-value3"
```

Expand Down
6 changes: 0 additions & 6 deletions org.eclipse.oomph.console.product/.project
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,6 @@
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.oomph.version.VersionBuilder</name>
<arguments>
Expand All @@ -30,7 +25,6 @@
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
</natures>
<filteredResources>
Expand Down
9 changes: 6 additions & 3 deletions org.eclipse.oomph.console.product/Installer.product
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>

<product name="Eclipse Console Installer" uid="org.eclipse.oomph.console.product" id="org.eclipse.oomph.setup.installer.product" version="1.0.5.qualifier" useFeatures="true" includeLaunchers="true" autoIncludeRequirements="true">

<product name="Eclipse Console Installer" uid="org.eclipse.oomph.console.product" id="org.eclipse.oomph.setup.installer.product" application="org.eclipse.oomph.console.application" version="1.0.5.qualifier" type="features" includeLaunchers="true" autoIncludeRequirements="true">

<configIni use="">
</configIni>
Expand All @@ -17,6 +16,10 @@ openFile
Eclipse Installer
-data
@noDefault
-nosplash
--launcher.suppressErrors
-application
org.eclipse.oomph.console.application
</programArgs>
<vmArgs>-Xms256M
-Xmx2048M
Expand Down Expand Up @@ -194,7 +197,7 @@ United States, other countries, or both.
<features>
<feature id="org.eclipse.oomph.setup.installer"/>
<feature id="org.eclipse.oomph.console.feature"/>
<!--
<!--
<feature id="org.eclipse.justj.openjdk.hotspot.jre.minimal.stripped"/>
-->
</features>
Expand Down
10 changes: 10 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,11 @@
<ws>gtk</ws>
<arch>x86_64</arch>
</environment>
<environment>
<os>linux</os>
<ws>gtk</ws>
<arch>aarch64</arch>
</environment>
<environment>
<os>win32</os>
<ws>win32</ws>
Expand All @@ -191,6 +196,11 @@
<ws>cocoa</ws>
<arch>x86_64</arch>
</environment>
<environment>
<os>macosx</os>
<ws>cocoa</ws>
<arch>aarch64</arch>
</environment>
</environments>
</configuration>
</plugin>
Expand Down