shuber 2005/04/21 14:13:46 CEST
Modified files:
. build.xml
Added files:
. .cvsignore README.txt
ant.build.properties.example
jahia_update.jpx
Log:
- Updated build process to use ant.build.properties file just like in Jahia
4.0 and 4.1 branches.
- Also added README.txt file that describes the steps needed to configure the
build process.
- Committing JBuilder project file too.
Revision Changes Path
1.1 +1 -0 jahia_update/.cvsignore (new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia_update/.cvsignore?rev=1.1&content-type=text/plain
1.1 +17 -0 jahia_update/README.txt (new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia_update/README.txt?rev=1.1&content-type=text/plain
1.1 +11 -0 jahia_update/ant.build.properties.example (new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia_update/ant.build.properties.example?rev=1.1&content-type=text/plain
1.10 +38 -23 jahia_update/build.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia_update/build.xml.diff?r1=1.9&r2=1.10&f=h
1.1 +45 -0 jahia_update/jahia_update.jpx (new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia_update/jahia_update.jpx?rev=1.1&content-type=text/plain
Index: .cvsignore
====================================================================
ant.build.properties
Index: README.txt
====================================================================
Following these steps to use to build a Jahia Update package :
Copy ant.build.properties.example to ant.build.properties and modify it :
- Set the path to Jahia DEPLOYMENT directory (point 1).
Used to test the patch and to get the changed files (with correct path)
from the last Jahia version.
- Set the path to Jahia DEVELOPMENT directory (point 2).
Used for make the Jahia.jar file and for execute the MakeLicense utility.
- Set the build number (point 3).
Actually not generated automatically.
- Set the jahia update package name (point 4).
- You have to create a "lastdiff.txt" file with the cvs command line :
cvs diff -r JAHIA_3_1_0_FINAL <jahia_development_dir> | grep Index: >
lastdiff.txt
Actually the automatization of this command (see the 'package' target below)
don't give satisfying results.
When this file is created, it has to be put in the jahia_update/etc
directory
Index: ant.build.properties.example
====================================================================
# 1) Give here the jahia deployment dir for the tests !!!
deploy.webappsroot=c:\jahia405_build6020\tomcat\webapps
# 2) Give here the jahia build dir (from the dev dir)
jahia=d:/devel/_cvc_checkout\jahia_4_0_5
jahia.classes=${jahia}/build/classes
# 3) Give here the jahia build number
buildNb=-1
# 4) Give here the jahia update package name
packageName=JahiaUpdate_4_0_5.jar
# 5) Give here the jahia resource package name -->
resourceName=jahiaResources.jar
Index: jahia_update.jpx
====================================================================
<?xml version="1.0" encoding="UTF-8"?>
<!--JBuilder XML Project-->
<project>
<property category="generalFormatting" name="blockIndent" value="4"/>
<property category="generalFormatting" name="tabSize" value="4"/>
<property category="javaFormatting" name="alwaysClasses" value="1"/>
<property category="javaFormatting" name="catchOnNewLine" value="0"/>
<property category="javaFormatting" name="elseOnNewLine" value="0"/>
<property category="javaFormatting" name="extendsOnNewLine" value="0"/>
<property category="javaFormatting" name="finallyOnNewLine" value="0"/>
<property category="javaFormatting" name="whileOnNewLine" value="0"/>
<property category="javadoc" name="custom.tags.1" value="todo;a;To Do:"/>
<property category="runtime" name="DefaultConfiguration" value="-1"/>
<property category="runtime" name="ExcludeDefaultForZero" value="1"/>
<property category="serverservices" name="disabled.services"
value="jdatastore"/>
<property category="serverservices" name="single.server.name" value="Tomcat
4.0"/>
<property category="sys" name="AuthorLabel" value="@author"/>
<property category="sys" name="BackupPath" value="target/bak"/>
<property category="sys" name="CheckStable" value="1"/>
<property category="sys" name="Company" value=""/>
<property category="sys" name="CompanyLabel" value="Company:"/>
<property category="sys" name="Copyright" value="Copyright (c) 2005"/>
<property category="sys" name="CopyrightLabel" value="Copyright:"/>
<property category="sys" name="DefaultPath" value="src/java"/>
<property category="sys" name="Description" value=""/>
<property category="sys" name="DescriptionLabel" value="Description:"/>
<property category="sys" name="DocPath" value="doc"/>
<property category="sys" name="ExcludeClassEnabled" value="0"/>
<property category="sys" name="IncludeTestPath" value="1"/>
<property category="sys" name="InstanceVisibility" value="2"/>
<property category="sys" name="JDK" value="java version 1.4.2_04-b05"/>
<property category="sys" name="JvmVersion" value="1.2"/>
<property category="sys" name="LastTag" value="0"/>
<property category="sys" name="Libraries" value=""/>
<property category="sys" name="MakeStable" value="0"/>
<property category="sys" name="OutPath" value="target/classes"/>
<property category="sys" name="SourcePath" value="src/java"/>
<property category="sys" name="TestPath" value="src/java"/>
<property category="sys" name="Title" value=""/>
<property category="sys" name="TitleLabel" value="Title:"/>
<property category="sys" name="Version" value="1.0"/>
<property category="sys" name="VersionLabel" value="@version"/>
<property category="sys" name="WorkingDirectory" value="."/>
<file path="build.xml"/>
</project>
Index: build.xml
===================================================================
RCS file: /home/cvs/repository/jahia_update/build.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- build.xml 8 Apr 2005 14:17:40 -0000 1.9
+++ build.xml 21 Apr 2005 12:13:46 -0000 1.10
@@ -1,28 +1,18 @@
<?xml version="1.0"?>
-<!--
-
-Following these steps to use this build file :
-
-- Set the path to Jahia DEPLOYMENT directory (point 1).
- Used to test the patch and to get the changed files (with correct path)
- from the last Jahia version.
-- Set the path to Jahia DEVELOPMENT directory (point 2).
- Used for make the Jahia.jar file and for execute the MakeLicense utility.
-- Set the build number (point 3).
- Actually not generated automatically.
-- Set the jahia update package name (point 4).
-- You have to create a "lastdiff.txt" file with the cvs command line :
- cvs diff -r JAHIA_3_1_0_FINAL <jahia_development_dir> | grep Index: >
lastdiff.txt
- Actually the automatization of this command (see the 'package' target
below)
- don't give satisfying results.
- When this file is created, it has to be put in the jahia_update/etc
directory
-
--->
-
<!-- Build file for application -->
<project name="JahiaUpdate" default="make-jar" basedir=".">
- <!-- set global properties for this build -->
- <target name="init">
+
+ <!-- ===================================================================
-->
+ <!-- Properties are stored in a seperate properties file. This defaults
-->
+ <!-- to ant.build.properties in the basedir of the Jahia Update source
-->
+ <!-- ===================================================================
-->
+
+ <!-- set global properties for this build -->
+ <!-- first check if ${ant.build.properties.file} is present -->
+ <target name="init"
depends="set-build-properties-file-location,init-check-build-properties-file,check-build-properties-file">
+ <!-- read properties from ${ant.build.properties.file} -->
+ <property file="${ant.build.properties.file}"/>
+
<property name="AppName" value="jahia"/>
<property name="PkgName" value="JahiaUpdate"/>
<property name="version" value="1.0"/>
@@ -65,7 +55,7 @@
<property name="deploy.scripts" value="${deploy}/bin"/>
<!-- compile options -->
- <property name="build.compiler" value="classic"/>
+ <!--property name="build.compiler" value="classic"/-->
<property name="debug" value="on"/>
<property name="optimize" value="off"/>
<property name="deprecation" value="on"/>
@@ -206,4 +196,29 @@
-->
</target>
+ <!-- ===================================================================
-->
+ <!-- check if ${ant.build.properties.file} is present
-->
+ <!-- ===================================================================
-->
+ <!-- fail and print message if ${ant.build.properties.file} is not
+ present -->
+
+ <target name="check-build-properties-file"
unless="ant.build.properties.present">
+ <fail message="${ant.build.properties.file} file not present. This
file is
+ required for building Jahia Update. Read README.txt for instructions how
to install the ${ant.build.properties.file} file."/>
+ </target>
+
+ <!-- initialize the ant.build.properties.file property and the
+ ant.build.properties.present property -->
+ <target name="init-check-build-properties-file">
+ <available file="${ant.build.properties.file}" type="file"
+ property="ant.build.properties.present"/>
+ <echo message="Reading properties from
${ant.build.properties.file}"/>
+ </target>
+
+ <target name="set-build-properties-file-location">
+ <property name="ant.build.properties.file"
+ location="ant.build.properties"/>
+ </target>
+
+
</project>
