simpler regex-replace for path

[jalview.git] / utils / InstallAnywhere / jalview_buildinstaller.xml

diff --git a/utils/InstallAnywhere/jalview_buildinstaller.xml b/utils/InstallAnywhere/jalview_buildinstaller.xml
index ee5f891..3559123 100644 (file)
--- a/utils/InstallAnywhere/jalview_buildinstaller.xml
+++ b/utils/InstallAnywhere/jalview_buildinstaller.xml
@@ -2,8 +2,9 @@
 <project name="jalviewInstallAnywhere" default="build" basedir=".">\r
   <property name="IA_LOCATION" value="/homes/ws-dev1/Macrovision/InstallAnywhere_2008_VP1_Standard"/>\r
   <property name="IA_PROJECT" location="Jalview.iap_xml"/>\r
-  <property name="ABS_PATH" value="\/homes\/ws-dev1"/> <!--/homes/ws-dev1/jalview"/> -->\r
-  <property name="CUR_PATH" location="." />\r
+  <property name="ABS_PATH" value="/homes/ws-dev1/jalview"/> <!-- \/utils\/InstallAnywhere"/> --> <!--/homes/ws-dev1/jalview"/> -->\r
+  <!-- location of top level of jalview distribution directory -->\r
+  <property name="CUR_PATH" location="../../." />\r
   <property name="USER_HOME" location="~" />\r
   <property name="DEST_IADIR" location="${CUR_PATH}/JalviewBuild" />\r
   <property name="java.awt.headless" value="true"/>\r
@@ -16,17 +17,10 @@
   </taskdef>\r
   <target name="build">\r
   <copy file="${IA_PROJECT}" tofile="${IA_PROJECT}_reloc.iap_xml"/>\r
-  <replaceregexp\r
-    match="${ABS_PATH}"\r
-    replace="${CUR_PATH}">\r
-   <fileset file="${IA_PROJECT}_reloc.iap_xml" />\r
-  </replaceregexp>\r
-  <!--<replaceregexp\r
-    match="/homes/ws-dev1"\r
-    replace="${USER_HOME}">\r
-   <fileset file="${IA_PROJECT}_reloc.iap_xml" />\r
-  </replaceregexp> -->\r
-\r
+  <replace\r
+    token="${ABS_PATH}"\r
+    value="${CUR_PATH}"\r
+   file="${IA_PROJECT}_reloc.iap_xml" />\r
   <buildinstaller \r
      IAlocation="${IA_LOCATION}"\r
      IAProjectFile="${IA_PROJECT}_reloc.iap_xml"\r