Revision: 10127
Author: brainslog
Date: Sun Feb 21 15:53:23 2010
Log: Updating Release Script
http://code.google.com/p/mobicents/source/detail?r=10127

Modified:
 /trunk/servers/diameter/release/build-standalone.xml
 /trunk/servers/diameter/release/internal-components-checkout-standalone.xml

=======================================
--- /trunk/servers/diameter/release/build-standalone.xml Fri Oct 16 12:01:58 2009 +++ /trunk/servers/diameter/release/build-standalone.xml Sun Feb 21 15:53:23 2010
@@ -1,43 +1,45 @@
 <?xml version="1.0"?>
 <project name="diameter.release.sf" default="package" basedir=".">

-
- <!-- NOTE#1: THIS WILL WORK ONLY FOR 1.0.1GA+, since before resource did not exist - Put proper versions, and run "ant", after sip is created and upload is finished, to "ant clean"
-                NOTE#2: ./README.txt is used for / readme of zip
-
-        -->
-       <property name="VERSION" value="1.1.0.GA" />
-       <property name="JDIAM_VERSION" value="1.5.3.0-build315" />
-       <property name="MUX_VERSION" value="1.1.0.GA" />
-       <property name="base_VERSION" value="1.1.0.GA" />
-       <property name="cca_VERSION" value="1.1.0.GA" />
-       <property name="sh-client_VERSION" value="1.1.0.GA" />
-       <property name="sh-server_VERSION" value="1.1.0.GA" />
-       <property name="ro_VERSION" value="1.1.0.GA" />
-       <property name="rf_VERSION" value="1.1.0.GA" />
-       <property name="cx-dx_VERSION" value="1.0.0.BETA2" />
-       <property name="base_EXAMPLE_VERSION" value="1.1.0.GA" />
-       <property name="openims_EXAMPLE_VERSION" value="1.1.0.GA" />
+       <!-- Diameter Components Versions -->
+       <property name="VERSION" value="1.1.2.GA" />
+       <property name="JDIAM_VERSION" value="1.5.3.0-build351" />
+       <property name="MUX_VERSION" value="1.1.2.GA" />
+       <property name="base_VERSION" value="1.1.2.GA" />
+       <property name="cca_VERSION" value="1.1.2.GA" />
+       <property name="sh-client_VERSION" value="1.1.2.GA" />
+       <property name="sh-server_VERSION" value="1.1.2.GA" />
+       <property name="ro_VERSION" value="1.1.2.GA" />
+       <property name="rf_VERSION" value="1.1.2.GA" />
+       <property name="cx-dx_VERSION" value="1.0.0.BETA4" />
+       <property name="base_EXAMPLE_VERSION" value="1.1.2.GA" />
+       <property name="openims_EXAMPLE_VERSION" value="1.1.2.GA" />
        <property name="cx-dx_EXAMPLE_VERSION" value="1.0.0.BETA1" />

-       <property name="JAINSLEE_VERSION" value="1.2.6.GA" />
+       <!-- Dependencies Components Versions -->
+       <property name="JAINSLEE_VERSION" value="1.2.7.GA" />
        <property name="JBOSS_VERSION" value="4.2.3.GA" />

-       <property name="SAR_CONFIGURATION" value="jboss-4" />
+       <!-- jboss-x. to be used as building profile -->
+       <property name="DEFAULT_SAR_CONFIGURATION" value="4" />
+       <property name="ALTERNATIVE_SAR_CONFIGURATION" value="5" />

<property name="ra_list" value="base,cca,sh-client,sh-server,ro,rf,cx-dx" />
        <property name="example_list" value="base,openims,cx-dx" />
+
+       <!-- Directories Configuration -->
+       <property name="downloads_dir" value="${basedir}/downloads" />
        <property name="checkout_base_dir" value="${basedir}/diameter" />
        <property name="zip_dir" value="${basedir}/diameter/zip" />
+ <property name="alt_mux_zip_dir" value="${basedir}/diameter/alt-mux-zip" />

        <property name="zip_file_name" value="mobicents-diameter-${VERSION}" />
