From: jprocter <Jim Procter>
Date: Tue, 12 Aug 2008 13:38:42 +0000 (+0000)
Subject: simpler regex-replace for path
X-Git-Tag: Release_2_4~37
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=f973cf16d9eb3ae2ab2c8cbafa8b922e4a10dd34;p=jalview.git

simpler regex-replace for path
---

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