packaging

svn changeset:2921/svn branch:trunk

diff --git a/build/VERSION b/build/VERSION
index 7f3ea9fcc2e87e8ff170a95051a61c576aaa76aa..8b88ec304100738a34cfe1019025c0ec6b93b175 100644 (file)
--- a/build/VERSION
+++ b/build/VERSION
@@ -1 +1 @@
-version=5.0.0-alpha-2
+version=5.0.0-alpha-2
\ No newline at end of file

diff --git a/build/build.properties b/build/build.properties
index 8cc38ea9f151bae1557c45bdd7e0273593dcbc44..95eaaf9fec1cf4a3d1525eef3d9a5310b98eb8d7 100644 (file)
--- a/build/build.properties
+++ b/build/build.properties
@@ -1,2 +1,7 @@
-version=5.0.0-alpha-4
-result-path=build/result
+result-path=/result
+product-file=itmill-toolkit
+product-name=IT Mill Toolkit
+toolkit-package=com/itmill/toolkit
+eclipse-workspace-name=itmill-toolkit-examples
+eclipse-launch-vmargs=-Xms256M -Xmx512M
+

diff --git a/build/build.xml b/build/build.xml
index d5508299de098d5c780e653df57056a163efc65f..1eb8da93cd663331aebf616e74d045b8a96f2408 100644 (file)
--- a/build/build.xml
+++ b/build/build.xml
@@ -104,13 +104,9 @@
                <mkdir dir="${result-path}" />
 
                <property file="build/build.properties" />
-               <property name="product-file" value="itmill-toolkit" />
-               <property name="product-name" value="IT Mill Toolkit" />
-               <property name="toolkit-package" value="com/itmill/toolkit" />
-               <property name="eclipse-workspace-name" value="itmill-toolkit-examples" />
-               <property name="eclipse-launch-vmargs" value="-Xms256M -Xmx512M" />
+               <property file="build/VERSION" />
                <property file="build/html-style.properties" />
-
+               
                <!-- Destination files -->
                <property name="lib-jar-name" value="${product-file}-${version}.jar" />
                <property name="demo-war-name" value="${product-file}-demo-${version}.war" />
@@ -317,10 +313,10 @@
                        </fileset>
                </copy>
 
-               <rename src="${output-dir}/eclipse-classpath" dest="${output-dir}/.classpath" />
-               <rename src="${output-dir}/eclipse-project" dest="${output-dir}/.project" />
-               <rename src="${output-dir}/eclipse-IT Mill Toolkit Hosted Mode-launch" dest="${output-dir}/IT Mill Toolkit Hosted Mode.launch" />
-               <rename src="${output-dir}/eclipse-IT Mill Toolkit Web Mode-launch" dest="${output-dir}/IT Mill Toolkit Web Mode.launch" />
+               <move file="${output-dir}/eclipse-classpath" tofile="${output-dir}/.classpath" />
+               <move file="${output-dir}/eclipse-project" tofile="${output-dir}/.project" />
+               <move file="${output-dir}/eclipse-IT Mill Toolkit Hosted Mode-launch" tofile="${output-dir}/IT Mill Toolkit Hosted Mode.launch" />
+               <move file="${output-dir}/eclipse-IT Mill Toolkit Web Mode-launch" tofile="${output-dir}/IT Mill Toolkit Web Mode.launch" />
                <if>
                        <equals arg1="${package-platform}" arg2="windows" />
                        <then>