ExternalVendorCode/trick
1
0
Fork 0
mirror of https://github.com/nasa/trick.git synced 2024-12-18 20:57:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

apps can find trick_icon, minor change to configure #938

Browse Source
This commit is contained in:
Scott Fennell 2020-01-30 09:40:17 -06:00
parent 1b43a82f53
commit 78ebc6fda3
5 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
autoconf/configure.ac
View File

@ -167,8 +167,8 @@ AC_DEFUN([AX_JAVA],[
[AC_MSG_RESULT([no]) [AC_MSG_RESULT([no])
AC_MSG_ERROR([Trick requires javac version >= 1.8]) AC_MSG_ERROR([Trick requires javac version >= 1.8])
]) ])
AC_PATH_PROG(MVN, mvn, mvn) AC_PATH_PROG(MVN, mvn, nomvn)
AS_IF([test "$ac_cv_path_MVN" = "nomvn"],AC_MSG_ERROR([could not find mvn]),[]) AS_IF([test "$ac_cv_path_MVN" = "nomvn"],AC_MSG_ERROR([could not find maven]),[])
],[]) ],[])
]) ])

4
configure vendored
View File

@ -6137,7 +6137,7 @@ done
done done
IFS=$as_save_IFS IFS=$as_save_IFS
test -z "$ac_cv_path_MVN" && ac_cv_path_MVN="mvn" test -z "$ac_cv_path_MVN" && ac_cv_path_MVN="nomvn"
;; ;;
esac esac
fi fi
@ -6152,7 +6152,7 @@ fi
if test "$ac_cv_path_MVN" = "nomvn"; then : if test "$ac_cv_path_MVN" = "nomvn"; then :
as_fn_error $? "could not find mvn" "$LINENO" 5 as_fn_error $? "could not find maven" "$LINENO" 5
fi fi
fi fi

2
libexec/trick/pm/launch_java.pm
View File

@ -36,7 +36,7 @@ sub launch_java($$) {
if ( $^O eq "darwin" ) { if ( $^O eq "darwin" ) {
$command .= "\\ $command .= "\\
-Xdock:name=\"$name\" \\ -Xdock:name=\"$name\" \\
-Xdock:icon=$java_dir/resources/trick_icon.png \\ -Xdock:icon=$java_dir/build/classes/common/resources/trick_icon.png \\
-Djava.net.preferIPv4Stack=true \\" ; -Djava.net.preferIPv4Stack=true \\" ;
} }

2
libexec/trick/vc
View File

@ -16,7 +16,7 @@ if ( ! exists $ENV{TRICK_HOME} ) {
if ( $^O eq "darwin" ) { if ( $^O eq "darwin" ) {
$command = "java -classpath $ENV{TRICK_HOME}/bin/java/dist/*:$ENV{TRICK_HOME}/bin/java/lib/* \\ $command = "java -classpath $ENV{TRICK_HOME}/bin/java/dist/*:$ENV{TRICK_HOME}/bin/java/lib/* \\
-Xdock:name=\"Variable Counter\" \\ -Xdock:name=\"Variable Counter\" \\
-Xdock:icon=$ENV{TRICK_HOME}/bin/java/resources/trick_icon.png \\ -Xdock:icon=$ENV{TRICK_HOME}/libexec/trick/java/build/classes/common/resources/trick_icon.png \\
trick.vc.VariableCounter " . join (" " , @ARGV) ; trick.vc.VariableCounter " . join (" " , @ARGV) ;
} else { } else {
$command = "java -cp $ENV{TRICK_HOME}/bin/java/dist/*:$ENV{TRICK_HOME}/bin/java/lib/* trick.vc.VariableCounter " . join (" " , @ARGV) ; $command = "java -cp $ENV{TRICK_HOME}/bin/java/dist/*:$ENV{TRICK_HOME}/bin/java/lib/* trick.vc.VariableCounter " . join (" " , @ARGV) ;

5
trick_source/java/Makefile
View File

@ -1,6 +1,6 @@
TRICK_HOME := $(abspath $(dir $(lastword $(MAKEFILE_LIST)))../..) TRICK_HOME := $(abspath $(dir $(lastword $(MAKEFILE_LIST)))../..)
all: ${TRICK_HOME}/libexec/trick/java/build all: ${TRICK_HOME}/libexec/trick/java/build resources
@echo "Java build successful" @echo "Java build successful"
${TRICK_HOME}/libexec/trick/java/build: ${TRICK_HOME}/libexec/trick/java/build:
@ -11,3 +11,6 @@ javadoc:
clean: clean:
mvn clean mvn clean
resources: ${RESOURCES_DIR}/trick_icon.png: ${SRC_DIR}/trick/common/resources/trick_icon.png ${RESOURCES_DIR}
@cp $< $@