git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ca2b107
)
simpler regex-replace for path
author
jprocter
<Jim Procter>
Tue, 12 Aug 2008 13:38:42 +0000
(13:38 +0000)
committer
jprocter
<Jim Procter>
Tue, 12 Aug 2008 13:38:42 +0000
(13:38 +0000)
utils/InstallAnywhere/jalview_buildinstaller.xml
patch
|
blob
|
history
diff --git
a/utils/InstallAnywhere/jalview_buildinstaller.xml
b/utils/InstallAnywhere/jalview_buildinstaller.xml
index
f437a19
..
3559123
100644
(file)
--- a/
utils/InstallAnywhere/jalview_buildinstaller.xml
+++ b/
utils/InstallAnywhere/jalview_buildinstaller.xml
@@
-2,7
+2,7
@@
<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
<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="\/.+\/jalview\/utils\/InstallAnywhere"/> <!--/homes/ws-dev1/jalview"/> -->
\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
<!-- location of top level of jalview distribution directory -->
\r
<property name="CUR_PATH" location="../../." />
\r
<property name="USER_HOME" location="~" />
\r
@@
-17,17
+17,10
@@
</taskdef>
\r
<target name="build">
\r
<copy file="${IA_PROJECT}" tofile="${IA_PROJECT}_reloc.iap_xml"/>
\r
</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
<buildinstaller
\r
IAlocation="${IA_LOCATION}"
\r
IAProjectFile="${IA_PROJECT}_reloc.iap_xml"
\r