[Qt-jambi-interest] [RFC PATCH 3/5] [BUILD] InitializeTask.java: don't set the qtjambi.version property anymore
Francis Galiegue
fgaliegue at gmail.com
Sun Dec 27 18:45:00 CET 2009
That's one less call to Version.java. This property is now set by setenv.xml
when it has sourced version.properties.
Signed-off-by: Francis Galiegue <fgaliegue at gmail.com>
---
.../com/trolltech/tools/ant/InitializeTask.java | 5 +----
1 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/java/src/ant-qtjambi/com/trolltech/tools/ant/InitializeTask.java b/java/src/ant-qtjambi/com/trolltech/tools/ant/InitializeTask.java
index 38653e0..3eed502 100644
--- a/java/src/ant-qtjambi/com/trolltech/tools/ant/InitializeTask.java
+++ b/java/src/ant-qtjambi/com/trolltech/tools/ant/InitializeTask.java
@@ -95,6 +95,7 @@ public class InitializeTask extends Task {
*/
public static final String QTDIR = "qtjambi.qtdir";
public static final String LIBSUBDIR = "qtjambi.libsubdir";
+ public static final String VERSION = "qtjambi.version";
/*
* These properties are set inside this task
@@ -110,7 +111,6 @@ public class InitializeTask extends Task {
public static final String PHONON_QT7 = "qtjambi.phonon_qt7";
public static final String QMAKESPEC = "qtjambi.qmakespec";
public static final String SQLITE = "qtjambi.sqlite";
- public static final String VERSION = "qtjambi.version";
public static final String WEBKIT = "qtjambi.webkit";
public static final String XMLPATTERNS = "qtjambi.xmlpatterns";
@@ -138,9 +138,6 @@ public class InitializeTask extends Task {
props = PropertyHelper.getPropertyHelper(getProject());
props.setNewProperty(null, OSNAME, decideOSName());
- // TODO: Find a better way to get a hold of version...
- props.setNewProperty(null, VERSION, Version.STRING);
-
props.setNewProperty(null, COMPILER, decideCompiler());
checkCompilerDetails();
--
1.6.6.rc3
More information about the Qt-jambi-interest
mailing list