[Bigdata-commit] SF.net SVN: bigdata:[7593] branches/BIGDATA_RELEASE_1_3_0

[<tho...@us...>]

Revision: 7593
          http://bigdata.svn.sourceforge.net/bigdata/?rev=7593&view=rev
Author:   thompsonbry
Date:     2013-11-25 20:29:21 +0000 (Mon, 25 Nov 2013)
Log Message:
-----------
incremental progress toward an rpm install

Modified Paths:
--------------
    branches/BIGDATA_RELEASE_1_3_0/build.properties
    branches/BIGDATA_RELEASE_1_3_0/build.xml
    branches/BIGDATA_RELEASE_1_3_0/src/resources/rpm/bigdata.spec

Modified: branches/BIGDATA_RELEASE_1_3_0/build.properties
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/build.properties	2013-11-25 17:43:33 UTC (rev 7592)
+++ branches/BIGDATA_RELEASE_1_3_0/build.properties	2013-11-25 20:29:21 UTC (rev 7593)
@@ -89,7 +89,7 @@
 
 # Set true to do a snapshot build.  This changes the value of ${version} to
 # include the date.
-snapshot=true
+snapshot=false
 
 # Javadoc build may be disabled using this property.  The javadoc target will
 # not be executed unless this property is defined (its value does not matter).
@@ -98,6 +98,15 @@
 # javadoc JVM is explicitly set in the javadoc target in the build.xml file.
 javadoc=
 
+# packaging property set (rpm, deb).
+package.release=1
+package.prefix=/usr
+package.conf.dir=/etc/bigdata
+package.fedname=BigdataFed
+package.pid.dir=/var/run/bigdata
+package.var.dir=/var/lib/bigdata
+package.share.dir=/usr/share/bigdata
+
 # The SCP program to use when uploading javadoc or releases.
 #ssh.scp=C:/Program Files/PuTTY/pscp
 ssh.scp=/usr/bin/scp

Modified: branches/BIGDATA_RELEASE_1_3_0/build.xml
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/build.xml	2013-11-25 17:43:33 UTC (rev 7592)
+++ branches/BIGDATA_RELEASE_1_3_0/build.xml	2013-11-25 20:29:21 UTC (rev 7593)
@@ -1254,7 +1254,27 @@
       <mkdir dir="${rpm.dir}/SOURCES" />
       <mkdir dir="${rpm.dir}/SPECS" />
       <mkdir dir="${rpm.dir}/SRPMS" />
-      <copy file="${bigdata.dir}/src/resources/rpm/bigdata.spec" todir="${rpm.dir}/SPECS"/>
+      <!-- Copy rpm spec file, replacing meta variables in the target. -->
+      <copy file="${bigdata.dir}/src/resources/rpm/bigdata.spec" todir="${rpm.dir}/SPECS">
+        <filterchain>
+          <replacetokens>
+            <token key="build.ver" value="${build.ver}" />
+	    <token key="java.version" value="${javac.source}" />
+	    <token key="zookeeper.version" value="${zookeeper.version}" />
+            <token key="package.release" value="${package.release}" />
+            <token key="package.prefix" value="${package.prefix}" /><!--/usr-->
+            <token key="package.conf.dir" value="${package.conf.dir}" /><!--/etc/bigdata-->
+            <token key="package.pid.dir" value="${package.pid.dir}" /><!--/var/run/bigdata-->
+            <token key="package.var.dir" value="${package.var.dir}" /><!--/var/lib/bigdata-->
+            <token key="package.share.dir" value="${package.share.dir}" />
+            <!--
+	    <token key="final.name" value="${final.name}" />
+            <token key="package.build.dir" value="${package.build.dir}" />
+            <token key="package.log.dir" value="${package.log.dir}" />
+            <token key="c.lib" value="${c.lib}" /> -->
+          </replacetokens>
+        </filterchain>
+      </copy>
       <!-- build version of tarball that includes the version number in the filename. -->
       <copydir dest="${rpm.dir}/SOURCES/${version}" src="${stage.dir}/bigdata" />
       <tar destfile="${rpm.dir}/SOURCES/${version}.tar.gz"
@@ -1272,13 +1292,22 @@
           <include name="${version}/bin/startHAServices" />
         </tarfileset>
       </tar>
-<!--      <copy file="${bigdata.dir}/REL.${version}.tgz" tofile="${rpm.dir}/SOURCES/${version}.tar.gz"/> -->
+      <!-- build rpm. -->
       <rpm
         specFile="bigdata.spec"
         topDir="ant-build/rpm"
         cleanBuildDir="true"
