Skip to content

Commit

Permalink
fix: Fix build process issues in Maven and Make build configurations (#…
Browse files Browse the repository at this point in the history
…138)

This pull request addresses critical issues in the build processes for both Maven and Make, ensuring that resource directories and manifest files are correctly included during packaging. These changes ensure that the build outputs (JAR files) are structured as expected and include all necessary resources and metadata.

* 106d630 - fix(maven): Include manifest in source JAR process
* d0cff29 - fix(make): Include resource dirs in JAR build process

Signed-off-by: Ryuu Mitsuki <dhefam31@gmail.com>
mitsuki31 committed Sep 16, 2024
2 parents 3008a94 + 106d630 commit 423db52
Showing 2 changed files with 6 additions and 1 deletion.
2 changes: 1 addition & 1 deletion make/Main.mk
Original file line number Diff line number Diff line change
@@ -147,7 +147,7 @@ ifeq ($(__intern_INC_SRC),1)
$(call __info,Generating the JAR file (sources)...)
@$(JAR) $(subst {JAR},$(lastword $(JAR_NAMES)),$(JARFLAGS)) \
$(wildcard LICENSE) -C $(JAVA_DIR) . \
-C $(addprefix $(CLASSES_DIR)/,$(notdir $(RESOURCES_ONLY_DIR))) .
-C $(CLASSES_DIR) $(notdir $(RESOURCES_ONLY_DIR))
$(call __info,$(subst {JAR},$(abspath $(lastword $(JAR_NAMES))),$(._done_msg)))
endif # __intern_INC_SRC
$(eval undefine ._done_msg)
5 changes: 5 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -350,6 +350,11 @@
</goals>
</execution>
</executions>
<configuration>
<!-- It is mandatory to include hard-formatted manifest file -->
<useDefaultManifestFile>true</useDefaultManifestFile>
<defaultManifestFile>${paths.classesDir}/MANIFEST.MF</defaultManifestFile>
</configuration>
</plugin>
</plugins>
</build>

0 comments on commit 423db52

Please sign in to comment.