[ jEdit-commits ] SF.net SVN: jedit:[25711] build-support/trunk/plugin- build.xml

[<ker...@us...>]

Revision: 25711
          http://sourceforge.net/p/jedit/svn/25711
Author:   kerik-sf
Date:     2024-02-18 13:58:02 +0000 (Sun, 18 Feb 2024)
Log Message:
-----------
build-support: configurable extra and package file location

this is to work with src/main/{java,resources} layouts in projects

Modified Paths:
--------------
    build-support/trunk/plugin-build.xml

Modified: build-support/trunk/plugin-build.xml
===================================================================
--- build-support/trunk/plugin-build.xml	2024-02-18 13:57:57 UTC (rev 25710)
+++ build-support/trunk/plugin-build.xml	2024-02-18 13:58:02 UTC (rev 25711)
@@ -259,7 +259,8 @@
 
     <!-- This selector defines extra files to be included
          in the plugin's JAR file. The context of the
-         selector is the plugin's directory (${basedir}),
+         selector is the plugin's directory (${basedir}) by default
+         (see the packageFilesSourceDir property),
          so it will not work for files outside the plugin
          directory. For those cases, use the "build.prepare"
          target. By default, it's empty.                    -->
@@ -266,6 +267,9 @@
     <selector id="packageFiles">
         <size value="0" when="less" />
     </selector>
+    <!-- Directory where to copy the packageFiles from.
+         Override it to eg. src/main/resources if your project is setup like that -->
+    <property name="packageFilesSourceDir" value="${basedir}"/>
 
     <!-- This selector defines the doc source files
          The context of the selector is the plugin's directory (${basedir}),
@@ -279,7 +283,8 @@
     <!-- This selector defines other files that should be packaged
          in the plugin's jar file; by default it contains actions.xml,
          dockables.xml, services.xml, any files ending in ".props",
-         "LICENSE" and "README". The context is "${basedir}".
+         "LICENSE" and "README". The context is "${basedir}" by default,
+         see the extraFilesSourceDir property.
          Normally, plugins do not override this but instead define a "packageFiles"
          selector. -->
     <selector id="extraFiles">
@@ -297,6 +302,9 @@
             </or>
         </and>
     </selector>
+    <!-- Directory where to copy the extraFiles from.
+         Override it to eg. src/main/resources if your project is setup like that -->
+    <property name="extraFilesSourceDir" value="${basedir}"/>
 
     <!--{{{ Ivy setttings =============================== -->
 
@@ -398,13 +406,13 @@
         <mkdir dir="${install.dir}" />
 
         <copy todir="${build.extras}" includeEmptyDirs="false">
-            <fileset dir="${basedir}">
+            <fileset dir="${extraFilesSourceDir}">
                 <selector refid="extraFiles" />
             </fileset>
         </copy>
 
         <copy todir="${build.extras}" includeEmptyDirs="false">
-            <fileset dir="${basedir}">
+            <fileset dir="${packageFilesSourceDir}">
                 <selector refid="packageFiles" />
             </fileset>
         </copy>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.