re-enable XML validation in TMXMapReader and update package script to copy resources recursively

This commit is contained in:
OMGeeky
2025-02-15 01:47:11 +01:00
parent 9097b97316
commit 42f1c87278
2 changed files with 5 additions and 5 deletions

View File

@@ -821,8 +821,6 @@ public class TMXMapReader
factory.setIgnoringComments(true);
factory.setIgnoringElementContentWhitespace(true);
factory.setExpandEntityReferences(false);
factory.setValidating(false);
factory.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false);
DocumentBuilder builder = factory.newDocumentBuilder();
builder.setEntityResolver(entityResolver);
InputSource insrc = new InputSource(in);

View File

@@ -98,10 +98,12 @@ if [ $? -ne 0 ]; then
exit 1
fi
# --- Copy res folder to temp folder ---
cp "${ATCS_SOURCE_DIR}"/res/* "${TEMP_DIR}/"
# --- Copy res stuff to temp folder ---
cp -r "${ATCS_SOURCE_DIR}"/res/* "${TEMP_DIR}/"
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/"
mkdir -p "${TEMP_DIR}/tiled/io/resources/"
cp -r "${ATCS_SOURCE_DIR}"/src/com/gpl/rpg/atcontentstudio/img/* "${TEMP_DIR}/com/gpl/rpg/atcontentstudio/img/" # some icons
cp -r "${ATCS_SOURCE_DIR}"/hacked-libtiled/tiled/io/resources/* "${TEMP_DIR}/tiled/io/resources/" # dtd file for tmx maps
# --- Create JAR file ---