From e521a25dd5bf27644016c2606ea8b771f7dc6e1b Mon Sep 17 00:00:00 2001 From: RPJosh Date: Fri, 1 Apr 2022 16:18:51 +0200 Subject: [PATCH] Change directory structure --- .gitignore | 69 ++++++- .../tk.rpjosh.installer/.project => .project | 0 Program/.gitignore | 57 ------ Program/tk.rpjosh.installer/.classpath | 32 ---- Program/tk.rpjosh.installer/.gitattributes | 6 - Program/tk.rpjosh.installer/.gitignore | 5 - .../build.gradle => build.gradle | 0 .../wrapper/gradle-wrapper.jar | Bin .../wrapper/gradle-wrapper.properties | 0 .../tk.rpjosh.installer/gradlew => gradlew | 0 .../gradlew.bat => gradlew.bat | 178 +++++++++--------- .../settings.gradle => settings.gradle | 0 .../main/java/tk/rpjosh/installer/Data.java | 0 .../tk/rpjosh/installer/InstallConfig.java | 0 .../java/tk/rpjosh/installer/Installer.java | 0 .../java/tk/rpjosh/installer/Library.java | 0 .../tk/rpjosh/installer/RunInConsole.java | 0 .../java/tk/rpjosh/installer/LibraryTest.java | 0 18 files changed, 157 insertions(+), 190 deletions(-) rename Program/tk.rpjosh.installer/.project => .project (100%) mode change 100644 => 100755 delete mode 100644 Program/.gitignore delete mode 100644 Program/tk.rpjosh.installer/.classpath delete mode 100644 Program/tk.rpjosh.installer/.gitattributes delete mode 100644 Program/tk.rpjosh.installer/.gitignore rename Program/tk.rpjosh.installer/build.gradle => build.gradle (100%) rename {Program/tk.rpjosh.installer/gradle => gradle}/wrapper/gradle-wrapper.jar (100%) rename {Program/tk.rpjosh.installer/gradle => gradle}/wrapper/gradle-wrapper.properties (100%) rename Program/tk.rpjosh.installer/gradlew => gradlew (100%) rename Program/tk.rpjosh.installer/gradlew.bat => gradlew.bat (96%) rename Program/tk.rpjosh.installer/settings.gradle => settings.gradle (100%) rename {Program/tk.rpjosh.installer/src => src}/main/java/tk/rpjosh/installer/Data.java (100%) rename {Program/tk.rpjosh.installer/src => src}/main/java/tk/rpjosh/installer/InstallConfig.java (100%) rename {Program/tk.rpjosh.installer/src => src}/main/java/tk/rpjosh/installer/Installer.java (100%) rename {Program/tk.rpjosh.installer/src => src}/main/java/tk/rpjosh/installer/Library.java (100%) rename {Program/tk.rpjosh.installer/src => src}/main/java/tk/rpjosh/installer/RunInConsole.java (100%) rename {Program/tk.rpjosh.installer/src => src}/test/java/tk/rpjosh/installer/LibraryTest.java (100%) diff --git a/.gitignore b/.gitignore index 5a401cc..8c01270 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,69 @@ ## Release Folder ## -/01_Publish/ \ No newline at end of file +[Rr]elease/ + +# Eclipse # +.metadata +bin/ +tmp/ +*.tmp +*.bak +*.swp +*~.nib +local.properties +.settings/ +.loadpath +.recommenders + +# Eclipse Core +#.project # keep project file + +# External tool builders +.externalToolBuilders/ + +# Locally stored "Eclipse launch configurations" +*.launch + +# PyDev specific (Python IDE for Eclipse) +*.pydevproject + +# CDT-specific (C/C++ Development Tooling) +.cproject + +# CDT- autotools +.autotools + +# Java annotation processor (APT) +.factorypath + +# PDT-specific (PHP Development Tools) +.buildpath + +# sbteclipse plugin +.target + +# Tern plugin +.tern-project + +# TeXlipse plugin +.texlipse + +# STS (Spring Tool Suite) +.springBeans + +# Code Recommenders +.recommenders/ + +# Annotation Processing +.apt_generated/ +.apt_generated_test/ + +# Scala IDE specific (Scala & Java development for Eclipse) +.cache-main +.scala_dependencies +.worksheet + +# JDT-specific (Eclipse Java Development Tools) +.classpath + +# Gradle +.gradle diff --git a/Program/tk.rpjosh.installer/.project b/.project old mode 100644 new mode 100755 similarity index 100% rename from Program/tk.rpjosh.installer/.project rename to .project diff --git a/Program/.gitignore b/Program/.gitignore deleted file mode 100644 index f3678e4..0000000 --- a/Program/.gitignore +++ /dev/null @@ -1,57 +0,0 @@ -# Eclipse # -.metadata -bin/ -tmp/ -*.tmp -*.bak -*.swp -*~.nib -local.properties -.settings/ -.loadpath -.recommenders - -# External tool builders -.externalToolBuilders/ - -# Locally stored "Eclipse launch configurations" -*.launch - -# PyDev specific (Python IDE for Eclipse) -*.pydevproject - -# CDT-specific (C/C++ Development Tooling) -.cproject - -# CDT- autotools -.autotools - -# Java annotation processor (APT) -.factorypath - -# PDT-specific (PHP Development Tools) -.buildpath - -# sbteclipse plugin -.target - -# Tern plugin -.tern-project - -# TeXlipse plugin -.texlipse - -# STS (Spring Tool Suite) -.springBeans - -# Code Recommenders -.recommenders/ - -# Annotation Processing -.apt_generated/ -.apt_generated_test/ - -# Scala IDE specific (Scala & Java development for Eclipse) -.cache-main -.scala_dependencies -.worksheet diff --git a/Program/tk.rpjosh.installer/.classpath b/Program/tk.rpjosh.installer/.classpath deleted file mode 100644 index 66f8050..0000000 --- a/Program/tk.rpjosh.installer/.classpath +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Program/tk.rpjosh.installer/.gitattributes b/Program/tk.rpjosh.installer/.gitattributes deleted file mode 100644 index 00a51af..0000000 --- a/Program/tk.rpjosh.installer/.gitattributes +++ /dev/null @@ -1,6 +0,0 @@ -# -# https://help.github.com/articles/dealing-with-line-endings/ -# -# These are explicitly windows files and should use crlf -*.bat text eol=crlf - diff --git a/Program/tk.rpjosh.installer/.gitignore b/Program/tk.rpjosh.installer/.gitignore deleted file mode 100644 index 1b6985c..0000000 --- a/Program/tk.rpjosh.installer/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -# Ignore Gradle project-specific cache directory -.gradle - -# Ignore Gradle build output directory -build diff --git a/Program/tk.rpjosh.installer/build.gradle b/build.gradle similarity index 100% rename from Program/tk.rpjosh.installer/build.gradle rename to build.gradle diff --git a/Program/tk.rpjosh.installer/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from Program/tk.rpjosh.installer/gradle/wrapper/gradle-wrapper.jar rename to gradle/wrapper/gradle-wrapper.jar diff --git a/Program/tk.rpjosh.installer/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from Program/tk.rpjosh.installer/gradle/wrapper/gradle-wrapper.properties rename to gradle/wrapper/gradle-wrapper.properties diff --git a/Program/tk.rpjosh.installer/gradlew b/gradlew similarity index 100% rename from Program/tk.rpjosh.installer/gradlew rename to gradlew diff --git a/Program/tk.rpjosh.installer/gradlew.bat b/gradlew.bat similarity index 96% rename from Program/tk.rpjosh.installer/gradlew.bat rename to gradlew.bat index 107acd3..ac1b06f 100644 --- a/Program/tk.rpjosh.installer/gradlew.bat +++ b/gradlew.bat @@ -1,89 +1,89 @@ -@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 Gradle 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% - -@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 GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@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=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega +@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 Gradle 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% + +@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 GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@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=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/Program/tk.rpjosh.installer/settings.gradle b/settings.gradle similarity index 100% rename from Program/tk.rpjosh.installer/settings.gradle rename to settings.gradle diff --git a/Program/tk.rpjosh.installer/src/main/java/tk/rpjosh/installer/Data.java b/src/main/java/tk/rpjosh/installer/Data.java similarity index 100% rename from Program/tk.rpjosh.installer/src/main/java/tk/rpjosh/installer/Data.java rename to src/main/java/tk/rpjosh/installer/Data.java diff --git a/Program/tk.rpjosh.installer/src/main/java/tk/rpjosh/installer/InstallConfig.java b/src/main/java/tk/rpjosh/installer/InstallConfig.java similarity index 100% rename from Program/tk.rpjosh.installer/src/main/java/tk/rpjosh/installer/InstallConfig.java rename to src/main/java/tk/rpjosh/installer/InstallConfig.java diff --git a/Program/tk.rpjosh.installer/src/main/java/tk/rpjosh/installer/Installer.java b/src/main/java/tk/rpjosh/installer/Installer.java similarity index 100% rename from Program/tk.rpjosh.installer/src/main/java/tk/rpjosh/installer/Installer.java rename to src/main/java/tk/rpjosh/installer/Installer.java diff --git a/Program/tk.rpjosh.installer/src/main/java/tk/rpjosh/installer/Library.java b/src/main/java/tk/rpjosh/installer/Library.java similarity index 100% rename from Program/tk.rpjosh.installer/src/main/java/tk/rpjosh/installer/Library.java rename to src/main/java/tk/rpjosh/installer/Library.java diff --git a/Program/tk.rpjosh.installer/src/main/java/tk/rpjosh/installer/RunInConsole.java b/src/main/java/tk/rpjosh/installer/RunInConsole.java similarity index 100% rename from Program/tk.rpjosh.installer/src/main/java/tk/rpjosh/installer/RunInConsole.java rename to src/main/java/tk/rpjosh/installer/RunInConsole.java diff --git a/Program/tk.rpjosh.installer/src/test/java/tk/rpjosh/installer/LibraryTest.java b/src/test/java/tk/rpjosh/installer/LibraryTest.java similarity index 100% rename from Program/tk.rpjosh.installer/src/test/java/tk/rpjosh/installer/LibraryTest.java rename to src/test/java/tk/rpjosh/installer/LibraryTest.java