details: /erp/devel/pi/rev/bd47ae1e2e06
changeset: 6930:bd47ae1e2e06
user: Antonio Moreno <antonio.moreno <at> openbravo.com>
date: Tue Apr 06 15:22:46 2010 +0200
summary: [validation] Improved some variable names in build.xml files
details: /erp/devel/pi/rev/fe57e4f2aa44
changeset: 6931:fe57e4f2aa44
user: Antonio Moreno <antonio.moreno <at> openbravo.com>
date: Tue Apr 06 15:32:31 2010 +0200
summary: [validation] Swapped the generic message and the specific error
messages of the validations
diffstat:
src-core/src/org/openbravo/buildvalidation/BuildValidationHandler.java | 2 +-
src-util/buildvalidation/build.xml | 40
+++++-----
src-util/modulescript/build.xml | 38
++++----
3 files changed, 40 insertions(+), 40 deletions(-)
diffs (193 lines):
diff -r 34b8ebfe4d69 -r fe57e4f2aa44
src-core/src/org/openbravo/buildvalidation/BuildValidationHandler.java
--- a/src-core/src/org/openbravo/buildvalidation/BuildValidationHandler.java
Tue Apr 06 15:26:33 2010 +0200
+++ b/src-core/src/org/openbravo/buildvalidation/BuildValidationHandler.java
Tue Apr 06 15:32:31 2010 +0200
@@ -65,9 +65,9 @@
System.exit(1);
}
if (errors.size() > 0) {
- log4j.error(errorMessage);
log4j
.error("The build validation failed. The system hasn't been
modified. Fix the problems described in the validation messages (either by
uninstalling the affected modules, or by fixing the problems the validation
found), and then start the build again.");
+ log4j.error(errorMessage);
System.exit(1);
}
}
diff -r 34b8ebfe4d69 -r fe57e4f2aa44 src-util/buildvalidation/build.xml
--- a/src-util/buildvalidation/build.xml Tue Apr 06 15:26:33 2010 +0200
+++ b/src-util/buildvalidation/build.xml Tue Apr 06 15:32:31 2010 +0200
@@ -18,13 +18,13 @@
************************************************************************
-->
-<project name="openbravo-pre-install" default="compile" basedir=".">
- <property name="build.pre" value="build/classes" />
- <property name="build.pre.sqlc" value="build/javasqlc" />
- <property name="build.pre.src" value="src" />
+<project name="openbravo-buildvalidation" default="compile" basedir=".">
+ <property name="build.validation" value="build/classes" />
+ <property name="build.validation.sqlc" value="build/javasqlc" />
+ <property name="build.validation.src" value="src" />
<property name="main.dir" value="${basedir}/../.." />
- <path id="pre.class.path">
+ <path id="buildvalidation.class.path">
<pathelement path="build/classes/" />
<dirset dir="${base.modules}">
<include name="*/build/classes/" />
@@ -42,48 +42,48 @@
</condition>
<target name="init">
- <mkdir dir="${build.pre}" />
- <mkdir dir="${build.pre.sqlc}" />
- <mkdir dir="${build.pre.sqlc}/src" />
+ <mkdir dir="${build.validation}" />
+ <mkdir dir="${build.validation.sqlc}" />
+ <mkdir dir="${build.validation.sqlc}/src" />
<mkdir dir="${base.modules}/${module}/build/" />
<mkdir dir="${base.modules}/${module}/build/javasqlc" />
<mkdir dir="${base.modules}/${module}/build/classes" />
</target>
<target name="clean">
- <delete dir="${build.pre}" failonerror="false" includeemptydirs="true" />
- <delete dir="${build.pre.sqlc}" failonerror="false"
includeemptydirs="true" />
+ <delete dir="${build.validation}" failonerror="false"
includeemptydirs="true" />
+ <delete dir="${build.validation.sqlc}" failonerror="false"
includeemptydirs="true" />
</target>
<target name="sqlcCore" depends="init" if="checkCore">
<java classname="org.openbravo.data.Sqlc" jvm="${env.JAVA_HOME}/bin/java"
fork="yes" maxmemory="${build.maxmemory}">
- <arg line="'${base.config}'/Openbravo.properties .xsql ./src/org
'${build.pre.sqlc}'" />
- <classpath refid="pre.class.path" />
+ <arg line="'${base.config}'/Openbravo.properties .xsql ./src/org
'${build.validation.sqlc}'" />
+ <classpath refid="buildvalidation.class.path" />
</java>
- <javac srcdir="${build.pre.sqlc}/src" includes="**/*.java"
destdir="${build.pre}" encoding="UTF-8" debug="true"
debuglevel="lines,vars,source">
- <classpath refid="pre.class.path" />
+ <javac srcdir="${build.validation.sqlc}/src" includes="**/*.java"
destdir="${build.validation}" encoding="UTF-8" debug="true"
debuglevel="lines,vars,source">
+ <classpath refid="buildvalidation.class.path" />
</javac>
</target>
<target name="sqlcModules" depends="init" unless="checkCore">
<java classname="org.openbravo.data.Sqlc" jvm="${env.JAVA_HOME}/bin/java"
fork="yes" maxmemory="${build.maxmemory}">
<arg line="'${base.config}'/Openbravo.properties .xsql '${base.modules}'
'${base.modules}'/'${module}'/src-util/buildvalidation/src
*/src-util/buildvalidation" />
- <classpath refid="pre.class.path" />
+ <classpath refid="buildvalidation.class.path" />
</java>
<javac srcdir="${base.modules}/${module}/src-util/buildvalidation/src"
includes="**/*.java" destdir="${base.modules}/${module}/build/classes"
encoding="UTF-8" debug="true" debuglevel="lines,vars,source">
- <classpath refid="pre.class.path" />
+ <classpath refid="buildvalidation.class.path" />
</javac>
</target>
<target name="javacCore" if="checkCore">
- <javac srcdir="${main.dir}"
includes="src-util/buildvalidation/src/**/*.java" destdir="${build.pre}"
deprecation="on" encoding="UTF-8" debug="true" debuglevel="lines,vars,source">
- <classpath refid="pre.class.path" />
+ <javac srcdir="${main.dir}"
includes="src-util/buildvalidation/src/**/*.java" destdir="${build.validation}"
deprecation="on" encoding="UTF-8" debug="true" debuglevel="lines,vars,source">
+ <classpath refid="buildvalidation.class.path" />
</javac>
</target>
<target name="javacModule" unless="checkCore">
<javac srcdir="${main.dir}"
includes="modules/${module}/src-util/buildvalidation/**/*.java"
destdir="${base.modules}/${module}/build/classes" deprecation="on"
encoding="UTF-8" debug="true" debuglevel="lines,vars,source">
- <classpath refid="pre.class.path" />
+ <classpath refid="buildvalidation.class.path" />
</javac>
</target>
@@ -94,7 +94,7 @@
<java classname="org.openbravo.buildvalidation.BuildValidationHandler"
jvm="${env.JAVA_HOME}/bin/java" fork="yes" maxmemory="${build.maxmemory}"
failonerror="yes">
<arg value="${base.src}/../"/>
<arg value="${module}"/>
- <classpath refid="pre.class.path" />
+ <classpath refid="buildvalidation.class.path" />
</java>
</target>
diff -r 34b8ebfe4d69 -r fe57e4f2aa44 src-util/modulescript/build.xml
--- a/src-util/modulescript/build.xml Tue Apr 06 15:26:33 2010 +0200
+++ b/src-util/modulescript/build.xml Tue Apr 06 15:32:31 2010 +0200
@@ -18,13 +18,13 @@
************************************************************************
-->
-<project name="openbravo-pre-install" default="compile" basedir=".">
- <property name="build.pre" value="build/classes" />
- <property name="build.pre.sqlc" value="build/javasqlc" />
- <property name="build.pre.src" value="src" />
+<project name="openbravo-modulescript" default="compile" basedir=".">
+ <property name="build.module" value="build/classes" />
+ <property name="build.module.sqlc" value="build/javasqlc" />
+ <property name="build.module.src" value="src" />
<property name="main.dir" value="${basedir}/../.." />
- <path id="pre.class.path">
+ <path id="modulescript.class.path">
<pathelement path="build/classes" />
<dirset dir="${base.modules}">
<include name="*/build/classes/" />
@@ -42,48 +42,48 @@
</condition>
<target name="init">
- <mkdir dir="${build.pre}" />
- <mkdir dir="${build.pre.sqlc}" />
- <mkdir dir="${build.pre.sqlc}/src" />
+ <mkdir dir="${build.module}" />
+ <mkdir dir="${build.module.sqlc}" />
+ <mkdir dir="${build.module.sqlc}/src" />
<mkdir dir="${base.modules}/${module}/build/" />
<mkdir dir="${base.modules}/${module}/build/javasqlc" />
<mkdir dir="${base.modules}/${module}/build/classes" />
</target>
<target name="clean">
- <delete dir="${build.pre}" failonerror="false" includeemptydirs="true" />
- <delete dir="${build.pre.sqlc}" failonerror="false"
includeemptydirs="true" />
+ <delete dir="${build.module}" failonerror="false" includeemptydirs="true"
/>
+ <delete dir="${build.module.sqlc}" failonerror="false"
includeemptydirs="true" />
</target>
<target name="sqlcCore" depends="init" if="checkCore">
<java classname="org.openbravo.data.Sqlc" jvm="${env.JAVA_HOME}/bin/java"
fork="yes" maxmemory="${build.maxmemory}">
- <arg line="'${base.config}'/Openbravo.properties .xsql ./src/org
'${build.pre.sqlc}'" />
- <classpath refid="pre.class.path" />
+ <arg line="'${base.config}'/Openbravo.properties .xsql ./src/org
'${build.module.sqlc}'" />
+ <classpath refid="modulescript.class.path" />
</java>
- <javac srcdir="${build.pre.sqlc}/src" includes="**/*.java"
destdir="${build.pre}" encoding="UTF-8" debug="true"
debuglevel="lines,vars,source">
- <classpath refid="pre.class.path" />
+ <javac srcdir="${build.module.sqlc}/src" includes="**/*.java"
destdir="${build.module}" encoding="UTF-8" debug="true"
debuglevel="lines,vars,source">
+ <classpath refid="modulescript.class.path" />
</javac>
</target>
<target name="sqlcModules" depends="init" unless="checkCore">
<java classname="org.openbravo.data.Sqlc" jvm="${env.JAVA_HOME}/bin/java"
fork="yes" maxmemory="${build.maxmemory}">
<arg line="'${base.config}'/Openbravo.properties .xsql '${base.modules}'
'${base.modules}'/'${module}'/src-util/modulescript/src
*/src-util/modulescript" />
- <classpath refid="pre.class.path" />
+ <classpath refid="modulescript.class.path" />
</java>
<javac srcdir="${base.modules}/${module}/src-util/modulescript/src"
includes="**/*.java" destdir="${base.modules}/${module}/build/classes"
encoding="UTF-8" debug="true" debuglevel="lines,vars,source">
- <classpath refid="pre.class.path" />
+ <classpath refid="modulescript.class.path" />
</javac>
</target>
<target name="javacCore" if="checkCore">
- <javac srcdir="${main.dir}" includes="src-util/modulescript/src/**/*.java"
destdir="${build.pre}" deprecation="on" encoding="UTF-8" debug="true"
debuglevel="lines,vars,source">
- <classpath refid="pre.class.path" />
+ <javac srcdir="${main.dir}" includes="src-util/modulescript/src/**/*.java"
destdir="${build.module}" deprecation="on" encoding="UTF-8" debug="true"
debuglevel="lines,vars,source">
+ <classpath refid="modulescript.class.path" />
</javac>
</target>
<target name="javacModule" unless="checkCore">
<javac srcdir="${main.dir}"
includes="modules/${module}/src-util/modulescript/**/*.java"
destdir="${main.dir}/modules/${module}/build/classes" deprecation="on"
encoding="UTF-8" debug="true" debuglevel="lines,vars,source">
- <classpath refid="pre.class.path" />
+ <classpath refid="modulescript.class.path" />
</javac>
</target>
------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
