Files in the bin directory now have directory macro's expanded

git-svn-id: https://subversion.switch.ch/svn/shibboleth/java-idp/trunk@1843 ab3bd59b-922f-494d-bb5f-6f0a3c29deca

diff --git a/custom/README.txt b/custom/README.txt
index 09c8a1c..126357a 100644 (file)
--- a/custom/README.txt
+++ b/custom/README.txt
@@ -24,9 +24,8 @@ the following directories
     your-extension-directory/
        bin/ - [Optional] This directory contains any binary or script files that need to 
                be installed on the filesystem in the IdP or SP home bin directory.  This 
-               can include subdirectories.  The string's $IDP_HOME$ and $SP_HOME$ will be 
-               exapanded to the system path that the IdP or SP is installed (depending on 
-               which you're installing).
+               can include subdirectories.  The strings $IDP_HOME$, $SP_HOME$, and 
+                          $EXTENSION_NAME$ will be exapanded for all files in this directory.
        etc/ - [Optional] This directory contains any configuration files that need to 
                be installed on the filesystem under the IdP or SP home etc directory.  This 
                           can include subdirectories.  All files will be installed into a subdirectory 

diff --git a/custom/extension-build.xml b/custom/extension-build.xml
index caba384..de5940d 100644 (file)
--- a/custom/extension-build.xml
+++ b/custom/extension-build.xml
@@ -291,6 +291,8 @@
                         <include name="**" />
                     </fileset>
                 </copy>
+                <replace dir="${ext.filesystem.home}/bin" token="${ext.home.token}" value="${ext.filesystem.home}" />
+                <replace dir="${ext.filesystem.home}/bin" token="$EXTENSION_NAME$" value="${ext.name}" />
                 <chmod dir="${ext.filesystem.home}/bin" perm="ug+rx" includes="**/*" />
             </then>
         </if>