# HG changeset patch
# User Yasumasa Suenaga <yasuenag@gmail.com>
# Date 1570239663 -32400
# Node ID c544d27e27c20b8913c49c91e335e273cbdb0429
# Parent  dd85c1cbc8c87d15c826754c1d507048ad22e6fc
Bug 3754: Could not bundle heapstats-cli launcher
Reviewed-by: ykubota
https://github.com/HeapStats/heapstats/pull/145

diff -r dd85c1cbc8c8 -r c544d27e27c2 .ignore
--- a/.ignore	Fri Sep 27 14:47:03 2019 +0900
+++ b/.ignore	Sat Oct 05 10:41:03 2019 +0900
@@ -24,8 +24,6 @@
 autom4te.cache/
 agent/attacher/dist/*.jar
 agent/attacher/heapstats-attacher
-analyzer/cli/heapstats-cli
-analyzer/fx/heapstats-analyzer
 *.o
 *.lo
 *.Po
diff -r dd85c1cbc8c8 -r c544d27e27c2 ChangeLog
--- a/ChangeLog	Fri Sep 27 14:47:03 2019 +0900
+++ b/ChangeLog	Sat Oct 05 10:41:03 2019 +0900
@@ -1,3 +1,7 @@
+2019-10-05 Yasumasa Suenaga <yasuenag@gmail.com>
+
+	* Bug 3754: Could not bundle heapstats-cli launcher
+
 2019-09-27 Yasumasa Suenaga <yasuenag@gmail.com>
 
 	* Bug 3752: Migrate to OpenJFX 13
diff -r dd85c1cbc8c8 -r c544d27e27c2 analyzer/cli/heapstats-cli
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/analyzer/cli/heapstats-cli	Sat Oct 05 10:41:03 2019 +0900
@@ -0,0 +1,3 @@
+#!/bin/sh
+DIR=`dirname $0`
+$DIR/java --module-path $DIR/../mods -m heapstats.cli/jp.co.ntt.oss.heapstats.cli.CliMain $@
diff -r dd85c1cbc8c8 -r c544d27e27c2 analyzer/cli/pom.xml
--- a/analyzer/cli/pom.xml	Fri Sep 27 14:47:03 2019 +0900
+++ b/analyzer/cli/pom.xml	Sat Oct 05 10:41:03 2019 +0900
@@ -257,6 +257,7 @@
             <properties>
                 <package.os.name>linux</package.os.name>
                 <jlink.argument>--strip-native-debug-symbols=exclude-debuginfo-files</jlink.argument>
+                <launcher.ext/>
             </properties>
         </profile>
         <profile>
@@ -269,6 +270,7 @@
             <properties>
                 <package.os.name>windows</package.os.name>
                 <jlink.argument/>
+                <launcher.ext>.bat</launcher.ext>
             </properties>
         </profile>
         <profile>
diff -r dd85c1cbc8c8 -r c544d27e27c2 analyzer/cli/src/main/assembly/distribution.xml
--- a/analyzer/cli/src/main/assembly/distribution.xml	Fri Sep 27 14:47:03 2019 +0900
+++ b/analyzer/cli/src/main/assembly/distribution.xml	Sat Oct 05 10:41:03 2019 +0900
@@ -20,8 +20,7 @@
             <directory>${pom.basedir}</directory>
             <outputDirectory>${file.separator}bin</outputDirectory>
             <includes>
-                <include>heapstats-cli</include>
-                <include>heapstats-cli.bat</include>
+                <include>heapstats-cli${launcher.ext}</include>
             </includes>
         </fileSet>
         <fileSet>
diff -r dd85c1cbc8c8 -r c544d27e27c2 analyzer/fx/pom.xml
--- a/analyzer/fx/pom.xml	Fri Sep 27 14:47:03 2019 +0900
+++ b/analyzer/fx/pom.xml	Sat Oct 05 10:41:03 2019 +0900
@@ -291,6 +291,7 @@
             <properties>
                 <package.os.name>linux</package.os.name>
                 <jlink.argument>--strip-native-debug-symbols=exclude-debuginfo-files</jlink.argument>
+                <launcher.ext/>
             </properties>
         </profile>
         <profile>
@@ -303,6 +304,7 @@
             <properties>
                 <package.os.name>windows</package.os.name>
                 <jlink.argument/>
+                <launcher.ext>.bat</launcher.ext>
             </properties>
         </profile>
         <profile>
diff -r dd85c1cbc8c8 -r c544d27e27c2 analyzer/fx/src/main/assembly/distribution.xml
--- a/analyzer/fx/src/main/assembly/distribution.xml	Fri Sep 27 14:47:03 2019 +0900
+++ b/analyzer/fx/src/main/assembly/distribution.xml	Sat Oct 05 10:41:03 2019 +0900
@@ -39,8 +39,7 @@
             <directory>${pom.basedir}</directory>
             <outputDirectory>${file.separator}bin</outputDirectory>
             <includes>
-                <include>heapstats-analyzer</include>
-                <include>heapstats-analyzer.bat</include>
+                <include>heapstats-analyzer${launcher.ext}</include>
             </includes>
         </fileSet>
         <fileSet>