Build changes required to integrate Dogtag into Fedora.

git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@804 c9f7a03b-bd48-0410-a16d-cbbf54688b0b

2 files changed, 22 insertions, 49 deletions

diff --git a/pki/base/config/product.xml b/pki/base/config/product.xml
index 01f31a72d..e4059f8ad 100644
--- a/pki/base/config/product.xml
+++ b/pki/base/config/product.xml
@@ -24,8 +24,14 @@
 
 
     <!-- Check for required properties passed-in via the build scripts -->
-    <fail message="The '-Dspecfile=SPECFILE' property MUST always be specified!"
-          unless="specfile"/>
+    <fail message="The '-Dproduct.ui.flavor.prefix=PKI UI FLAVOR' property MUST always be specified by 'ant' (even if one does not exist)!"
+          unless="product.ui.flavor.prefix"/>
+    <fail message="The '-Dproduct.prefix=PKI PREFIX' property MUST always be specified by 'ant' (even if one does not exist)!"
+          unless="product.prefix"/>
+    <fail message="The '-Dproduct=PKI BASENAME' property MUST always be specified by 'ant'!"
+          unless="product"/>
+    <fail message="The '-Dversion=PKI VERSION' property MUST always be specified by 'ant'!"
+          unless="version"/>
 
 
     <!-- Set up optional properties passed-in via the build scripts -->
@@ -34,47 +40,14 @@
     <property name="target" value=""/>
 
 
-    <!-- Set up properties obtained from the spec file -->
-    <exec executable="perl"
-          failonerror="true"
-          outputproperty="Name">
-        <arg value="-ne"/>
-        <arg value="print $1 if /%define base_product\s+(.*)/"/>
-        <arg value="${specfile}"/>
-    </exec>
-
-    <exec executable="perl"
-          failonerror="true"
-          outputproperty="spec.product.ui.prefix">
-        <arg value="-ne"/>
-        <arg value="print $1 if /%define base_ui_prefix\s+(\S+)/"/>
-        <arg value="${specfile}"/>
-    </exec>
-
-    <exec executable="perl"
-          failonerror="true"
-          outputproperty="product.prefix">
-        <arg value="-ne"/>
-        <arg value="print $1 if /%define base_prefix\s+(\S+)/"/>
-        <arg value="${specfile}"/>
-    </exec>
-
-    <exec executable="perl"
-          failonerror="true"
-          outputproperty="product">
-        <arg value="-ne"/>
-        <arg value="print $1 if /%define base_component\s+(\S+)/"/>
-        <arg value="${specfile}"/>
-    </exec>
-
-    <!-- if "spec.product.ui.prefix" is "",                      -->
-    <!--     set "product.ui.prefix" to "";                      -->
-    <!-- otherwise,                                              -->
-    <!--     set "product.ui.prefix" to "spec.product.ui.prefix" -->
+    <!-- if "product.ui.flavor.prefix" is "",                      -->
+    <!--     set "product.ui.prefix" to "";                        -->
+    <!-- otherwise,                                                -->
+    <!--     set "product.ui.prefix" to "product.ui.flavor.prefix" -->
     <condition property="product.ui.prefix"
                value=""
-               else="${spec.product.ui.prefix}">
-        <equals arg1="${spec.product.ui.prefix}"
+               else="${product.ui.flavor.prefix}">
+        <equals arg1="${product.ui.flavor.prefix}"
                 arg2=""/>
     </condition>
 
@@ -111,14 +84,6 @@
         </and>
     </condition>
 
-    <exec executable="perl"
-          failonerror="true"
-          outputproperty="version">
-        <arg value="-ne"/>
-        <arg value="print $1 if /%define base_version\s+(\S+)/"/>
-        <arg value="${specfile}"/>
-    </exec>
-
 
     <!-- Set up architecture-dependent properties -->
     <exec executable="uname"
diff --git a/pki/base/config/release.xml b/pki/base/config/release.xml
index fc43aaeb7..a114d98ff 100644
--- a/pki/base/config/release.xml
+++ b/pki/base/config/release.xml
@@ -29,6 +29,10 @@
             description="--> Generate this target locally">
         <echo message="Generating the '${product.name}' target locally ..."/>
         <exec executable="ant" dir="${release.root}">
+            <arg value="-Dproduct.ui.flavor.prefix=${product.ui.flavor.prefix}"/>
+            <arg value="-Dproduct.prefix=${product.prefix}"/>
+            <arg value="-Dproduct=${product}"/>
+            <arg value="-Dversion=${version}"/>
             <arg value="-Dspecfile=${product.name}.spec"/>
             <arg value="-Ddirsec=${dirsec}"/>
             <arg value="${target}"/>
@@ -50,6 +54,10 @@
         <echo message="Creating the '${product.name}' source distribution ..."/>
         <exec executable="ant"
               dir="${release.root}">
+            <arg value="-Dproduct.ui.flavor.prefix=${product.ui.flavor.prefix}"/>
+            <arg value="-Dproduct.prefix=${product.prefix}"/>
+            <arg value="-Dproduct=${product}"/>
+            <arg value="-Dversion=${version}"/>
             <arg value="-Dspecfile=${product.name}.spec"/>
             <arg value="-Ddirsec=${dirsec}"/>
             <arg value="distribute_source"/>