+ <property name="jboss5_mux_zip_file_name" value="mobicents-diameter-mux-jboss5-${VERSION}.sar.zip" />

        <property name="failoncopy" value="true" />

        <!-- Definition -->
-       <property environment="sys">
-       </property>
+       <property environment="sys" />
<condition property="mvn.executable" value="${sys.M2_HOME}\bin\mvn.bat" else="mvn">
                <os family="windows" />
        </condition>
@@ -48,49 +50,14 @@
                </classpath>
        </taskdef>

-
-       <target name="init">
-       </target>
-
-
-       <target name="clean" description="Remove everything that we created.">
-               <delete dir="${checkout_base_dir}" verbose="false" />
-       </target>
-
- <target name="package" description="Create zip file: ${checkout_base_dir}/${zip_file_name}.zip" depends="build-src-zip,build-src,copy-jars,prepare-text-content"> - <zip destfile="${checkout_base_dir}/${zip_file_name}.zip" basedir="${zip_dir}"/>
-
-               <antcall target="checksum">
- <param name="source.file" value="${checkout_base_dir}/${zip_file_name}.zip" />
-      <param name="algorithm" value="sha1" />
-    </antcall>
-       </target>
-
-
- <target name="checkout" depends="init,checkout-core,checkout-resources,checkout-examples,checkout-docs,checkout-jainslee" /> - <target name="build-src" depends="build-src-core,build-src-resources,build-src-examples,build-docs,build-jainslee" />
+       <target name="init" />
+
+ <target name="checkout" depends="init,checkout-core,checkout-resources,checkout-examples,checkout-docs,checkout-jopr-plugin,download-jainslee" /> + <target name="build-src" depends="build-src-core,build-src-resources,build-src-examples,build-docs,build-jopr-plugin,unzip-jainslee" /> <target name="prepare-text-content" depends="prepare-text-content-core,prepare-text-content-resources,prepare-text-content-examples" /> - <target name="copy-jars" depends="copy-jars-core,copy-jars-resources,copy-jars-examples,copy-docs,copy-jars-additional-resources" />
-
-
-       <target name="build-src-zip" depends="clean,checkout">
-               <zip destfile="${checkout_base_dir}/${zip_file_name}-src.zip">
- <zipfileset dir="${checkout_base_dir}/core" prefix="core" excludes="release"></zipfileset> - <zipfileset dir="${checkout_base_dir}/resources" prefix="resources" excludes="release"></zipfileset> - <zipfileset dir="${checkout_base_dir}/examples" prefix="examples" excludes="release"></zipfileset>
-               </zip>
-
-               <antcall target="checksum">
- <param name="source.file" value="${checkout_base_dir}/${zip_file_name}-src.zip" />
-      <param name="algorithm" value="sha1" />
-    </antcall>
-       </target>
-
-       <!--
-               ######################
-               #  checkout section  #
-               ######################
-               -->
+ <target name="copy-jars" depends="copy-jars-core,copy-jars-resources,copy-jars-examples,copy-docs,copy-jopr-plugin,copy-jars-additional-resources" />
+
+       <!-- Checkout section -->

        <target name="checkout-core">
<echo>Checkout Diameter Core (jDiameter v${JDIAM_VERSION}, MUX v${MUX_VERSION})</echo>
@@ -98,28 +65,25 @@
<arg line="-f internal-components-checkout-standalone.xml validate -P checkout -Djdiam_version=${JDIAM_VERSION} -Dmux_version=${MUX_VERSION}" />
                </exec>
        </target>
-       <target name="checkout-resources">
-
+
+       <target name="checkout-resources">
                <for delimiter="," param="ra.name" list="${ra_list}">
                        <sequential>
<echo>Checkout Diameter @{ra.name} Resource Adaptor v...@{ra.name}_version}</echo> <exec executable="${mvn.executable}" dir="${ant.file.diameter.release}/../"> <arg line="-f internal-components-checkout-standalone.xml validate -P checkout-resource -dresource_na...@{ra.name} -dresource_version...@{ra.name}_version}" />
                                </exec>
-
                        </sequential>
                </for>
-
        </target>
