From 990728f07dcaf801ef5834b7d11f52e0febd2e19 Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Wed, 29 May 2013 06:39:44 +0000
Subject: [PATCH] OPENDJ-946 Package build fails when special chars are contained in the VERSION_QUALIFIER. - The packages name for Deb/RPM follows the rules given by their respective documentation. - Adding a VERSION_QUALIFIER containing special chars no longer make fail the package build.
---
opendj-sdk/opends/src/build-tools/org/opends/build/tools/CreateVersionString.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/opendj-sdk/opends/src/build-tools/org/opends/build/tools/CreateVersionString.java b/opendj-sdk/opends/src/build-tools/org/opends/build/tools/CreateVersionString.java
index 4aaf9380..d07cbfc 100644
--- a/opendj-sdk/opends/src/build-tools/org/opends/build/tools/CreateVersionString.java
+++ b/opendj-sdk/opends/src/build-tools/org/opends/build/tools/CreateVersionString.java
@@ -71,9 +71,17 @@
versionString.append(".");
versionString.append(getProject().getProperty("POINT_VERSION"));
+ // Sets the version string to the property used by packages.
+ getProject().setNewProperty("pkg_version_string", versionString.toString());
+
String versionQualifier = getProject().getProperty("VERSION_QUALIFIER");
versionString.append(versionQualifier);
+ // Removes all special chars contained in the version qualifier
+ // Sets the version qualifier to the property used by packages.
+ getProject().setNewProperty("pkg_version_qualifier",
+ versionQualifier.replaceAll("[^A-Za-z0-9]", ""));
+
try
{
int buildNumber =
--
Gitblit v1.10.0