Update SVR4 factory to avoid conflict with IPS factory

chebrard

30.07.2009 1d9fc1e888ebebd09ab45772441f87c194fbec71

Update SVR4 factory to avoid conflict with IPS factory

Some months ago, Christopher Kampmeier built an pkg(5)-based distribution of 
OpenDS (refer to http://blogs.sun.com/middle/entry/opends_in_ips_format_using) 
Introduction of SVR4 factory for 1.2 has broken this experimentation.
This modification renames some ant variables of the SVR4 factory so that they 
no longer conflict with names used in the Update Center toolkit. 
This is a first step for integrating the IPS factory in the OpenDS project.

 opends/build-svr4.xml

@@ -39,26 +39,26 @@
  <!-- General properties -->
  <property name="svr4.src.dir"      location="src/svr4/${product}" />
  <property name="build.dir"         location="build"                />
  <property name="pkg.dir"           location="${build.dir}/package" />
  <property name="package.dir"       location="${build.dir}/package" />
  <property name="svr4.dir"          location="${build.dir}/package/svr4" />

  <!-- Product specific properties: pkg.name / pkg.fullname / pkg.arch /
       pkg.desc / pkg.vendor / pkg.basedir / pkg.prefix / pkg.type -->
  <!-- Product specific properties: svr4.name / svr4.fullname / svr4.arch /
       svr4.desc / svr4.vendor / svr4.basedir / svr4.prefix / svr4.type -->
  <property file="${svr4.src.dir}/pkg.properties" />

  <!-- Default values for product specific properties -->
  <property name="pkg.name"       value="${product}" />
  <property name="pkg.fullname"   value="${pkg.name}" />
  <property name="pkg.arch"       value="all" />
  <property name="pkg.desc"       value="${product}" />
  <property name="pkg.vendor"     value="Sun Microsystems, Inc." />
  <property name="pkg.basedir"    value="/usr" />
  <property name="svr4.name"       value="${product}" />
  <property name="svr4.fullname"   value="${svr4.name}" />
  <property name="svr4.arch"       value="all" />
  <property name="svr4.desc"       value="${product}" />
  <property name="svr4.vendor"     value="Sun Microsystems, Inc." />
  <property name="svr4.basedir"    value="/usr" />

  <!-- Some others general properties -->
  <property name="svr4.build.dir"        location="${build.dir}/package/svr4/build/${pkg.name}" />
  <property name="svr4.build.dir"        location="${build.dir}/package/svr4/build/${svr4.name}" />
  <property name="svr4.meta.dir"         location="${svr4.build.dir}/meta" />
  <property name="svr4.layout.dir"       location="${svr4.build.dir}/layout" />
  <property name="svr4.layout.pkg.dir"   location="${svr4.build.dir}/layout/${pkg.prefix}" />
  <property name="svr4.layout.pkg.dir"   location="${svr4.build.dir}/layout/${svr4.prefix}" />

  <!-- Must define layout/pkgversion target -->
  <import file="${svr4.src.dir}/layout.xml" />
@@ -77,44 +77,44 @@

  <!-- Construct SVR4 package -->
  <target name="svr4" depends="checkos,wrongos,cleansvr4,pkgversion,layout,metadata,pkgmk,zipsvr4" if="isSunOS" 
        description="Construct ${pkg.name} package for product ${product}.">
    <echo message="Package ${pkg.name} for product ${product} built in ${svr4.dir}" />
        description="Construct ${svr4.name} package for product ${product}.">
    <echo message="Package ${svr4.name} for product ${product} built in ${svr4.dir}" />
  </target>
  
  <!-- Cleanup target -->
  <target name="cleansvr4" if="isSunOS" 
        description="Cleanup SVR4 files.">
    <delete dir="${svr4.build.dir}" />
    <delete dir="${svr4.dir}/${pkg.name}" />
    <delete dir="${svr4.dir}/${svr4.name}" />
  </target>
  
  <!-- Construct metadata data -->
  <target name="metadata" depends="pkginfo,prototype,copyright,depend" if="isSunOS" 
        description="Construct metadata for ${pkg.name}.">
        description="Construct metadata for ${svr4.name}.">
  </target>
  
  <!-- Construct pkginfo file -->
  <target name="pkginfo"  if="isSunOS" depends="pkgversion"
        description="Create pkginfo file based on ${svr4.src.dir}/info.properties" >
    <echo message="Building pkginfo for ${pkg.name}" />
    <echo message="Building pkginfo for ${svr4.name}" />
    <tstamp>
      <format property="rev" pattern="yyyy.MM.dd"/>
    </tstamp>
    <mkdir dir="${svr4.meta.dir}"/>
        <echo file="${svr4.meta.dir}/pkginfo">
PKG=${pkg.name}
NAME=${pkg.fullname}
ARCH=${pkg.arch}
VERSION=${pkg.version},REV=${rev}
SUNW_PRODNAME=${pkg.desc}
SUNW_PRODVERS=${pkg.fullversion}
PKG=${svr4.name}
NAME=${svr4.fullname}
ARCH=${svr4.arch}
VERSION=${svr4.version},REV=${rev}
SUNW_PRODNAME=${svr4.desc}
SUNW_PRODVERS=${svr4.fullversion}
SUNW_PKGVERS=1.0
SUNW_PKGTYPE=${pkg.type}
SUNW_PKGTYPE=${svr4.type}
MAXINST=1000
CATEGORY=application
DESC=${pkg.desc}
VENDOR=${pkg.vendor}
BASEDIR=${pkg.basedir}
DESC=${svr4.desc}
VENDOR=${svr4.vendor}
BASEDIR=${svr4.basedir}
CLASSES=none
HOTLINE=Please contact your local service provider
EMAIL=
@@ -124,7 +124,7 @@
  <!-- Construct prototype file -->
  <target name="prototype" depends="layout" if="isSunOS" 
        description="Create prototype file based on ${svr4.layout.dir}" >
    <echo message="Building prototype for ${pkg.name} pkg" />
    <echo message="Building prototype for ${svr4.name} pkg" />
    <exec executable="pkgproto" dir="${svr4.layout.dir}" output="${svr4.meta.dir}/prototype">
        <arg value="."/>
    </exec>
@@ -145,7 +145,7 @@
  <!-- Construct copyright file -->
  <target name="copyright"  if="isSunOS" 
        description="Create copyright file based on ${svr4.src.dir}/copyright" >
    <echo message="Building copyright for ${pkg.name} pkg" />
    <echo message="Building copyright for ${svr4.name} pkg" />
    <copy file="${svr4.src.dir}/copyright" todir="${svr4.meta.dir}"/>
  </target>

@@ -156,14 +156,14 @@

  <target name="depend" depends="depend.init" if="present"
                description="Create depend file based on ${svr4.src.dir}/depend" >
       <echo message="Building depend for ${pkg.name} pkg" />
       <echo message="Building depend for ${svr4.name} pkg" />
       <copy file="${svr4.src.dir}/depend" todir="${svr4.meta.dir}"/>
  </target>

  <!-- Make package -->
  <target name="pkgmk" if="isSunOS" 
        description="Build ${pkg.name} package" >
    <echo message="Building ${pkg.name} pkg" />
        description="Build ${svr4.name} package" >
    <echo message="Building ${svr4.name} pkg" />
    <echo message="Executing pkgmk -o -d ${svr4.dir} -r ${svr4.layout.dir} -f ${svr4.meta.dir}/prototype in ${svr4.layout.dir}" />
    <exec executable="pkgmk" dir="${svr4.layout.dir}">
        <arg value="-o"/>
@@ -178,10 +178,10 @@
  
  <!-- ZIP package -->
  <target name="zipsvr4" if="isSunOS" 
        description="ZIP ${pkg.name} package" >
    <echo message="Zipping ${pkg.name} pkg" />
    <zip destfile="${svr4.dir}/${pkg.name}.zip">
      <zipfileset dir="${svr4.dir}" includes="${pkg.name}/**/*"/>
        description="ZIP ${svr4.name} package" >
    <echo message="Zipping ${svr4.name} pkg" />
    <zip destfile="${svr4.dir}/${svr4.name}.zip">
      <zipfileset dir="${svr4.dir}" includes="${svr4.name}/**/*"/>
    </zip>
  </target>


 opends/src/svr4/OpenDS/layout.xml

@@ -33,7 +33,7 @@
  

  <target name="pkgversion"
         description="Set pkg.version property" >
         description="Set svr4.version property" >
  <!-- Construct the version number string -->
  <taskdef name="getversionnumber"
             classname="org.opends.build.tools.CreateVersionString">
@@ -44,8 +44,8 @@
    </classpath>
  </taskdef>

  <getversionnumber property="pkg.fullversion" />
  <property name="pkg.version" 
  <getversionnumber property="svr4.fullversion" />
  <property name="svr4.version" 
    value="${MAJOR_VERSION}.${MINOR_VERSION}.${POINT_VERSION}" />
  </target>

@@ -70,10 +70,10 @@
    <getsvnrevision property="REVISION_NUMBER" /> 

    <property name="zip.dir"
        location="${pkg.dir}/${product}-${pkg.fullversion}" />
        location="${package.dir}/${product}-${svr4.fullversion}" />
    
    <echo 
        message="Building layout for ${pkg.name} pkg based on ${zip.dir}" />
        message="Building layout for ${svr4.name} pkg based on ${zip.dir}" />
    <!-- copy ZIP layout.
        Use exec instead of copy task to preserve file permissions -->
    <mkdir dir="${svr4.layout.dir}"/>
@@ -180,7 +180,7 @@
      <fileset dir="${svr4.layout.pkg.dir}/logs"/>
    </move>
        <!-- Create buildinfo file -->
    <echo message="${pkg.version}.${REVISION_NUMBER}"
    <echo message="${svr4.version}.${REVISION_NUMBER}"
        file="${svr4.layout.pkg.dir}/tmpl_instance/config/buildinfo" />
  </target>


 opends/src/svr4/OpenDS/pkg.properties

@@ -1,9 +1,9 @@
# Info for prototype
pkg.name=opends
pkg.fullname=OpenDS, an open source LDAP directory server 
pkg.desc=OpenDS, an open source LDAP directory server 
pkg.arch=all
pkg.vendor=opends.org
pkg.basedir=/usr
pkg.type=usr
pkg.prefix=opends
svr4.name=opends
svr4.fullname=OpenDS, an open source LDAP directory server 
svr4.desc=OpenDS, an open source LDAP directory server 
svr4.arch=all
svr4.vendor=opends.org
svr4.basedir=/usr
svr4.type=usr
svr4.prefix=opends