-       <target name="checkout-examples">
-
+
+       <target name="checkout-examples">
                <for delimiter="," param="example.name" list="${example_list}">
                        <sequential>
<echo>Checkout Diameter Example @{example.name} v...@{example.name}_example_version}</echo> <exec executable="${mvn.executable}" dir="${ant.file.diameter.release}/../"> <arg line="-f internal-components-checkout-standalone.xml validate -P checkout-example -dexample_na...@{example.name} -dexample_version...@{example.name}_example_version}" />
                                </exec>
-
                        </sequential>
                </for>
        </target>
@@ -131,19 +95,24 @@
                </exec>
        </target>

-       <!--
-       #####################
-       #  compile section  #
-       #####################
-       -->
+       <target name="checkout-jopr-plugin">
+               <echo>Checkout Diameter Jopr Plugin</echo>
+ <exec executable="${mvn.executable}" dir="${ant.file.diameter.release}/../"> + <arg line="-f internal-components-checkout-standalone.xml validate -P checkout-jopr-plugin" />
+               </exec>
+       </target>
+
+       <!-- Compile Section -->
+
        <target name="build-src-core">
<exec executable="${mvn.executable}" dir="${checkout_base_dir}/core/jdiameter">
                        <arg line="-f pom.xml install" />
                </exec>
                <exec executable="${mvn.executable}" 
dir="${checkout_base_dir}/core/mux">
-                       <arg line="-f pom.xml install" />
+ <arg line="-f pom.xml clean install -Pjboss${DEFAULT_SAR_CONFIGURATION}" />
                </exec>
        </target>
+
        <target name="build-src-resources">
                <for delimiter="," param="ra.name" list="${ra_list}">
                        <sequential>
@@ -154,6 +123,7 @@
                        </sequential>
                </for>
        </target>
+
        <target name="build-src-examples">
                <for delimiter="," param="example.name" list="${example_list}">
                        <sequential>
@@ -164,17 +134,20 @@
                        </sequential>
                </for>
        </target>
+
        <target name="build-docs">
<exec executable="${mvn.executable}" dir="${checkout_base_dir}/diameter-docs">
                        <arg line="clean compile -Ppdf 
-Denv.DOCNAME=Diameter_User_Guide" />
                </exec>
        </target>

-       <!--
-                       #######################
-                       #  copy jars section  #
-                       #######################
-               -->
+       <target name="build-jopr-plugin">
+ <exec executable="${mvn.executable}" dir="${checkout_base_dir}/diameter-jopr-plugin">
+                       <arg line="clean install" />
+               </exec>
+       </target>
+
+       <!-- Copy jars section -->

        <target name="copy-jars-core">
                <copy todir="${zip_dir}/core/jdiameter">
@@ -191,8 +164,9 @@
                                <include 
name="mobicents-diameter-mux-${MUX_VERSION}.jar" />
                        </fileset>
                </copy>
- <unzip src="${checkout_base_dir}/core/mux/sar-${SAR_CONFIGURATION}/target/mobicents-diameter-mux-${MUX_VERSION}.sar" dest="${zip_dir}/core/mux/mobicents-diameter-mux-${MUX_VERSION}.sar/"/> + <unzip src="${checkout_base_dir}/core/mux/sar-jboss-${DEFAULT_SAR_CONFIGURATION}/target/mobicents-diameter-mux-${MUX_VERSION}.sar" dest="${zip_dir}/core/mux/mobicents-diameter-mux-${MUX_VERSION}.sar/"/>
        </target>
+
        <target name="copy-jars-resources">
                <for delimiter="," param="ra.name" list="${ra_list}">
                        <sequential>
@@ -206,10 +180,11 @@
                        </sequential>
                </for>
        </target>
+
        <target name="copy-jars-examples">
                <for delimiter="," param="example.name" list="${example_list}">
                        <sequential>
- <echo>Copy Diameter Exampe: @{example.name} Version: $...@{example.name}_example_version}</echo> + <echo>Copy Diameter Example: @{example.name} Version: $...@{example.name}_example_version}</echo>

                                <copy 