-        failOnError="false"/>
-
+        failOnError="true"/>
+      <!-- copy to target location in build.dir. -->
+      <copy todir="${build.dir}/" flatten="true">
+        <fileset dir="${rpm.dir}/RPMS">
+          <include name="**/${version}*.rpm" />
+        </fileset>
+        <fileset dir="${rpm.dir}/SRPMS">
+          <include name="**/${version}*.rpm" />
+        </fileset>
+      </copy>
+      <delete dir="${rpm.dir}" quiet="true" verbose="false"/>
     </target>
 
     <target name="ant-install-prepare" depends="jar, bundle"

Modified: branches/BIGDATA_RELEASE_1_3_0/src/resources/rpm/bigdata.spec
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/src/resources/rpm/bigdata.spec	2013-11-25 17:43:33 UTC (rev 7592)
+++ branches/BIGDATA_RELEASE_1_3_0/src/resources/rpm/bigdata.spec	2013-11-25 20:29:21 UTC (rev 7593)
@@ -1,7 +1,7 @@
 Summary: bigdata highly available RDF/graph/SPARQL database
 Name: bigdata
-Version: 1.2.3
-Release: 1
+Version: @build.ver@
+Release: @package.release@
 License: GPLv2
 Group: Applications/Databases
 URL: http://www.bigdata.com/blog
@@ -9,11 +9,10 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch: noarch
 
-Requires: java >= 1.6
-Requires: zookeeper >= 3.3
+Requires: java >= @java.version@
+Requires: zookeeper >= @zookeeper.version@
 
 %description
-
 Bigdata is a horizontally-scaled, open-source architecture for indexed data with an emphasis on RDF capable of loading 1B triples in under one hour on a 15 node cluster.  Bigdata operates in both a single machine mode (Journal), highly available replication cluster mode (HAJournalServer), and a horizontally sharded cluster mode (BigdataFederation).  The Journal provides fast scalable ACID indexed storage for very large data sets, up to 50 billion triples / quads.  The HAJournalServer adds replication, online backup, horizontal scaling of query, and high availability.  The federation provides fast scalable shard-wise parallel indexed storage using dynamic sharding and shard-wise ACID updates and incremental cluster size growth.  Both platforms support fully concurrent readers with snapshot isolation.
 
 Distributed processing offers greater throughput but does not reduce query or update latency.  Choose the Journal when the anticipated scale and throughput requirements permit.  Choose the HAJournalServer for high availability and linear scaling in query throughput.  Choose the Federation when the administrative and machine overhead associated with operating a cluster is an acceptable tradeoff to have essentially unlimited data scaling and throughput.
@@ -30,9 +29,18 @@
 
 %build
 # NOP: The RPM is generated from "binaries".
+mkdir -p %{_builddir}/%name-%ve...@pa...efix@
 
 %install
 rm -rf $RPM_BUILD_ROOT
+# Rename file paths to reflect package prefix.
+%{__mv} %{_builddir}/%name-%version/etc     %{_builddir}/%name-%ve...@pa...efix@/etc
+%{__mv} %{_builddir}/%name-%version/bin     %{_builddir}/%name-%ve...@pa...efix@/bin
+%{__mv} %{_builddir}/%name-%version/doc     %{_builddir}/%name-%ve...@pa...efix@/doc
+%{__mv} %{_builddir}/%name-%version/var     %{_builddir}/%name-%ve...@pa...efix@/var
+%{__mv} %{_builddir}/%name-%version/lib     %{_builddir}/%name-%ve...@pa...efix@/lib
+%{__mv} %{_builddir}/%name-%version/lib-dl  %{_builddir}/%name-%ve...@pa...efix@/lib-dl
+%{__mv} %{_builddir}/%name-%version/lib-ext %{_builddir}/%name-%ve...@pa...efix@/lib-ext
 # Copy all files from BUILD to BUILDROOT
 %{__cp} -Rip %{_builddir}/* $RPM_BUILD_ROOT
 
@@ -40,15 +48,17 @@
 rm -rf $RPM_BUILD_ROOT
 
 %files
+# FIXME We need pre-/post-install and un-install scripts to symlink
+# the init.d script and copy in /etc/bigdata/bigdataHA.config
 %defattr(-,root,root,-)
-%doc /doc
-%config /etc/bigdata
-%config /var/config
-/etc/init.d/bigdataHA
-/bin
-/lib-dl
-/lib-ext
-/lib
+%config @package.prefix@/etc/bigdata
+...@pa...efix@/etc/init.d/bigdataHA
+%config @package.prefix@/var/config
+%doc @package.prefix@/doc
+...@pa...efix@/bin
+...@pa...efix@/lib
+...@pa...efix@/lib-dl
+...@pa...efix@/lib-ext
 
 %changelog
 * Sun Nov 24 2013 EC2 Default User <ec2...@ip...ernal> - 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.