OMGeeky/ATCS
1
0
Fork 0
mirror of https://github.com/OMGeeky/ATCS.git synced 2025-12-26 23:57:25 +01:00
Code Issues Packages Projects Releases 15 Wiki Activity

Fix package script to construct source path and compile all Java files from specified directories

Browse Source
This commit is contained in:
OMGeeky
2025-02-14 23:49:00 +01:00
parent 0cddbb04e9
commit fce5cd71ff
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
packaging/package.sh
View File

@@ -1,7 +1,7 @@
#!/bin/bash
# Script to build ATContentStudio.jar, replicating IntelliJ artifact definition
# Linux and Windows compatible - NO GRADLE - Includes extra source code folders
# Linux and Windows compatible - NO GRADLE - Includes extra source code folders - FIXED SUBDIRS
# --- Platform Detection ---
if [ "$1" = "-windows" ]; then
@@ -74,15 +74,12 @@ done
echo 'Setting class path'
CP="lib/*${PATH_SEPARATOR}${SOURCE_BASE_DIR}" # Platform-dependent classpath separator
# --- **Extend Class Path for Compilation** ---
SOURCE_PATH="" # Start with the standard source path
# --- **Construct Source Path for Compilation** ---
SOURCE_PATH="${SOURCE_BASE_DIR}" # Start with the standard source path
for EXTRA_SOURCE_DIR in "${EXTRA_SOURCE_DIRS[@]}"; do
SOURCE_PATH="${SOURCE_PATH}${PATH_SEPARATOR}${ATCS_SOURCE_DIR}/${EXTRA_SOURCE_DIR}" # Add extra source dirs
done
SOURCE_PATH="${SOURCE_PATH:${#PATH_SEPARATOR}}" # Remove first separator
CP="${CP}${PATH_SEPARATOR}${SOURCE_PATH}" # Add source path to classpath (needed for some cases)
echo "ClassPath: ${CP}"
echo "SourcePath: ${SOURCE_PATH}"
@@ -90,7 +87,12 @@ echo ""
# --- Build Java classes ---
echo 'Building java classes'
javac -cp "$CP" -sourcepath "${SOURCE_PATH}" -d "${TEMP_DIR}" "${SOURCE_BASE_DIR}"/com/gpl/rpg/**/*.java
# Find all java files in source directories and compile them
SOURCE_FILES=$(find "${SOURCE_BASE_DIR}" "${ATCS_SOURCE_DIR}/hacked-libtiled" "${ATCS_SOURCE_DIR}/minify" "${ATCS_SOURCE_DIR}/siphash-zackehh/src/main/java" -name "*.java" -print)
javac -cp "$CP" -sourcepath "${SOURCE_PATH}" -d "${TEMP_DIR}" $SOURCE_FILES
echo "javac -cp \"${CP}\" -sourcepath \"${SOURCE_PATH}\" -d \"${TEMP_DIR}\" $SOURCE_FILES"
if [ $? -ne 0 ]; then