todir="${zip_dir}/examples/@{example.name}">
<fileset dir="${checkout_base_dir}/examples/@{example.name}/du/target">
@@ -219,6 +194,7 @@
                        </sequential>
                </for>
        </target>
+
        <target name="copy-docs">
                <copy todir="${zip_dir}">
<fileset dir="${checkout_base_dir}/diameter-docs/target/docbook/publish/en-US/pdf">
@@ -226,9 +202,18 @@
                        </fileset>
                </copy>
        </target>
+
+       <target name="copy-jopr-plugin">
+ <copy tofile="${zip_dir}/mobicents-diameter-jopr-plugin-1.0.0-PREVIEW.jar">
+                       <fileset 
dir="${checkout_base_dir}/diameter-jopr-plugin/target/">
+                               <include name="*.jar" />
+                       </fileset>
+               </copy>
+       </target>
+
        <target name="copy-jars-additional-resources">
- <copy todir="${zip_dir}/examples/openims/thirdparty/sip11" file="${mobicents.folder.path}/resources/sip11/sip11-ra-DU-${JAINSLEE_VERSION}.jar" failonerror="${failoncopy}" /> - <copy todir="${zip_dir}/examples/openims/thirdparty/sip11" file="${mobicents.folder.path}/resources/sip11/du-management.xml" failonerror="${failoncopy}"> + <copy todir="${zip_dir}/examples/openims/thirdparty/sip11" file="${jainslee.folder.path}/resources/sip11/sip11-ra-DU-${JAINSLEE_VERSION}.jar" failonerror="${failoncopy}" /> + <copy todir="${zip_dir}/examples/openims/thirdparty/sip11" file="${jainslee.folder.path}/resources/sip11/du-management.xml" failonerror="${failoncopy}">
                        <filterchain>
                                <replacetokens>
                                        <token key="JAINSLEE_VERSION" 
value="${JAINSLEE_VERSION}" />
@@ -237,8 +222,8 @@
          </copy>
<copy todir="${zip_dir}/examples/openims/thirdparty/sip11" file="${checkout_base_dir}/examples/openims/release/thirdparty/sip11/build.xml" failonerror="${failoncopy}" />

- <copy todir="${zip_dir}/examples/openims/thirdparty/sip-services-proxy-with-initial-invite" file="${mobicents.folder.path}/examples/sip-services/sip-services-proxy-with-initial-invite-DU-${JAINSLEE_VERSION}.jar" failonerror="${failoncopy}" /> - <copy todir="${zip_dir}/examples/openims/thirdparty/sip-services-proxy-with-initial-invite" file="${mobicents.folder.path}/examples/sip-services/proxy-with-initial-invite-du-management.xml" failonerror="${failoncopy}"> + <copy todir="${zip_dir}/examples/openims/thirdparty/sip-services-proxy-with-initial-invite" file="${jainslee.folder.path}/examples/sip-services/sip-services-proxy-with-initial-invite-DU-${JAINSLEE_VERSION}.jar" failonerror="${failoncopy}" /> + <copy todir="${zip_dir}/examples/openims/thirdparty/sip-services-proxy-with-initial-invite" file="${jainslee.folder.path}/examples/sip-services/proxy-with-initial-invite-du-management.xml" failonerror="${failoncopy}">
                        <filterchain>
                                <replacetokens>
                                        <token key="JAINSLEE_VERSION" 
value="${JAINSLEE_VERSION}" />
@@ -248,12 +233,7 @@
<copy todir="${zip_dir}/examples/openims/thirdparty/sip-services-proxy-with-initial-invite" file="${checkout_base_dir}/examples/openims/release/thirdparty/sip-services-proxy-with-initial-invite/build.xml" failonerror="${failoncopy}" />
        </target>

-       <!--
-                               ##################################
-                               #  prepare text content section  #
-                               ##################################
-                       -->
-
+       <!-- Prepare text content section -->

        <target name="prepare-text-content-core">
<copy todir="${zip_dir}" file="${basedir}/README.txt" failonerror="${failoncopy}">
@@ -288,6 +268,7 @@
                        </filterchain>
                </copy>
        </target>
