From 0bb03284d986995021189984164b3e008f4c8cb6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Petter=20Holmstr=C3=B6m?= Date: Fri, 30 Oct 2009 08:51:39 +0000 Subject: [PATCH] Merged with 6.2 svn changeset:9487/svn branch:portlet_2.0 --- build/build.xml | 1756 ++++++++++------------------------------------- 1 file changed, 357 insertions(+), 1399 deletions(-) diff --git a/build/build.xml b/build/build.xml index 50aed8b059..e19f6ef8a5 100644 --- a/build/build.xml +++ b/build/build.xml @@ -1,1441 +1,399 @@ - + - - When creating release use only "package-*" targets: - package-all - * creates four release packages for three three platforms (below) - - package-windows - * vaadin-windows-.zip - - package-linux - * vaadin-linux-.tar.bz2 - - package-mac - * vaadin-mac-.tar.gz - * vaadin-mac-.dmg - - In addition, the OOPHM package has the following target for building: - package-oophm - * vaadin-oophm-.zip - - NOTE: This build script requires directories named ${gwt-dir}/(linux|windows|mac) . - See build.properties to define path where your gwt installation is located. - You must unpack platform specific binaries under linux, windows and mac directories. - ${gwt-dir}/${platform} (linux|windows|mac) are used for - a) compile WebContent/VAADIN/widgetsets - b) creating platform specific release ZIP/TGZ packages. - - NOTE FOR USING OOPHM: - * To build with oophm define the property platform=oophm - * In Eclipse this is done in External Tools Configurations -> properties - * If you are using windows you must use JDK 1.6 and not 1.5 - * To enable building with JDK 1.6, define ignoreversion=1 - --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Creating package for Mac platform. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Java version is ${ant.java.version} as required. - - - - - - - - Java Servlet API is available. - - - - Java Servlet API specification 2.3 used. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Base Version: ${version} - Full Version: ${version.full} - - Vaadin package is: ${toolkit-package} - - - - - - - - We are on ${platform} platform (${os.name} ${os.version}), using ${gwt-dir}/${platform}/${lib-gwt-dev} (${gwt-version}). - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Creating package for ${package-platform} platform. - - - - - - - - - - - - - - - - - - - - - Creating package for ${package-platform} platform. - - - - - - - - - - - - - - - - - - - - Creating package for ${package-platform} platform. - - - - - - - - - - - - - - - - - - - Creating package for ${package-platform} platform. - - - - - - - - - - - - - - - - - - - - Building WAR - - - - - - - - - - - - - - - - - - - - - - - - - Building Liferay zip - - - - - - - - - - - - - - - - - - - - ##teamcity[publishArtifacts '${result-path}/${product-file}-${version.full}-liferay.zip'] - - - - - - - - - - - - - Creating Mac disk image (dmg) - - hdiutil create -format UDRW -volname ${product-file}-${version.full} -srcfolder ${result-path}/${product-file}-${package-platform}-${version.full} ${result-path}/disk-image.dmg - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Adding platform specific files for ${package-platform} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Copying src directory and processing copied files. - Replacing <version> tag with build version for java/html/css/xml files. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Unifying mix usage of Mac/Linux/Win linefeeds for java/html/css/xml files. - - - - Copying non java/html/css/xml files such as images. - - - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Adding demo sources to WebContent/WEB-INF/src - - - - - - - Creating demo source html files - - - - Adding VAADIN/themes, demo and hsqldb.jar files. - - - - - - - - - + + - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - - + - - Compiling custom fileupload classes. - - + - - - - - - - + + - - Compiling src (server-side) - - - - - - - - - - - + + + + - - Combining default themes css files - - - - - - - - - - - - + - - TEST TARGET CALLED - + + + + + + + - - - - - - - - - - - - - + - - Removing widgetset temp files - - + + + - - - - - - - - - - - - - - - + + + + + - - + + + + + + + + + + - - - - - - - + + - - - Compiling widgetset ${widgetset}. Output directory: ${widgetsets-output-dir} - - - - - - - - - - - - - + + + + + + + + + + - Compiled ${widgetset} - - - - - - - + JavaScript syntax check, optimizing and obfuscation. + + + + + + + + @{file} + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Compiled ReservationWidgetSet - - - - - - - - - - - - - - - - - - - - - - Compiling widget sets sequentially. - - - - - - - - - - - - - Compiling widget sets in parallel. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - We are on ${platform} platform, using ${gwt-dir}/${platform}/${lib-gwt-dev}. - GWT dir: ${gwt-dir} - Widget sets output dir: ${widgetsets-output-dir} - - - - - - - - - - - - - - - - - - - - - - - - Creating libs (server-side) ${lib-jar-name} - - - ${version.full} - ${gwt-version} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Building demos - Adding demo class files. - - - - - - - - - Adding source for demos - - - - - - - - - - - - - - - - - - - - - - - - - - - - XEP license expected to be installed as ${xep.license.path.installed} - - - - - - - - - - Checking out manual from repository ${manual.repository} - - - - - - - - - - - - - - Manual checked out from repository successfully - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${javadoc.doctitle} - - ${javadoc.bottom} - - - - - - - - - - - - - - - - - - ##teamcity[publishArtifacts '${result-path}/differences-linux.txt'] - - - - - - - - - - - - - - - - - - - - - - Creating symlink to GWT installation directory. - - - - - - - - - - - - - - - - - - - - - Base version: ${version} - Build number: ${build.number} - Build tag: ${build.tag} - Publish target: ${nightly.publish} - - - - - - - - Version will be: ${version.full} + + + + + + + + + - - - ##teamcity[buildNumber '${version}-c${build.number}'] - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - ##teamcity[publishArtifacts '${output-dir}/WebContent/WEB-INF/lib/${lib-jar-name}'] - + + + + + - - - - Installing ${output-dir}/WebContent/${lib-jar-name} to ${nightly.publish} - Hopefully you have permissions for the copy operation with SSH. + + + + + + + + + + + + + - - + + + + Building demo + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + - Result: ${nightly.install.scp.result} - + + + + + + + - - + - - - - Publishing ${output-dir}/WebContent/${lib-jar-name} to Maven repository - - - - - - - - - - + - - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + + + + ${javadoc.doctitle} + + ${javadoc.bottom} + + + + - Version: ${version.full} + + + - - - - + + + + + + + + + + + - + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + + + - - - - - - - - + + + + + + - - ##teamcity[testSuiteStarted name='com.vaadin.tests.test-framework'] + + - - ##teamcity[testStarted name='testingSmoketest'] - ##teamcity[testStdOut name='testingSmoketest' out='Here be some text related to the test.] - ##teamcity[testFinished name='testingSmoketest'] - ##teamcity[testSuiteFinished name='com.vaadin.tests.test-framework'] - - - - -- 2.39.5