OMGeeky/ATCS
1
0
Fork 0
mirror of https://github.com/OMGeeky/ATCS.git synced 2026-02-13 21:19:09 +01:00
Code Issues Packages Projects Releases 15 Wiki Activity

Refactor package script to extract library files directly to TEMP_DIR and simplify classpath

Browse Source
This commit is contained in:
OMGeeky
2025-02-15 00:28:16 +01:00
parent 8d01716d93
commit 30bef443d5
1 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
packaging/package.sh
View File

@@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
# Script to build ATContentStudio.jar, replicating IntelliJ artifact definition # Script to build ATContentStudio.jar, replicating IntelliJ artifact definition (EXTRACT LIBS)
# Linux and Windows compatible - NO GRADLE - Includes extra source code folders - FIXED SUBDIRS # Linux and Windows compatible - NO GRADLE - Includes extra source code folders - EXTRACT LIBS
# --- Platform Detection --- # --- Platform Detection ---
if [ "$1" = "-windows" ]; then if [ "$1" = "-windows" ]; then
@@ -55,25 +55,23 @@ echo "Removing tmp folder"
rm -rf "${TEMP_DIR}" rm -rf "${TEMP_DIR}"
echo "Recreating tmp folder" echo "Recreating tmp folder"
mkdir -p "${TEMP_DIR}/com/gpl/rpg/atcontentstudio" # create package structure in temp dir mkdir -p "${TEMP_DIR}/com/gpl/rpg/atcontentstudio" # create package structure in temp dir
mkdir -p "${TEMP_DIR}/lib" # NO mkdir -p "${TEMP_DIR}/lib" - we are extracting to TEMP_DIR root now
# --- Copy manifest to temp folder for editing --- # --- Copy manifest to temp folder for editing ---
echo "Copying manifest to temp folder" echo "Copying manifest to temp folder"
cp "${MANIFEST_LOCATION}" "${TEMP_DIR}" cp "${MANIFEST_LOCATION}" "${TEMP_DIR}"
MANIFEST_LOCATION="${TEMP_DIR}/Manifest.txt" # Update MANIFEST_LOCATION to the temp one MANIFEST_LOCATION="${TEMP_DIR}/Manifest.txt" # Update MANIFEST_LOCATION to the temp one
# --- Copy lib files from standard lib folder --- # --- **EXTRACT lib files directly to TEMP_DIR** ---
echo 'Copying lib files from standard lib folder' echo 'Extracting lib files to TEMP_DIR'
mkdir -p "${TEMP_DIR}/lib/" # Ensure lib dir exists in temp
for LIB in "${LIBRARIES[@]}"; do for LIB in "${LIBRARIES[@]}"; do
echo "Copying library: ${LIB}" echo "Extracting library: ${LIB}"
cp "${LIB_BASE_DIR}/${LIB}" "${TEMP_DIR}/lib/" unzip -o "${LIB_BASE_DIR}/${LIB}" -d "${TEMP_DIR}" # Extract JAR contents to TEMP_DIR root
done done
# --- Set ClassPath --- # --- Set ClassPath ---
echo 'Setting class path' echo 'Setting class path'
CP="lib/*${PATH_SEPARATOR}${SOURCE_BASE_DIR}" # Platform-dependent classpath separator CP="${TEMP_DIR}${PATH_SEPARATOR}${SOURCE_BASE_DIR}" # Classpath is simplified - only source path needed for compilation
# --- **Construct Source Path for Compilation** --- # --- **Construct Source Path for Compilation** ---
SOURCE_PATH="${SOURCE_BASE_DIR}" # Start with the standard source path SOURCE_PATH="${SOURCE_BASE_DIR}" # Start with the standard source path
@@ -100,9 +98,11 @@ if [ $? -ne 0 ]; then
exit 1 exit 1
fi fi
# --- Add Class-Path to Manifest --- # --- Copy res folder to temp folder ---
echo "Adding Class-Path to Manifest" cp "${ATCS_SOURCE_DIR}"/res/* "${TEMP_DIR}/"
#echo "Class-Path: . lib/*" >>"${MANIFEST_LOCATION}" # Add standard lib path to manifest mkdir -p "${TEMP_DIR}/com/gpl/rpg/atcontentstudio/img"
cp -r "${ATCS_SOURCE_DIR}"/src/com/gpl/rpg/atcontentstudio/img/* "${TEMP_DIR}/com/gpl/rpg/atcontentstudio/img/"
# --- Create JAR file --- # --- Create JAR file ---
echo "" echo ""
@@ -110,6 +110,7 @@ echo "Creating jar at location: ${JAR_LOCATION}"
cd "${TEMP_DIR}" || exit # Change to temp dir for JAR command cd "${TEMP_DIR}" || exit # Change to temp dir for JAR command
# JAR command WITHOUT lib directory
jar cfm "${OUTPUT_JAR_DIR}/ATCS.jar" "${MANIFEST_LOCATION}" -C . . jar cfm "${OUTPUT_JAR_DIR}/ATCS.jar" "${MANIFEST_LOCATION}" -C . .
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
@@ -126,7 +127,7 @@ echo "Done creating jar at ${OUTPUT_JAR_DIR}/ATCS.jar"
if [ "$PLATFORM" = "LINUX" ]; then if [ "$PLATFORM" = "LINUX" ]; then
cd "${OUTPUT_JAR_DIR}" || exit cd "${OUTPUT_JAR_DIR}" || exit
echo "Creating archive" echo "Creating archive"
tar caf "ATCS_${VERSION}.tar.gz" * # archive the 'common' folder which now contains the JAR and libs tar caf "ATCS_${VERSION}.tar.gz" ./* # archive the 'common' folder which now contains the JAR and libs
echo "Created archive at ${OUTPUT_JAR_DIR}/ATCS_${VERSION}.tar.gz" echo "Created archive at ${OUTPUT_JAR_DIR}/ATCS_${VERSION}.tar.gz"
cd "${PACKAGING_DIR}" || exit cd "${PACKAGING_DIR}" || exit
else else