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

Broken oss win package (8.x) #1204

Merged
merged 3 commits into from
Sep 11, 2023
Merged
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
<id>oss</id>
<formats>
<format>zip</format>
</formats>
<fileSets>
<!-- Equinox server base content -->
<fileSet>
<directory>${win.product.path}/configuration</directory>
<outputDirectory>configuration</outputDirectory>
</fileSet>
<fileSet>
<directory>${win.product.path}/plugins</directory>
<outputDirectory>plugins</outputDirectory>
<excludes>
<exclude>org.eclipse.equinox.launcher.*</exclude>
</excludes>
</fileSet>
<fileSet>
<directory>${win.product.path}/plugins</directory>
<outputDirectory>plugins</outputDirectory>
<includes>
<include>org.eclipse.justj.openjdk.hotspot.jre.full.win32.x86_64_*</include>
<include>org.eclipse.justj.openjdk.hotspot.jre.full.win32.x86_64_*/**/*</include>
</includes>
</fileSet>
<!-- Common files -->
<fileSet>
<directory>${project.basedir}/assembly/common</directory>
<outputDirectory></outputDirectory>
<excludes>
<!-- Exclude all *.sh file from win package -->
<exclude>**/*.sh</exclude>
</excludes>
</fileSet>
<!-- Copy release files from the ROOT of the repository -->
<fileSet>
<directory>${project.basedir}/../../</directory>
<outputDirectory>/</outputDirectory>
<includes>
<include>README*</include>
<include>LICENSE*</include>
<include>NOTICE*</include>
</includes>
</fileSet>
</fileSets>
<!-- Copy extra dependencies -->
<dependencySets>
<dependencySet>
<useStrictFiltering>true</useStrictFiltering>
<includes>
<include>org.semanticweb.elk:elk-protege</include>
</includes>
<outputDirectory>plugins</outputDirectory>
</dependencySet>
</dependencySets>
</assembly>
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
<id>oss</id>
<formats>
<format>zip</format>
<format>tar.gz</format>
<format>dir</format> <!-- Required for packaging to RPM -->
</formats>
Expand All @@ -29,6 +28,8 @@
<!-- Exclude all *.sh file, as we will add 755 permission later during
copy -->
<exclude>**/*.sh</exclude>
<!-- Exclude all *.bat files from linux packages -->
<exclude>**/*.bat</exclude>
</excludes>
</fileSet>
<!-- Copy *.sh from common folder -->
Expand Down
14 changes: 13 additions & 1 deletion releng/com.b2international.snowowl.server.update/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
<product.id>com.b2international.snowowl.server</product.id>
<so.products.directory>${products.directory}/${product.id}</so.products.directory>
<linux.product.path>${so.products.directory}/linux/gtk/x86_64/${product.rootFolder}</linux.product.path>
<win.product.path>${so.products.directory}/win32/win32/x86_64/${product.rootFolder}</win.product.path>
</properties>

<dependencies>
Expand Down Expand Up @@ -56,7 +57,7 @@
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
<id>package-oss</id>
<id>package-oss-unix</id>
<phase>package</phase>
<goals>
<goal>single</goal>
Expand All @@ -67,6 +68,17 @@
<tarLongFileMode>gnu</tarLongFileMode>
</configuration>
</execution>
<execution>
<id>package-oss-win</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<workDirectory>${project.build.directory}/assembly/oss</workDirectory>
<descriptor>${basedir}/assembly/oss-win.xml</descriptor>
</configuration>
</execution>
</executions>
</plugin>
<!-- create RPM -->
Expand Down