+
        <target name="prepare-text-content-resources">
                <for delimiter="," param="ra.name" list="${ra_list}">
                        <sequential>
@@ -324,23 +305,85 @@
                </for>
        </target>

-  <!-- JAIN SLEE -->
-
- <property name="mobicents.distro.zip.path" value="mobicents-jainslee-server-${JAINSLEE_VERSION}.zip" /> - <property name="mobicents.folder.path" value="${checkout_base_dir}/mobicents-jainslee-server-${JAINSLEE_VERSION}" />
-
-       <target name="build-jainslee">
- <unzip src="${checkout_base_dir}/${mobicents.distro.zip.path}" dest="${mobicents.folder.path}" />
-       </target>
-
-  <target name="checkout-jainslee">
+       <!-- JAIN SLEE -->
+
+ <property name="jainslee.distro.zip.path" value="${downloads_dir}/mobicents-jainslee-server-${JAINSLEE_VERSION}.zip" /> + <property name="jainslee.folder.path" value="${checkout_base_dir}/mobicents-jainslee-server-${JAINSLEE_VERSION}" />
+
+       <available file="${jainslee.distro.zip.path}" property="got.jainslee" />
+
+       <target name="download-jainslee" unless="got.jainslee">
                <echo>Downloading Mobicents JAIN SLEE Server 
v${JAINSLEE_VERSION}</echo>
- <get verbose="true" dest="${checkout_base_dir}/${mobicents.distro.zip.path}" src="http://downloads.sourceforge.net/mobicents/mobicents-jainslee-server-${JAINSLEE_VERSION}-jboss-${JBOSS_VERSION}.zip"; />
+               <mkdir dir="${downloads_dir}"/>
+ <get verbose="true" dest="${jainslee.distro.zip.path}" src="http://downloads.sourceforge.net/mobicents/mobicents-jainslee-server-${JAINSLEE_VERSION}-jboss-${JBOSS_VERSION}.zip"; />
        </target>
-
+
+       <target name="unzip-jainslee">
+ <unzip src="${jainslee.distro.zip.path}" dest="${jainslee.folder.path}" />
+       </target>
+
+       <!-- Release procedures : Make ZIP(s), Checksum , Clean -->
+
+       <target name="build-src-zip" depends="clean, checkout">
+               <zip destfile="${basedir}/${zip_file_name}-src.zip">
+ <zipfileset dir="${checkout_base_dir}/core" prefix="core" excludes="release"></zipfileset> + <zipfileset dir="${checkout_base_dir}/resources" prefix="resources" excludes="release"></zipfileset> + <zipfileset dir="${checkout_base_dir}/examples" prefix="examples" excludes="release"></zipfileset>
+               </zip>
+
+               <antcall target="checksum">
+                       <param name="source.file" 
value="${basedir}/${zip_file_name}-src.zip" />
+                       <param name="algorithm" value="sha1" />
+               </antcall>
+       </target>
+
+ <target name="package" description="Create zip file: ${checkout_base_dir}/${zip_file_name}.zip" depends="build-src-zip, build-src, copy-jars, prepare-text-content">
+               <zip destfile="${basedir}/${zip_file_name}.zip" 
basedir="${zip_dir}"/>
+               <antcall target="checksum">
+                       <param name="source.file" 
value="${basedir}/${zip_file_name}.zip" />
+                       <param name="algorithm" value="sha1" />
+               </antcall>
+
+               <antcall target="build-and-package-mux-alternative" />
+
+               <antcall target="clean" />
+       </target>
+
+ <target name="build-and-package-mux-alternative" description="Create zip file: ${basedir}/${jboss5_mux_zip_file_name}">
+               <exec executable="${mvn.executable}" 
dir="${checkout_base_dir}/core/mux">
+ <arg line="-f pom.xml clean install -Pjboss${ALTERNATIVE_SAR_CONFIGURATION}" />
+               </exec>
+
+               <mkdir dir="${alt_mux_zip_dir}" />
+
+ <copy todir="${alt_mux_zip_dir}" file="${checkout_base_dir}/core/mux/release/README.txt" failonerror="${failoncopy}">
+                       <filterchain>
+                               <replacetokens>
+                                       <token key="MUX_VERSION" 
value="${MUX_VERSION}" />
+                               </replacetokens>
+                       </filterchain>
+               </copy>
+
+               <copy todir="${alt_mux_zip_dir}">
+                       <fileset dir="${checkout_base_dir}/core/mux/jar/target">
+                               <include 
name="mobicents-diameter-mux-${MUX_VERSION}.jar" />
+                       </fileset>
+               </copy>
+ <unzip src="${checkout_base_dir}/core/mux/sar-jboss-${ALTERNATIVE_SAR_CONFIGURATION}/target/mobicents-diameter-mux-${MUX_VERSION}.sar" dest="${alt_mux_zip_dir}/mobicents-diameter-mux-${MUX_VERSION}.sar/"/>
+
+ <zip destfile="${basedir}/${jboss5_mux_zip_file_name}" basedir="${alt_mux_zip_dir}"/>
+               <antcall target="checksum">
+ <param name="source.file" value="${basedir}/${jboss5_mux_zip_file_name}" />
+                       <param name="algorithm" value="sha1" />
+               </antcall>
+       </target>
+
        <target name="checksum">
