diff --git a/bin/slphy.bat b/bin/slphy.bat index 9aec35898..b558bf220 100755 --- a/bin/slphy.bat +++ b/bin/slphy.bat @@ -52,7 +52,7 @@ goto fail :findJavaFromJavaHome set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe +set JAVA_EXE=%JAVA_HOME%\bin\java.exe if exist "%JAVA_EXE%" goto setLPHYLIB @@ -65,24 +65,26 @@ echo location of your Java installation. goto fail :setLPHYLIB -set LPHY_LIB=%APP_HOME%/../lib/ +set LPHY_LIB=%APP_HOME%..\lib echo set the LPHY_LIB to "%LPHY_LIB%" :execute @rem Setup the command line @rem Execute -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% -p %LPHY_LIB% -m lphystudio/lphystudio.app.simulator.SLPhy %* +set CMD="%JAVA_EXE%" %DEFAULT_JVM_OPTS% -p "%LPHY_LIB%" -m lphystudio/lphystudio.app.simulator.SLPhy %* +%CMD% :end @rem End local scope for the variables with windows NT shell if "%ERRORLEVEL%"=="0" goto mainEnd :fail -echo ERROR: fail to run -echo "%JAVA_EXE%" %DEFAULT_JVM_OPTS% -p %LPHY_LIB% -m lphystudio/lphystudio.app.simulator.SLPhy %* - +echo. +echo ERROR: fail to run the command +echo %CMD% +echo. +echo Get help from https://linguaphylo.github.io/setup :mainEnd if "%OS%"=="Windows_NT" endlocal -:omega diff --git a/build.gradle.kts b/build.gradle.kts index 145d09fc2..20f335eee 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -41,7 +41,7 @@ tasks.build {enabled = false} // Configures the sub-projects of this project. subprojects { group = "io.github.linguaphylo" - version = "1.4.2" //-SNAPSHOT" + version = "1.4.3" //-SNAPSHOT" val webSteam = "github.com/LinguaPhylo/linguaPhylo" val web = "https://${webSteam}" val homepage = "https://linguaphylo.github.io/" diff --git a/lphy-studio/lphystudio.xml b/lphy-studio/lphystudio.xml index d1bde4d9b..087f0efa6 100755 --- a/lphy-studio/lphystudio.xml +++ b/lphy-studio/lphystudio.xml @@ -1,7 +1,7 @@ lphystudio LPhyStudio - 1.4.2 + 1.4.3 ${build_project_directory}/../README.md ${build_project_directory}/../LICENSE @@ -145,12 +145,14 @@ - - Adding environmental path - LPHY_PATH - system - ${installdir} - + + + + + + + + ${installdir} Creating launcher @@ -164,15 +166,16 @@ - ${installdir}/src/lphy.icns 0 0 + 1 0 -Xms256m -Xmx4g -Dfile.encoding=UTF-8 -p lib -m lphystudio - 1.0.0.0 + ${installdir} + @@ -186,18 +189,31 @@ + + 1 0 1 - io.github.linguaphylo.LPhyStudioLauncher LPhyStudio DMG + Developer ID Application: Walter Xie + + + io.github.linguaphylo.LPhyStudioLauncher + + + + + 1.0.0.0 + ${installdir}/src/lphy.ico + LPhy Development Team + installdir - Installer.Parameter.installdir.description - Installer.Parameter.installdir.explanation + Installation Directory + Please specify the directory where ${project.fullName} will be installed. This directory will be the parent directory of the LPhy library path, $LPHY_LIB, required by LPhyBEAST. ${platform_install_prefix}/${product_shortname}-${product_version} 0 @@ -206,6 +222,41 @@ yes 0 30 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/lphy-studio/src/main/resources/lphy512x512.icns b/lphy-studio/src/main/resources/lphy512x512.icns new file mode 100644 index 000000000..e6bcb8508 Binary files /dev/null and b/lphy-studio/src/main/resources/lphy512x512.icns differ