1.1 --- a/build.xml Thu Jul 26 14:58:05 2012 +0200
1.2 +++ b/build.xml Thu Jul 26 22:01:24 2012 +0200
1.3 @@ -13,6 +13,10 @@
1.4 <property name="timestamp.file" value=".lastModified"/>
1.5
1.6 <property environment="env"/>
1.7 + <property name="env.BUILD_NUMBER" value="0" description="Set a fake value if not run from Jenkins"/>
1.8 + <property name="env.next_jira_release_version" value="8.72.0" description="Set a fake value if not run from Jenkins"/>
1.9 + <property name="new_version" value="${env.next_jira_release_version}.${env.BUILD_NUMBER}" description="Set a version number based on info from Jenkins"/>
1.10 +
1.11 <condition property="build.id" value="${env.BUILD_ID}" else="dev">
1.12 <isset property="env.BUILD_ID"/>
1.13 </condition>
1.14 @@ -132,10 +136,13 @@
1.15 <echo level="verbose">${modules}</echo>
1.16
1.17 <foreach param="module.path" target="-vcs-log" list="${modules}" delimiter=":"/>
1.18 +<!-- <echoproperties srcfile="build/nbms_update.properties" />-->
1.19 + </target>
1.20 +
1.21 + <target name="-add-kit-module" description="add kit module to update" >
1.22 <propertyfile file="build/nbms_update.properties">
1.23 <entry key="selected.modules" default="" operation="+" value="plsql-support.kit/manifest.mf:"/>
1.24 </propertyfile>
1.25 -<!-- <echoproperties srcfile="build/nbms_update.properties" />-->
1.26 </target>
1.27
1.28 <target name="-vcs-log" description="use mercurial to check if the last commit was a release commit">
1.29 @@ -177,31 +184,14 @@
1.30 <target name="current-version" depends="-read-version" description="show current specification.version">
1.31 </target>
1.32
1.33 - <target name="incr-major" description="increment major version for modules with changes" depends="-find-modules-for-update">
1.34 + <target name="update-version" depends="-find-modules-for-update, -add-kit-module"
1.35 + description="update version for all modules in suite that has changes since last release">
1.36 + <echo level="info">Updating modules to version: ${new_version}</echo>
1.37 <loadproperties srcfile="build/nbms_update.properties" />
1.38 <echo>selected.modules=${selected.modules}</echo>
1.39 - <foreach param="manifest.file" target="-major" >
1.40 + <foreach param="manifest.file" target="-update-meta-files" >
1.41 <path path="${selected.modules}"/>
1.42 </foreach>
1.43 - <delete file="build_info.properties" />
1.44 - </target>
1.45 -
1.46 - <target name="incr-minor" description="increment minor version for modules with changes" depends="-find-modules-for-update">
1.47 - <loadproperties srcfile="build/nbms_update.properties" />
1.48 - <echo>selected.modules=${selected.modules}</echo>
1.49 - <foreach param="manifest.file" target="-minor" >
1.50 - <path path="${selected.modules}"/>
1.51 - </foreach>
1.52 - <delete file="build_info.properties" />
1.53 - </target>
1.54 -
1.55 - <target name="incr-revision" description="increment revision version for modules with changes" depends="-find-modules-for-update">
1.56 - <loadproperties srcfile="build/nbms_update.properties" />
1.57 - <echo>selected.modules=${selected.modules}</echo>
1.58 - <foreach param="manifest.file" target="-revision" >
1.59 - <path path="${selected.modules}"/>
1.60 - </foreach>
1.61 - <delete file="build_info.properties" />
1.62 </target>
1.63
1.64 <target name="-read-version">
1.65 @@ -209,61 +199,15 @@
1.66 <property file="${manifest.file}"></property>
1.67 <property name="specification.version" value="${OpenIDE-Module-Specification-Version}"/>
1.68 <echo>OpenIDE-Module: ${OpenIDE-Module}</echo>
1.69 - <echo>Current build number:${specification.version}</echo>
1.70 - <propertyregex property="major.version" input="${specification.version}" regexp="(\d+)\.(\d+)\.(\d+)$" select="\1" />
1.71 - <echo level="verbose">major: ${major.version}</echo>
1.72 - <propertyregex property="minor.version" input="${specification.version}" regexp="(\d+)\.(\d+)\.(\d+)$" select="\2" />
1.73 - <echo level="verbose">minor: ${minor.version}</echo>
1.74 - <propertyregex property="revision.version" input="${specification.version}" regexp="(\d+)\.(\d+)\.(\d+)$" select="\3" />
1.75 - <echo level="verbose">revision: ${revision.version}</echo>
1.76 - <propertyfile file="build_info.properties">
1.77 - <entry key="build.major.number" type="int" value="${major.version}" />
1.78 - <entry key="build.minor.number" type="int" value="${minor.version}" />
1.79 - <entry key="build.revision.number" type="int" value="${revision.version}" />
1.80 - </propertyfile>
1.81 + <echo>Current build number:${env.BUILD_NUMBER}</echo>
1.82 </target>
1.83
1.84 - <target name="-revision" depends="-read-version">
1.85 - <propertyfile file="build_info.properties">
1.86 - <entry key="build.revision.number" type="int" operation="+" value="1"/>
1.87 - </propertyfile>
1.88 -
1.89 - <loadproperties srcfile="build_info.properties" />
1.90 - <manifest file="${manifest.file}" mode="update">
1.91 - <attribute name="OpenIDE-Module-Specification-Version" value="${build.major.number}.${build.minor.number}.${build.revision.number}" />
1.92 + <target name="-update-meta-files" depends="-read-version">
1.93 + <manifest file="${manifest.file}" mode="update" >
1.94 + <attribute name="OpenIDE-Module-Specification-Version" value="${new_version}" />
1.95 </manifest>
1.96 - <replaceregexp match="(dependency\D*code-name-base\W${OpenIDE-Module}\W/\D*)(\d+\.\d+\.\d+)" byline="false"
1.97 - file="plsql-support.kit/nbproject/project.xml" replace="\1${build.major.number}.${build.minor.number}.${build.revision.number}"/>
1.98 - </target>
1.99 -
1.100 - <target name="-minor" depends="-read-version">
1.101 - <propertyfile file="build_info.properties">
1.102 - <entry key="build.minor.number" type="int" operation="+" value="1" />
1.103 - <entry key="build.revision.number" type="int" value="0" />
1.104 - </propertyfile>
1.105 - <loadproperties srcfile="build_info.properties" />
1.106 -
1.107 - <manifest file="${manifest.file}" mode="update">
1.108 - <attribute name="OpenIDE-Module-Specification-Version" value="${build.major.number}.${build.minor.number}.${build.revision.number}" />
1.109 - </manifest>
1.110 - <replaceregexp match="(dependency\D*code-name-base\W${OpenIDE-Module}\W/\D*)(\d+\.\d+\.\d+)" byline="false"
1.111 - file="plsql-support.kit/nbproject/project.xml" replace="\1${build.major.number}.${build.minor.number}.${build.revision.number}"/>
1.112 - </target>
1.113 -
1.114 - <target name="-major" depends="-read-version">
1.115 - <propertyfile file="build_info.properties">
1.116 - <entry key="build.major.number" type="int" operation="+" value="1" />
1.117 - <entry key="build.minor.number" type="int" value="0" />
1.118 - <entry key="build.revision.number" type="int" value="0" />
1.119 - </propertyfile>
1.120 - <!--<echoproperties srcfile="build_info.properties" />-->
1.121 - <loadproperties srcfile="build_info.properties" />
1.122 -
1.123 - <manifest file="${manifest.file}" mode="update" >
1.124 - <attribute name="OpenIDE-Module-Specification-Version" value="${build.major.number}.${build.minor.number}.${build.revision.number}" />
1.125 - </manifest>
1.126 - <replaceregexp match="(dependency\D*code-name-base\W${OpenIDE-Module}\W/\D*)(\d+\.\d+\.\d+)" byline="false"
1.127 - file="plsql-support.kit/nbproject/project.xml" replace="\1${build.major.number}.${build.minor.number}.${build.revision.number}"/>
1.128 + <replaceregexp match="(dependency\D*code-name-base\W${OpenIDE-Module}\W/\D*)(\d+\.\d+\.\d+\.\d+)" byline="false"
1.129 + file="plsql-support.kit/nbproject/project.xml" replace="\1${new_version}"/>
1.130 </target>
1.131
1.132 <target name="all">