diff --git a/buildSrc/src/main/groovy/io.deephaven.java-conventions.gradle b/buildSrc/src/main/groovy/io.deephaven.java-conventions.gradle index 8146ab7549c..03cae47335d 100644 --- a/buildSrc/src/main/groovy/io.deephaven.java-conventions.gradle +++ b/buildSrc/src/main/groovy/io.deephaven.java-conventions.gradle @@ -175,12 +175,17 @@ plugins.withType(ApplicationPlugin) { } } tasks.withType(CreateStartScripts).configureEach { - def windowsStartScript = resources.text.fromUri(getClass().classLoader.getResource('windowsStartScript.txt')) def unixStartScript = resources.text.fromUri(getClass().classLoader.getResource('unixStartScript.txt')) - inputs.files windowsStartScript inputs.files unixStartScript - windowsStartScriptGenerator.template = windowsStartScript unixStartScriptGenerator.template = unixStartScript + // For now we only modify the *nix script, as the windows .bat file doesn't seem to work properly anyway, + // and we don't yet have a requirement for it. + windowsStartScriptGenerator.template = resources.text.fromString("echo Sorry, Windows .bat is not currently supported, please use WSL2\nexit 1") + +// def windowsStartScript = resources.text.fromUri(getClass().classLoader.getResource('windowsStartScript.txt')) +// inputs.files windowsStartScript +// windowsStartScriptGenerator.template = windowsStartScript + // Note that we don't call c2ExcludesJvmArgs() at this time, there is no way to template those strings. // Instead, we hard code the expected paths in the above templates to match the path lib/dh-compiler-directives.txt // defaultJvmOpts += c2ExcludesJvmArgs(c2ExcludesFile.singleFile.path) diff --git a/buildSrc/src/main/resources/windowsStartScript.txt b/buildSrc/src/main/resources/windowsStartScript.txt deleted file mode 100644 index 78335c78f0b..00000000000 --- a/buildSrc/src/main/resources/windowsStartScript.txt +++ /dev/null @@ -1,93 +0,0 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem - -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem ${applicationName} startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=.\ - -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME%${appHomeRelativePath} - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and ${optsEnvironmentVar} to pass JVM options to this script. -set DEFAULT_JVM_OPTS=${defaultJvmOpts} - -@rem Customization for deephaven-core to reference a compiler directives file -set DEFAULT_JVM_OPTS=%DEFAULT_JVM_OPTS% -XX:+UnlockDiagnosticVMOptions "-XX:CompilerDirectivesFile=%APP_HOME%\lib\dh-compiler-directives.txt" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto execute - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:execute -@rem Setup the command line - -set CLASSPATH=$classpath -<% if ( mainClassName.startsWith('--module ') ) { %>set MODULE_PATH=$modulePath<% } %> - -@rem Execute ${applicationName} -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %${optsEnvironmentVar}% <% if ( appNameSystemProperty ) { %>"-D${appNameSystemProperty}=%APP_BASE_NAME%"<% } %> -classpath "%CLASSPATH%" <% if ( mainClassName.startsWith('--module ') ) { %>--module-path "%MODULE_PATH%" <% } %>${mainClassName} %* - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable ${exitEnvironmentVar} if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%${exitEnvironmentVar}%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega