From 6006d65ce01e8f0852aadae8e5601f0e3dffce96 Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Tue, 10 May 2016 14:26:06 +0200 Subject: [PATCH] new ant kit using a custom launcher binary due to #265 --- main/ant-kit/assembly.xml | 6 ++ main/ant-kit/pom.xml | 10 ++++ main/ant-kit/src/main/resources/build.xml | 1 + .../fixed-binaries/linux-launcher-x64 | Bin 0 -> 10585 bytes .../fixed-binaries/linux-launcher-x86 | Bin 0 -> 7979 bytes .../src/main/resources/package/linux/postinst | 50 ++++++++++++++++ .../src/main/resources/package/linux/spec | 54 ++++++++++++++++++ 7 files changed, 121 insertions(+) create mode 100644 main/ant-kit/src/main/resources/fixed-binaries/linux-launcher-x64 create mode 100644 main/ant-kit/src/main/resources/fixed-binaries/linux-launcher-x86 create mode 100644 main/ant-kit/src/main/resources/package/linux/postinst create mode 100644 main/ant-kit/src/main/resources/package/linux/spec diff --git a/main/ant-kit/assembly.xml b/main/ant-kit/assembly.xml index afea7ec94..4ca4dfd66 100644 --- a/main/ant-kit/assembly.xml +++ b/main/ant-kit/assembly.xml @@ -14,6 +14,12 @@ libs + + target/fixed-binaries + false + fixed-binaries + 755 + target/package false diff --git a/main/ant-kit/pom.xml b/main/ant-kit/pom.xml index 2d908221d..cc3c15519 100644 --- a/main/ant-kit/pom.xml +++ b/main/ant-kit/pom.xml @@ -60,6 +60,16 @@ src/main/resources true + + fixed-binaries/** + + + + src/main/resources + false + + fixed-binaries/** + diff --git a/main/ant-kit/src/main/resources/build.xml b/main/ant-kit/src/main/resources/build.xml index 0ca9be55e..06dcfc257 100644 --- a/main/ant-kit/src/main/resources/build.xml +++ b/main/ant-kit/src/main/resources/build.xml @@ -50,6 +50,7 @@ + diff --git a/main/ant-kit/src/main/resources/fixed-binaries/linux-launcher-x64 b/main/ant-kit/src/main/resources/fixed-binaries/linux-launcher-x64 new file mode 100644 index 0000000000000000000000000000000000000000..bffda959ae26be7d7d31a393865a03c3a3e18953 GIT binary patch literal 10585 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 bd~vYJw2f56u&r!jXK+WWkl$)# `configure' +# * `abort-upgrade' +# * `abort-remove' `in-favour' +# +# * `abort-remove' +# * `abort-deconfigure' `in-favour' +# `removing' +# +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + +case "$1" in + configure) + echo Adding shortcut to the menu +SECONDARY_LAUNCHERS_INSTALL +APP_CDS_CACHE + xdg-desktop-menu install --novendor /opt/APPLICATION_FS_NAME/APPLICATION_LAUNCHER_FILENAME.desktop +FILE_ASSOCIATION_INSTALL + + rm /opt/APPLICATION_FS_NAME/APPLICATION_LAUNCHER_FILENAME + if [ $(uname -m) = "x86_64" ]; then + mv /opt/APPLICATION_FS_NAME/app/linux-launcher-x64 /opt/APPLICATION_FS_NAME/APPLICATION_LAUNCHER_FILENAME + else + mv /opt/APPLICATION_FS_NAME/app/linux-launcher-x86 /opt/APPLICATION_FS_NAME/APPLICATION_LAUNCHER_FILENAME + fi + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 diff --git a/main/ant-kit/src/main/resources/package/linux/spec b/main/ant-kit/src/main/resources/package/linux/spec new file mode 100644 index 000000000..b40f9224e --- /dev/null +++ b/main/ant-kit/src/main/resources/package/linux/spec @@ -0,0 +1,54 @@ +Summary: APPLICATION_SUMMARY +Name: APPLICATION_PACKAGE +Version: APPLICATION_VERSION +Release: 1 +License: APPLICATION_LICENSE_TYPE +Vendor: APPLICATION_VENDOR +Prefix: /opt +Provides: APPLICATION_PACKAGE +Requires: ld-linux.so.2 libX11.so.6 libXext.so.6 libXi.so.6 libXrender.so.1 libXtst.so.6 libasound.so.2 libc.so.6 libdl.so.2 libgcc_s.so.1 libm.so.6 libpthread.so.0 libthread_db.so.1 +Autoprov: 0 +Autoreq: 0 + +#avoid ARCH subfolder +%define _rpmfilename %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm + +#comment line below to enable effective jar compression +#it could easily get your package size from 40 to 15Mb but +#build time will substantially increase and it may require unpack200/system java to install +%define __jar_repack %{nil} + +%description +APPLICATION_DESCRIPTION + +%prep + +%build + +%install +rm -rf %{buildroot} +mkdir -p %{buildroot}/opt +cp -r %{_sourcedir}/APPLICATION_FS_NAME %{buildroot}/opt + +%files +APPLICATION_LICENSE_FILE +/opt/APPLICATION_FS_NAME + +%post +SECONDARY_LAUNCHERS_INSTALL +APP_CDS_CACHE +xdg-desktop-menu install --novendor /opt/APPLICATION_FS_NAME/APPLICATION_LAUNCHER_FILENAME.desktop +FILE_ASSOCIATION_INSTALL +rm /opt/APPLICATION_FS_NAME/APPLICATION_LAUNCHER_FILENAME +if [ $(uname -m) = "x86_64" ]; then + mv /opt/APPLICATION_FS_NAME/app/linux-launcher-x64 /opt/APPLICATION_FS_NAME/APPLICATION_LAUNCHER_FILENAME +else + mv /opt/APPLICATION_FS_NAME/app/linux-launcher-x86 /opt/APPLICATION_FS_NAME/APPLICATION_LAUNCHER_FILENAME +fi + +%preun +SECONDARY_LAUNCHERS_REMOVE +xdg-desktop-menu uninstall --novendor /opt/APPLICATION_FS_NAME/APPLICATION_LAUNCHER_FILENAME.desktop +FILE_ASSOCIATION_REMOVE + +%clean