Merge pull request modcluster#137 from jfclere/master

Prepare all for beta2
rhusar · Jan 24, 2015 · 02c1f5f · 02c1f5f
2 parents bbe7888 + f331c71
commit 02c1f5f
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 7 deletions.
diff --git a/native/include/mod_proxy_cluster.h b/native/include/mod_proxy_cluster.h
@@ -28,7 +28,7 @@
 #ifndef MOD_PROXY_CLUSTER_H
 #define MOD_PROXY_CLUSTER_H
 
-#define MOD_CLUSTER_EXPOSED_VERSION "mod_cluster/1.3.1.Beta2-SNAPSHOT"
+#define MOD_CLUSTER_EXPOSED_VERSION "mod_cluster/1.3.1.Beta2"
 
 /* define the values for sticky_force */
 #define STSESSION 0x01 /* Use sticky session logic (first sessionid and then domain) */

diff --git a/site-mod_cluster/constants.sh b/site-mod_cluster/constants.sh
@@ -1,13 +1,13 @@
 # Constants
 
 # Change the version...
-VERSION=1.2.6.Final
+VERSION=1.3.1.Beta2
 export VERSION
 
 # Should I overwrite already downloaded files?
 OVERWRITE=false
 
-JENKINS_JOB_URL="http://hudson.qa.jboss.com/hudson/view/mod_cluster/view/mod_cluster/job/"
+JENKINS_JOB_URL="http://jenkins.mw.lab.eng.bos.redhat.com/hudson/view/mod_cluster/view/mod_cluster/job/"
 JENKINS_ARCHIVE_PATH="lastSuccessfulBuild/artifact/jbossnative/build/unix/output/"
 
 OUTPUT_XML_FILE="website.mod_cluster.downloads.${VERSION}.xml"
@@ -16,15 +16,17 @@ OUTPUT_XML_FILE="website.mod_cluster.downloads.${VERSION}.xml"
 # very first elements. This makes sure the java bundle appears as the first thing on the download page.
 # The order of all other elements is of no consequence but for the fact that it affects the
 # order of appearance on the download page...
+# broken for the moment.
+#    solaris10-sparc \
+#    solaris10-sparc64 \
+#    hp-ux-9000_800 \
+#    solaris10-x86 \
 BUILDS="\
     linux-x86_64 \
     linux-i686 \
     macosx \
-    solaris10-sparc \
-    solaris10-sparc64 \
-    solaris10-x86 \
+    solaris10-x64 \
     windows \
-    hp-ux-9000_800 \
     hp-ux-ia64 \
 "
 
@@ -71,6 +73,13 @@ SOLARIS10_X86="\
     mod_cluster-${VERSION}-src-ssl.tar.gz \
     mod_cluster-${VERSION}-src.tar.gz \
 "
+SOLARIS10_X64="\
+    mod_cluster-${VERSION}-solaris10-x84-so.tar.gz \
+    mod_cluster-${VERSION}-solaris10-x84-ssl.tar.gz \
+    mod_cluster-${VERSION}-solaris10-x84 \
+    mod_cluster-${VERSION}-src-ssl.tar.gz \
+    mod_cluster-${VERSION}-src.tar.gz \
+"
 WINDOWS="\
     mod_cluster-${VERSION}-src-ssl.zip \
     mod_cluster-${VERSION}-src.zip \

diff --git a/site-mod_cluster/files_downloader.sh b/site-mod_cluster/files_downloader.sh
@@ -31,6 +31,12 @@ function downloadit () {
         echo "SKIPPING DOWNLOAD for ${url}"
     else
         wget ${url} -O ${VERSION}/${build}/${file} || errors+=( "Failed to download: ${url} Wget returned:$?" )
+        # -O create the file even in case of errors
+        if [ -s ${VERSION}/${build}/${file} ]; then
+           echo "${VERSION}/${build}/${file} downloaded"
+        else
+           rm -f ${VERSION}/${build}/${file}
+        fi
     fi
 }
 
@@ -67,6 +73,11 @@ for build in $BUILDS; do
               downloadit $build $file
           done
         ;;
+     *solaris10-x64*)
+          for file in $SOLARIS10_X64; do
+              downloadit $build $file
+          done
+        ;;
      *windows*)
           for file in $WINDOWS; do
               downloadit $build $file

diff --git a/site-mod_cluster/gen.downloads.sh b/site-mod_cluster/gen.downloads.sh
@@ -116,6 +116,11 @@ generate_document() {
                 print_formatter "${build}" "${file}" "$src_or_bin"
               done
             ;;
+         *solaris10-x64*)
+              for file in $SOLARIS10_X64; do
+                print_formatter "${build}" "${file}" "$src_or_bin"
+              done
+            ;;
          *windows*)
               for file in $WINDOWS; do
                 print_formatter "${build}" "${file}" "$src_or_bin"