Use expand.sh for creating macros.javapackages-binding

Author: mizdebsk

build

@@ -76,8 +76,12 @@ expand depgenerators/fileattrs/osgi.attr
 expand depgenerators/fileattrs/maven.attr
 expand depgenerators/fileattrs/javadoc.attr
 
-while IFS== read -d' ' id path; do
-    echo "%java_home ${path}" >target/macros.fjava-"${id}"
+while IFS== read -d' ' java_id java_home; do
+    expand macros.d/macros.javapackages-binding target/macros.java-"${java_id}"
+    sed -i \
+	-e "s|@{java_id}|${java_id}|g" \
+	-e "s|@{java_home}|${java_home}|g" \
+	target/macros.java-"${java_id}"
 done <<<"${jvms}"
 
 manpage abs2rel

install

@@ -138,9 +138,9 @@ inst_data target/find-jar.1 "${mandir}/man1"
 inst_data configs/configuration.xml "${m2home}"
 
 
-while IFS== read -d' ' id path; do
-    exec >files-local-"${id}"
-    inst_data target/macros.fjava-"${id}" "${rpmmacrodir}"
+while IFS== read -d' ' java_id java_path; do
+    exec >files-local-"${java_id}"
+    inst_data target/macros.java-"${java_id}" "${rpmmacrodir}"
 done <<<"${jvms}"
 
 

macros.d/macros.javapackages-binding

@@ -0,0 +1,2 @@
+# Home directory for Java @{java_id}
+%java_home @{java_home}