<checksum file="${source.file}" algorithm="${algorithm}" fileext=".${algorithm}.asc" forceOverwrite="yes"/>
        </target>

+       <target name="clean" description="Remove everything that we created.">
+               <delete dir="${checkout_base_dir}" verbose="false" />
+       </target>

 </project>
=======================================
--- /trunk/servers/diameter/release/internal-components-checkout-standalone.xml Fri Oct 16 12:01:58 2009 +++ /trunk/servers/diameter/release/internal-components-checkout-standalone.xml Sun Feb 21 15:53:23 2010
@@ -19,6 +19,7 @@
<diameter.resource.connectionURL>scm:svn:http://mobicents.googlecode.com/svn/tags/servers/diameter/resources</diameter.resource.connectionURL> <diameter.example.connectionURL>scm:svn:http://mobicents.googlecode.com/svn/tags/servers/diameter/examples</diameter.example.connectionURL> <diameter.docs.connectionURL>scm:svn:http://mobicents.googlecode.com/svn/trunk/servers/diameter/diameter-docs</diameter.docs.connectionURL> + <diameter.jopr-plugin.connectionURL>scm:svn:http://mobicents.googlecode.com/svn/trunk/servers/diameter/tools/jopr-plugin</diameter.jopr-plugin.connectionURL>

        </properties>

@@ -177,6 +178,41 @@
                                                                </configuration>
                                                        </execution>

+                                               </executions>
+                                       </plugin>
+                               </plugins>
+                       </build>
+               </profile>
+               <profile>
+                       <id>checkout-jopr-plugin</id>
+                       <build>
+                               <plugins>
+                                       <plugin>
+                                               
<groupId>org.apache.maven.plugins</groupId>
+                                               
<artifactId>maven-scm-plugin</artifactId>
+                                               <inherited>false</inherited>
+                                               <executions>
+                                                       <execution>
+                                                               
<id>diameter-jopr-plugin-checkout</id>
+                                                               <goals>
+                                                                       
<goal>checkout</goal>
+                                                               </goals>
+                                                               
<phase>validate</phase>
+                                                               <configuration>
+                                                                       
<scmVersion>HEAD</scmVersion>
+                                                                       
<scmVersionType>revision</scmVersionType>
+                                                                       
<skipCheckoutIfExists>false</skipCheckoutIfExists>
+                                                                       
<checkoutDirectory>
+                                                                               
${checkout.basedir}/diameter-jopr-plugin
+                            </checkoutDirectory>
+                                                                       
<connectionUrl>
+                                                                               
${diameter.jopr-plugin.connectionURL}
+                            </connectionUrl>
+                                                                       
<username>${checkout.username}</username>
+                                                                       
<password>${checkout.password}</password>
+                                                               </configuration>
+                                                       </execution>
+
                                                </executions>
                                        </plugin>
                                </plugins>

Reply via email to