build.xml
changeset 25249 6ada16afd344
parent 24993 408e2537962c
child 25250 ef14595ce019
--- a/build.xml	Tue Oct 21 16:18:05 2014 +0200
+++ b/build.xml	Tue Oct 21 18:39:24 2014 +0200
@@ -994,93 +994,23 @@
     <ant dir="src-util/diagnostic" antfile="build-create.xml" target="build" />
     <ant dir="src-util/diagnostic" target="check.all" />
   </target>
-
-  <target name="setup.check.os">
-    <condition property="osname" value="linux">
-      <equals arg1="${os.name}" arg2="Linux" />
-    </condition>
-    <condition property="osname" value="freebsd6">
-      <equals arg1="${os.name}" arg2="FreeBSD" />
-    </condition>
-    <condition property="osname" value="windows">
-      <contains string="${os.name}" substring="Windows" />
-    </condition>
-    <condition property="osname" value="osx">
-      <contains string="${os.name}" substring="OS X" />
-    </condition>
-    <condition property="osname" value="solaris">
-      <or>
-        <contains string="${os.name}" substring="Solaris" />
-        <contains string="${os.name}" substring="SunOS" />
-      </or>
-    </condition>
-    <condition property="osname" value="openbsd">
-      <equals arg1="${os.name}" arg2="OpenBSD" />
-    </condition>
-    <condition property="osname" value="aix">
-      <equals arg1="${os.name}" arg2="AIX" />
-    </condition>
-    <condition property="osname" value="hpux">
-      <equals arg1="${os.name}" arg2="HPUX" />
-    </condition>
+  
+  <target name="setup.compile">
+          <echo message="Compiling application configuration classes..." />
+          <javac srcdir="src/org/openbravo/configuration" destdir="build/classes" includeantruntime="false">
+             <classpath refid="project.class.path"/>  
+          </javac>
   </target>
 
-  <target name="setup.check.arch">
-    <condition property="osarch" value="">
-      <or>
-        <equals arg1="${os.arch}" arg2="x86" />
-        <equals arg1="${os.arch}" arg2="i386" />
-        <contains string="${os.name}" substring="Windows" />
-        <contains string="${os.name}" substring="OS X" />
-      </or>
-    </condition>
-    <condition property="osarch" value="-x64">
-      <or>
-        <equals arg1="${os.arch}" arg2="amd64" />
-        <equals arg1="${os.arch}" arg2="x86_64" />
-        <not>
-          <contains string="${os.name}" substring="Windows" />
-        </not>
-        <not>
-          <contains string="${os.name}" substring="OS X" />
-        </not>
-      </or>
-    </condition>
-    <condition property="osarch" value="-ia64">
-      <equals arg1="${os.arch}" arg2="ia64" />
-    </condition>
-    <condition property="osarch" value="-sparc">
-      <equals arg1="${os.arch}" arg2="sparc" />
-    </condition>
-    <condition property="osarch" value="-ppc">
-      <equals arg1="${os.arch}" arg2="ppc" />
-    </condition>
-  </target>
-
-  <target name="setup.exists.test">
-    <condition property="bin.ext" value="exe">
-      <os family="windows" />
-    </condition>
-
-    <condition property="bin.ext" value="app.tar.gz">
-      <os family="mac" />
-    </condition>
-
-    <condition property="bin.ext" value="bin">
-      <not>
-        <isset property="${bin.ext}" />
-      </not>
-    </condition>
-
-    <available file="config/setup-properties-${osname}${osarch}.${bin.ext}" property="setup.exists" value="true" />
-  </target>
-
-  <target name="setup" depends="setup.check.os, setup.check.arch, setup.exists.test" unless="setup.exists">
-    <get src="https://code.openbravo.com/tools/rm/erp-setup-tool/raw-file/tip/setup/output/setup-properties-${osname}${osarch}.${bin.ext}" dest="config/setup-properties-${osname}${osarch}.${bin.ext}" verbose="true" />
-
-    <chmod file="config/setup-properties-${osname}${osarch}.${bin.ext}" perm="+x" />
-  </target>
-
+  <target name="setup" depends="setup.compile">    
+      <echo message="Launching configuration application..."/>
+      <taskdef name="configurationApp" classname="org.openbravo.configuration.ConfigurationApp">
+        <classpath refid="project.class.path" />
+      </taskdef>
+      <configurationApp/>
+      <echo message="Process configuration ends."/>
+    </target>
+  
   <target name="package.core" depends="init, set.version.number">
 	<property name="tmpdir" value="${java.io.tmpdir}/ob.core${core.rev}" />