details: /erp/devel/int/rev/0d80d55c133f
changeset: 7164:0d80d55c133f
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Fri Apr 30 13:08:30 2010 +0200
summary: fixed bug 12175: Deploy mode 'none' doesn't work properly.
details: /erp/devel/int/rev/fba8bb3038a6
changeset: 7165:fba8bb3038a6
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Fri Apr 30 13:23:53 2010 +0200
summary: fixed bug 12958: comple with deploy.mode=war does not call
generate.entities
diffstat:
build.xml | 5 +++--
src/build.xml | 11 ++++-------
2 files changed, 7 insertions(+), 9 deletions(-)
diffs (63 lines):
diff -r b9e8574569f7 -r fba8bb3038a6 build.xml
--- a/build.xml Fri Apr 30 12:27:53 2010 +0200
+++ b/build.xml Fri Apr 30 13:23:53 2010 +0200
@@ -352,7 +352,7 @@
property="test.md5.wad"/>
</target>
- <target name="compile.complete.development" depends="init" if="mode.class">
+ <target name="compile.complete.development" depends="init" unless="mode.war">
<ant dir="${base.src}" target="compile.complete.development"
inheritAll="true" inheritRefs="true" />
</target>
@@ -364,7 +364,7 @@
<target name="compile.deploy" depends="compile.war, compile.development">
</target>
- <target name="compile.development" depends="init" if="mode.class">
+ <target name="compile.development" depends="init" unless="mode.war">
<ant dir="${base.src}" target="compile.development" inheritAll="true"
inheritRefs="true" />
</target>
@@ -377,6 +377,7 @@
</target>
<target name="compile.war" if="mode.war">
+ <antcall target="generate.entities" />
<antcall target="compile" />
<antcall target="war" />
</target>
diff -r b9e8574569f7 -r fba8bb3038a6 src/build.xml
--- a/src/build.xml Fri Apr 30 12:27:53 2010 +0200
+++ b/src/build.xml Fri Apr 30 13:23:53 2010 +0200
@@ -782,7 +782,7 @@
</java>
</target>
- <target name="copy.files">
+ <target name="copy.files" if="mode.class">
<updatesystemstatus v="RB45"/>
<mkdir dir="${jakarta.base}/webapps/${context.name}" />
<copy todir="${jakarta.base}/webapps/${context.name}" encoding="UTF-8">
@@ -792,18 +792,15 @@
<copy todir="${jakarta.base}/webapps/${context.name}/WEB-INF/classes"
encoding="UTF-8">
<fileset dir="${build}" />
</copy>
+ <mkdir dir="${jakarta.base}/webapps/${context.name}/WEB-INF/lib" />
+ <copy todir="${jakarta.base}/webapps/${context.name}/WEB-INF/lib"
file="${build.core.lib}/openbravo-core.jar" encoding="UTF-8">
+ </copy>
</target>
<target name="compile.development" depends="generate.entities, compile,
copy.files">
- <mkdir dir="${jakarta.base}/webapps/${context.name}/WEB-INF/lib" />
- <copy todir="${jakarta.base}/webapps/${context.name}/WEB-INF/lib"
file="${build.core.lib}/openbravo-core.jar" encoding="UTF-8">
- </copy>
</target>
<target name="compile.complete.development" depends="compile.complete,
copy.files">
- <mkdir dir="${jakarta.base}/webapps/${context.name}/WEB-INF/lib" />
- <copy todir="${jakarta.base}/webapps/${context.name}/WEB-INF/lib"
file="${build.core.lib}/openbravo-core.jar" encoding="UTF-8">
- </copy>
<updatesystemstatus v="RB51"/>
</target>
------------------------------------------------------------------------------
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
