Misunderstood the ${.}, had to be escaped

--- Signed-off-by: Peter Kriens <Peter.Kriens@aQute.biz> Signed-off-by: Peter Kriens <Peter.Kriens@aQute.biz>
bndtools · Apr 19, 2024 · f37f857 · f37f857
1 parent b37787f
commit f37f857
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/biz.aQute.bndlib/src/aQute/bnd/osgi/Builder.java b/biz.aQute.bndlib/src/aQute/bnd/osgi/Builder.java
@@ -1404,7 +1404,11 @@ private void copy(Jar jar, String path, File from, Instructions preprocess, Map<
 			if (from.exists()) {
 				Resource resource = new FileResource(from);
 				if (preprocess != null && preprocess.matches(path)) {
-					resource = new PreprocessResource(this, resource);
+					Processor tmp = new Processor(this);
+					addClose(tmp);
+					tmp.setProperty(".", from.getAbsolutePath()
+						.replace('\\', '/'));
+					resource = new PreprocessResource(tmp, resource);
 				}
 				addExtra(resource, extra.get("extra"));
 				if (path.endsWith("/"))

diff --git a/bndtools.core/_plugin.xml b/bndtools.core/_plugin.xml
@@ -904,7 +904,7 @@
 		    <property name="snapshotUrl" type="string" description="The urls to the remote snapshot repository." default="https://repository.apache.org/snapshots/" />
 		    <property name="local" type="string" description="The path to the local repository" default="~/.m2/repository" />
 		    <property name="readOnly" type="boolean" description="" default="false" />
-		    <property name="index" type="string" description="The path to the index file" default="${workspace}/cnf/central.maven" />
+		    <property name="index" type="string" description="The path to the index file" default="\${.}/central.maven" />
 		    <property name="source" type="string" description="Content added to the index file. Content maybe one line without CR/LF as long as there is a comma or whitespace separating the GAVs. Further same format as the index file." />
 		    <property name="noupdateOnRelease" type="boolean" description="Do not update the index when a file is released" />
 		    <property name="poll_time" type="int" description="Sets the time in seconds when to check for changes in the pom-files" default="5" />
@@ -932,7 +932,7 @@
 		    <property name="local" type="string" description="The path to the local repository" default="~/.m2/repository" />
 		    <property name="revision" type="string" description="Coordinates of a maven revision. I.e. group:artifactid[:c]:version. Can be a comma separated list of GAVs." />
 		    <property name="location" type="string" description="Points to a file that is used as the cache. It will be in OSGi format." />
-		    <property name="pom" type="string" description="Points to a pom.xml file. This is exclusive with revision. Can be a comma separated list of files." default="${workspace}/cnf/pom.xml" />
+		    <property name="pom" type="string" description="Points to a pom.xml file. This is exclusive with revision. Can be a comma separated list of files." default="\${.}/pom.xml" />
 		    <property name="query" type="string" description="The query used to search Maven Central Search." />
 		    <property name="queryUrl" type="string" description="The url of the Maven Central Search."  />
 		    <property name="transitive" type="boolean" description="Allow transitive dependencies" />