Revision: 3615
          http://vexi.svn.sourceforge.net/vexi/?rev=3615&view=rev
Author:   mkpg2
Date:     2009-08-20 15:20:42 +0000 (Thu, 20 Aug 2009)

Log Message:
-----------
Fix. Version parameter was not being passed on to the build in org.vexi.main.

Modified Paths:
--------------
    trunk/core/buildcore/build.conf.txt
    trunk/core/buildcore/build.xml
    trunk/core/buildcore/build_shared.ent

Modified: trunk/core/buildcore/build.conf.txt
===================================================================
--- trunk/core/buildcore/build.conf.txt 2009-08-20 15:19:17 UTC (rev 3614)
+++ trunk/core/buildcore/build.conf.txt 2009-08-20 15:20:42 UTC (rev 3615)
@@ -1,15 +1,22 @@
-# This is a model properties file.
-# Copy and rename it build.conf.txt -> build.conf
-# Modify properties as required.
+### This is a model properties file.
+### Copy and rename it build.conf.txt -> build.conf
+### Modify properties as required.
 
-# Version of vexi, if not an official release then give a descriptive name
+
+### Version of vexi, if not an official release then give a descriptive name
 version=3.0 trunk development
 
-# Subversion revision number
-# Indicate which branch it is from if not trunk as revision number is not
-# enough in which case to identify the source level
+
+### Subversion revision number
+### Indicate which branch it is from if not trunk as revision number is not
+### enough in which case to identify the source level
 build=3543
 
-# Defines to be used by the java preprocessor. A comma separated list. 
-# Choices: APACHE_HTTP (there is only one choice at the moment)
+
+### Defines to be used by the java preprocessor. A comma separated list. 
+### Choices: APACHE_HTTP (there is only one choice at the moment)
 jpp.defines=APACHE_HTTP
+
+
+### Compile in debug information
+debug=yes
\ No newline at end of file

Modified: trunk/core/buildcore/build.xml
===================================================================
--- trunk/core/buildcore/build.xml      2009-08-20 15:19:17 UTC (rev 3614)
+++ trunk/core/buildcore/build.xml      2009-08-20 15:20:42 UTC (rev 3615)
@@ -15,8 +15,8 @@
                 classpath="${buildcore.loc}/antlib/proguard_out.jar" />
 
        <import file="${buildcore.loc}/build_props.ent"/>
+       <property name="debug" value="no"/>
 
-
        <target name="all" depends="buildcore, buildcore_devl"/>
 
        <!--###############################################################
@@ -60,6 +60,8 @@
                                <param name="proj_target" 
value="${proj_target}"/>
                                <param name="build" value="${build}"/>
                                <param name="jpp.defines" 
value="${jpp.defines}" />
+                               <param name="debug" value="${debug}"/>
+                               <param name="version" value="${version}"/>
                        </antcall>
                </sequential>
        </macrodef>

Modified: trunk/core/buildcore/build_shared.ent
===================================================================
--- trunk/core/buildcore/build_shared.ent       2009-08-20 15:19:17 UTC (rev 
3614)
+++ trunk/core/buildcore/build_shared.ent       2009-08-20 15:20:42 UTC (rev 
3615)
@@ -50,12 +50,13 @@
                <echo message="${src_gen}"/>
                <!-- The value seems meaningless, but is required -->
                <property name="resources" value="foo"/>
+               <property name="debug" value="no"/>
                <!-- Default to src directory if it doesn't exist -->
                <property name="generate_dir" location="src"/>
                <javac srcdir="${src_dir}:${generate_dir}" 
                           destdir="${compile_dir}"
                       source="${src_version}" target="${src_version}" 
-                          debug="no">
+                          debug="${debug}">
                        <classpath>
                                <fileset dir="${jar_dir}" includes="*.jar"/>
                        </classpath>


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day 
trial. Simplify your report design, integration and deployment - and focus on 
what you do best, core application coding. Discover what's new with 
Crystal Reports now.  http://p.sf.net/sfu/bobj-july
_______________________________________________
Vexi-svn mailing list
Vexi-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/vexi-svn

Reply via email to