• R/O
  • SSH
  • HTTPS

pal: Commit


Commit MetaInfo

Revision447 (tree)
Zeit2007-08-05 22:51:29
Autortakeharu

Log Message

updated target setup shell

Ändern Zusammenfassung

Diff

--- pompei/portlets/pompei-core/trunk/build.xml (revision 446)
+++ pompei/portlets/pompei-core/trunk/build.xml (revision 447)
@@ -1,6 +1,6 @@
11 <?xml version="1.0" encoding="UTF-8"?>
22
3-<project name="build" default="all" basedir=".">
3+<project name="build" default="" basedir=".">
44
55 <property name="war.name" value="pompei-core"/>
66 <property name="src.main.webapp.webinf.classes" value="${basedir}/src/main/webapp/WEB-INF/classes"/>
@@ -8,10 +8,13 @@
88 <property name="target.webapp.webinf.lib" value="${basedir}/target/${war.name}/WEB-INF/lib"/>
99 <property name="target.webapp.webinf.classes" value="${basedir}/target/${war.name}/WEB-INF/classes"/>
1010
11+ <!--
1112 <property name="shell.cmd" value="sh"/>
1213 <property name="shell.options" value="-c"/>
13-
14- <target name="check.os"
14+ <property name="shell.cmd" value="cmd.exe"/>
15+ <property name="shell.options" value="/c"/>
16+-->
17+ <target name="check.os"
1518 description="--> Check OS">
1619 <condition property="isWindows">
1720 <os family="windows" />
@@ -18,13 +21,28 @@
1821 </condition>
1922 </target>
2023
21- <target name="setup.shell" depends="check.os" if="isWindows"
24+
25+ <target name="setup.shell"
2226 description="--> Setup shell parameters">
23- <property name="shell.cmd" value="cmd.exe"/>
27+ <condition property="shell.cmd" value="sh">
28+ <os family="unix" />
29+ </condition>
30+ <condition property="shell.options" value="-c">
31+ <os family="unix" />
32+ </condition>
33+ <condition property="shell.cmd" value="cmd.exe">
34+ <os family="windows" />
35+ </condition>
36+ <condition property="shell.options" value="/c">
37+ <os family="windows" />
38+ </condition>
39+<!--
40+ <property name="shell.cmd" value="cmd.exe"/>
2441 <property name="shell.options" value="/c"/>
42+-->
2543 </target>
2644
27- <target name="clean"
45+ <target name="clean"
2846 description="--> Clean Directories">
2947 <delete dir="${src.main.webapp.webinf.classes}"/>
3048 <delete dir="${src.main.webapp.webinf.lib}"/>
@@ -68,12 +86,13 @@
6886 >
6987 </replace>
7088
89+ <echo>${shell.options}</echo>
7190 <exec
7291 executable="${shell.cmd}"
7392 failonerror="true"
7493 dir="${basedir}"
7594 >
76- <arg line="${shell.options} 'mvn install'"/>
95+ <arg line="${shell.options} 'mvn install'"/>
7796 </exec>
7897
7998 <mkdir dir="${src.main.webapp.webinf.classes}"/>
@@ -114,7 +133,7 @@
114133 <replace
115134 file="${basedir}/pom.xml"
116135 token="&lt;!-- SERVLET DEV: END --&gt;"
117- value="@@@@ SERVLET DEV: END --&gt;"
136+ value="@@@@ SERVLET DEV: END --&gt;"
118137 >
119138 </replace>
120139
@@ -128,7 +147,7 @@
128147 <replace
129148 file="${basedir}/src/main/webapp/WEB-INF/web.xml"
130149 token="&lt;!-- SERVLET DEV: END --&gt;"
131- value="@@@@ SERVLET DEV: END --&gt;"
150+ value="@@@@ SERVLET DEV: END --&gt;"
132151 >
133152 </replace>
134153
Show on old repository browser