Skip to content

GitLab

M
maven-releng
Commit dc8a37e1 authored by Alexander Diewald's avatar Alexander Diewald
Browse files
Options

Extract products and features to separate repos 

... and include them as submodules here.

Issue-Ref: 3620
Signed-off-by: Alexander Diewald's avatarAlexander Diewald <diewald@fortiss.org>
parent ad352e22
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 17 additions and 1465 deletions
.gitmodules
View file @ dc8a37e1
......@@ -14,3 +14,15 @@
[submodule "tests/af3"]
path = tests/af3
url = https://git.fortiss.org/af3/product-tests.git
[submodule "features/af3"]
path = features/af3
url = https://git.fortiss.org/af3/af3-features.git
branch = master
[submodule "features/tooling"]
path = features/tooling
url = https://git.fortiss.org/af3/tooling-features.git
branch = master
[submodule "products/af3"]
path = products/af3
url = https://git.fortiss.org/af3/af3-products.git
branch = master
af3 @ b59fad99
Subproject commit b59fad99b1136713e3c06f1a3fd1885523e3bff6
features/org.fortiss.af3.phoenix.feature/feature.xml deleted 100644 → 0
View file @ ad352e22
This diff is collapsed.
features/org.fortiss.af3.phoenix.feature/pom.xml deleted 100644 → 0
View file @ ad352e22
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<name>AF3 Phoenix Continuous Feature</name>
<artifactId>org.fortiss.af3.phoenix.feature</artifactId>
<version>2.14.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
<parent>
<groupId>org.fortiss.af3</groupId>
<artifactId>org.fortiss.af3.features</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
</project>
features/org.fortiss.tooling.feature/feature.xml deleted 100644 → 0
View file @ ad352e22
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.fortiss.tooling.feature"
label="Fortiss Tooling Kernel 2.14-LATEST Feature"
version="2.14.0.qualifier"
provider-name="fortiss GmbH">
<description url="http://www.example.com/description">
[Enter Feature Description here.]
</description>
<copyright url="http://www.example.com/copyright">
[Enter Copyright Description here.]
</copyright>
<license url="http://www.example.com/license">
[Enter License Description here.]
</license>
<plugin
id="org.fortiss.tooling.base"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.fortiss.tooling.base.ui"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.fortiss.tooling.common"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.fortiss.tooling.common.ui"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.fortiss.tooling.graphicsGL"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.fortiss.tooling.graphicsGL.ui"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.fortiss.tooling.kernel"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.fortiss.tooling.kernel.ui"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.fortiss.tooling.spiderchart.ui"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
</feature>
features/org.fortiss.tooling.feature/pom.xml deleted 100644 → 0
View file @ ad352e22
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<name>Tooling Kernel 2.14-LATEST Feature</name>
<version>2.14.0-SNAPSHOT</version>
<artifactId>org.fortiss.tooling.feature</artifactId>
<groupId>org.fortiss.tooling</groupId>
<packaging>eclipse-feature</packaging>
<parent>
<groupId>org.fortiss.af3</groupId>
<artifactId>org.fortiss.af3.features</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
</project>
features/pom.xml
View file @ dc8a37e1
......@@ -24,7 +24,7 @@
</property>
</activation>
<modules>
<module>org.fortiss.af3.phoenix.feature</module>
<module>af3</module>
</modules>
</profile>
<profile>
......@@ -36,7 +36,7 @@
</property>
</activation>
<modules>
<module>org.fortiss.tooling.feature</module>
<module>tooling</module>
</modules>
</profile>
</profiles>
......
tooling @ cb7b11cd
Subproject commit cb7b11cddd6273f29dad02b6e05215e00bab0029
af3 @ 6211230f
Subproject commit 6211230fe83edf5d4a3fb3fe8368b3b138ee307f
products/org.fortiss.af3.phoenix.product/icons/dock_icons/README.md deleted 100644 → 0
View file @ ad352e22
**Instructions to create/modify the windows icon**
* Use GIMP to edit the file icon.xcf: It contains 7 layers of images,
one for each required icon.
* The list of required images can be found at
https://git.eclipse.org/c/equinox/rt.equinox.p2.git/tree/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/pde/internal/swt/tools/IconExe.java
Enumeration from 2019-02-12:
1. 256x256, 32 bit (RGB / Alpha Channel)
2. 48x48, 32 bit (RGB / Alpha Channel)
3. 32x32, 32 bit (RGB / Alpha Channel)
4. 16x16, 32 bit (RGB / Alpha Channel)
5. 48x48, 8 bit (256 colors)
6. 32x32, 8 bit (256 colors)
7. 16x16, 8 bit (256 colors)
* Each of these images is stored as a separate bmp file.
* In order to create a new image, open the af3_icon_squared.bmp file in Gimp and
scale it to the required size (upper folder). Store the result as a bmp file.
* Next, copy the layer and insert in the open "icon.xcf" file in GIMP.
* Select the newly created layer and "Add as new layer" (or similar).
* Name the layer appropriately (F2 key) and save the result.
* Export the result to a file named "icon.ico". In the export dialog, there are
two major things to look for:
* The bit sizes of the layers must correspond to the above enumeration (unordered).
* Each layer must be uncompressed.
products/org.fortiss.af3.phoenix.product/org.fortiss.af3.phoenix.product.product deleted 100644 → 0
View file @ ad352e22
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>
<product name="AutoFOCUS 3 - &quot;Phoenix&quot; 2.14" uid="org.fortiss.af3.phoenix.product" id="org.fortiss.af3.rcp.application.product" application="org.fortiss.af3.rcp.application.af3app" version="2.14.0.qualifier" useFeatures="true" includeLaunchers="true">
<aboutInfo>
<image path="icons/about.png"/>
<text>
AutoFOCUS 3 - &quot;Phoenix&quot;
Version: 2.14.0
Copyright 2011-2018 fortiss GmbH
Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an &quot;AS IS&quot; BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the specific language
governing permissions and limitations under the License.
</text>
</aboutInfo>
<configIni use="default">
</configIni>
<launcherArgs>
<programArgs>-Dosgi.framework.extensions=reference:file:org.eclipse.fx.osgi
</programArgs>
<vmArgsLin>-Xmx1024m -Xss32m
</vmArgsLin>
<vmArgsMac>-Xmx1024m -Xss32m -XstartOnFirstThread
-startup
../Eclipse/plugins/org.eclipse.equinox.launcher_1.3.0.v20130327-1440.jar
--launcher.library
../Eclipse/plugins/org.eclipse.equinox.launcher.cocoa.macosx.x86_64_1.1.200.v20140116-2212
-showsplash
</vmArgsMac>
<vmArgsWin>-Xmx512m -Xss16m
-Dorg.osgi.framework.os.name=win32
</vmArgsWin>
</launcherArgs>
<windowImages i16="icons/dock_icons/icon16.png" i32="icons/dock_icons/icon32.png" i48="icons/dock_icons/icon48.png" i64="icons/dock_icons/icon64.png" i128="icons/dock_icons/icon128.png"/>
<splash
location="org.fortiss.af3.rcp.application"
startupProgressRect="0,290,450,10"
startupMessageRect="0,275,450,15"
startupForegroundColor="35517B" />
<launcher name="autofocus3-phoenix">
<linux icon="icons/dock_icons/icon128.xpm"/>
<macosx icon="icons/dock_icons/icon128.icns"/>
<win useIco="true">
<ico path="icons/dock_icons/icon.ico"/>
<bmp/>
</win>
</launcher>
<vm>
<windows include="true">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11</windows>
</vm>
<license>
<url>http://www.apache.org/licenses/LICENSE-2.0</url>
<text>
Copyright 2011-2018 fortiss GmbH
Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an &quot;AS IS&quot; BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
</text>
</license>
<plugins>
</plugins>
<features>
<feature id="org.fortiss.af3.phoenix.feature" version="2.14.0.qualifier"/>
<feature id="org.eclipse.rcp"/>
<feature id="openjfx.standard.feature" version="11.0.0.201901231300"/>
<feature id="openjfx.swt.feature" version="11.0.0.201901231300"/>
<feature id="org.eclipse.fx.runtime.feature" version="3.5.0.201902110700"/>
</features>
<configurations>
<plugin id="org.apache.felix.scr" autoStart="true" startLevel="2" />
<plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="4" />
<plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="2" />
</configurations>
<preferencesInfo>
<targetfile overwrite="false"/>
</preferencesInfo>
<cssInfo>
</cssInfo>
</product>
products/org.fortiss.af3.phoenix.product/pom.xml deleted 100644 → 0
View file @ ad352e22
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<name>AF3 Phoenix 2.14 Product</name>
<version>2.14.0-SNAPSHOT</version>
<artifactId>org.fortiss.af3.phoenix.product</artifactId>
<packaging>eclipse-repository</packaging>
<parent>
<artifactId>org.fortiss.af3.products</artifactId>
<groupId>org.fortiss.af3.product</groupId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<build>
<plugins>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-p2-director-plugin</artifactId>
<version>${tycho-version}</version>
<executions>
<execution>
<!-- install the product using the p2 director -->
<id>default-materialize-products</id>
<goals>
<goal>materialize-products</goal>
</goals>
</execution>
<execution>
<!-- create zip file with the installed product -->
<id>archive-products</id>
<phase>verify</phase>
<goals>
<goal>archive-products</goal>
</goals>
</execution>
</executions>
<configuration>
<products>
<product>
<id>org.fortiss.af3.phoenix.product</id>
<rootFolder>AutoFOCUS3</rootFolder>
<rootFolders>
<linux>AutoFOCUS3</linux>
<macosx>AutoFOCUS3</macosx>
<windows>AutoFOCUS3</windows>
</rootFolders>
</product>
</products>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.8</version>
<executions>
<execution>
<id>patch-product</id>
<phase>package</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<target name="Final product patching">
<!-- Linux build -->
<echo message="Creating linux launcher script..."/>
<move file="${project.build.directory}/products/org.fortiss.af3.phoenix.product/linux/gtk/x86_64/AutoFOCUS3/autofocus3-phoenix" tofile="${project.build.directory}/products/org.fortiss.af3.phoenix.product/linux/gtk/x86_64/autofocus3/autofocus3-phoenix.bin"/>
<move file="${project.build.directory}/products/org.fortiss.af3.phoenix.product/linux/gtk/x86_64/AutoFOCUS3/autofocus3-phoenix.ini" tofile="${project.build.directory}/products/org.fortiss.af3.phoenix.product/linux/gtk/x86_64/autofocus3/autofocus3-phoenix.bin.ini"/>
<echo file="${project.build.directory}/products/org.fortiss.af3.phoenix.product/linux/gtk/x86_64/AutoFOCUS3/autofocus3-phoenix" append="false">
#!/bin/sh
LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:plugins/com.microsoft.z3_2.14.0.${buildQualifier}/lib/x64 ./autofocus3-phoenix.bin $$*
</echo>
<chmod perm="a+x" file="${project.build.directory}/products/org.fortiss.af3.phoenix.product/linux/gtk/x86_64/autofocus3/autofocus3-phoenix"/>
<!-- MacOS build -->
<echo message="Fixing MacOS build..."/>
<copy todir="${project.build.directory}/products/org.fortiss.af3.phoenix.product/macosx/cocoa/x86_64/AutoFOCUS3.app/Contents/MacOS/">
<fileset dir="${project.build.directory}/products/org.fortiss.af3.phoenix.product/macosx/cocoa/x86_64/AutoFOCUS3.app/Contents/Eclipse/plugins/com.microsoft.z3_2.14.0.${buildQualifier}/lib/x64/">
<include name="*.dylib"/>
</fileset>
</copy>
<copy file="${project.build.directory}/products/org.fortiss.af3.phoenix.product/macosx/cocoa/x86_64/AutoFOCUS3.app/Contents/Eclipse/autofocus3-phoenix.ini"
todir="${project.build.directory}/products/org.fortiss.af3.phoenix.product/macosx/cocoa/x86_64/AutoFOCUS3.app/Contents/MacOS/"/>
</target>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
products/pom.xml
View file @ dc8a37e1
......@@ -18,10 +18,8 @@
<!-- For fetching platform-specific artifacts -->
<repositories>
<repository>
<!-- Place more centrally and combine with af3 profile -->
<id>2018-12</id>
<layout>p2</layout>
<!-- In jenkins, the tooling update site must be copied to this location. -->
<url>https://download.eclipse.org/releases/2018-12</url>
</repository>
</repositories>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment