MCOL-145 - change to generate rpms

build/build_rpms

@@ -4,7 +4,9 @@
 #
 
 verbose=0
-mysqldir=$HOME/mariadb-columnstore-server/export/mysql
+prefix=/usr/local/mariadb/columnstore
+#mysqldir=$prefix/mariadb-columnstore/mysql
+columnstoredir=$prefix
 
 # set default as community
 community=true
@@ -52,18 +54,20 @@ fi
 # make the install package
 buildroot=$HOME/rpm/BUILD/mariadb-columnstore-$version.$release
 
-rm -rf $buildroot
+sudo rm -rf $buildroot
 mkdir -p $buildroot
 mkdir -p $buildroot/mariadb/columnstore
 echo -n "Writing binary files to $buildroot..."
-tar -cf - --exclude 'export/include' --exclude 'export/*.tar' export | tar -C $buildroot -xf -
+sudo chown -R builder:builder $columnstoredir
-mv $buildroot/export/* $buildroot/mariadb/columnstore/.
+/bin/cp -f -r $columnstoredir/* $buildroot/mariadb/columnstore/.
+
+/bin/cp -r build/releasenum $buildroot/mariadb/columnstore/.
 
 #get mysql server files
-pushd $mysqldir > /dev/null
+#pushd $mysqldir > /dev/null
-mkdir -p $buildroot/mariadb/columnstore/mysql
+#mkdir -p $buildroot/mariadb/columnstore/mysql
-cpio -pdmu --quiet $buildroot/mariadb/columnstore/mysql < files.lst
+#cpio -pdmu --quiet $buildroot/mariadb/columnstore/mysql < files.lst
-popd >/dev/null
+#popd >/dev/null
 
 #clean up some files from buildroot
 rm -f $buildroot/mariadb/columnstore/etc/Doxyfile

build/columnstore.community.spec.in

@@ -101,10 +101,8 @@ rm -rf $RPM_BUILD_ROOT $RPM_BUILD_DIR/%{name}-%{version}.%{release}
 /usr/local/mariadb/columnstore/bin/transactionLog
 /usr/local/mariadb/columnstore/bin/columnstoreDBWrite
 /usr/local/mariadb/columnstore/bin/transactionLogArchiver.sh
-/usr/local/mariadb/columnstore/bin/system_installer.sh
 /usr/local/mariadb/columnstore/bin/installer
 /usr/local/mariadb/columnstore/bin/module_installer.sh
-/usr/local/mariadb/columnstore/bin/patchInstaller
 /usr/local/mariadb/columnstore/bin/user_installer.sh
 /usr/local/mariadb/columnstore/bin/performance_installer.sh
 /usr/local/mariadb/columnstore/bin/startupTests.sh
@@ -155,7 +153,6 @@ rm -rf $RPM_BUILD_ROOT $RPM_BUILD_DIR/%{name}-%{version}.%{release}
 /usr/local/mariadb/columnstore/bin/setConfig
 /usr/local/mariadb/columnstore/bin/setenv-hdfs-12
 /usr/local/mariadb/columnstore/bin/setenv-hdfs-20
-/usr/local/mariadb/columnstore/bin/hdfsCheck
 /usr/local/mariadb/columnstore/bin/configxml.sh
 /usr/local/mariadb/columnstore/bin/remote_scp_get.sh
 /usr/local/mariadb/columnstore/bin/columnstoreAlias

oam/install_scripts/Makefile.am

@@ -24,7 +24,9 @@ post-mysql-install post-mysqld-install binary_installer.sh \
 os_check.sh columnstore columnstoreSyslog columnstoreSyslog-ng syslogSetup.sh \
 remote_scp_put.sh columnstoreUninstall.sh columnstore.def \
 remotessh.exp rsync.sh remote_command_verify.sh \
-columnstore.conf
+columnstore.conf columnstoreSyslog7 master-rep-columnstore.sh \
+slave-rep-columnstore.sh disable-rep-columnstore.sh \
+myCnf-include-args.text myCnf-exclude-args.text 
 
 dist_local_DATA = module
 

oam/install_scripts/Makefile.in

@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.13.4 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -33,51 +34,6 @@
 
 
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -[dEDm]) skip_next=yes;; \
-      -[JT]) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -97,8 +53,8 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = oam/install_scripts
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+DIST_COMMON = $(dist_local_DATA) $(srcdir)/Makefile.am \
-	$(dist_local_DATA)
+	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
@@ -131,40 +87,15 @@ am__nobase_list = $(am__nobase_strip_setup); \
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(localdir)"
 SCRIPTS = $(bin_SCRIPTS)
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
 DATA = $(dist_local_DATA)
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -182,7 +113,6 @@ CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -209,7 +139,6 @@ LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 NM = @NM@
 NMEDIT = @NMEDIT@
@@ -222,7 +151,6 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 POW_LIB = @POW_LIB@
@@ -241,7 +169,6 @@ abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
@@ -289,6 +216,7 @@ libexecdir = @libexecdir@
 localdir = @localdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 march_flags = @march_flags@
 mibdir = @mibdir@
@@ -320,7 +248,9 @@ post-mysql-install post-mysqld-install binary_installer.sh \
 os_check.sh columnstore columnstoreSyslog columnstoreSyslog-ng syslogSetup.sh \
 remote_scp_put.sh columnstoreUninstall.sh columnstore.def \
 remotessh.exp rsync.sh remote_command_verify.sh \
-columnstore.conf
+columnstore.conf columnstoreSyslog7 master-rep-columnstore.sh \
+slave-rep-columnstore.sh disable-rep-columnstore.sh \
+myCnf-include-args.text myCnf-exclude-args.text 
 
 dist_local_DATA = module
 all: all-am
@@ -358,11 +288,8 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 $(am__aclocal_m4_deps):
 install-binSCRIPTS: $(bin_SCRIPTS)
 	@$(NORMAL_INSTALL)
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
-	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
@@ -390,7 +317,9 @@ uninstall-binSCRIPTS:
 	@list='$(bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	       sed -e 's,.*/,,;$(transform)'`; \
-	dir='$(DESTDIR)$(bindir)'; $(am__uninstall_files_from_dir)
+	test -n "$$list" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(bindir)" && rm -f $$files
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -399,11 +328,8 @@ clean-libtool:
 	-rm -rf .libs _libs
 install-dist_localDATA: $(dist_local_DATA)
 	@$(NORMAL_INSTALL)
+	test -z "$(localdir)" || $(MKDIR_P) "$(DESTDIR)$(localdir)"
 	@list='$(dist_local_DATA)'; test -n "$(localdir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(localdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(localdir)" || exit 1; \
-	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -417,12 +343,14 @@ uninstall-dist_localDATA:
 	@$(NORMAL_UNINSTALL)
 	@list='$(dist_local_DATA)'; test -n "$(localdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(localdir)'; $(am__uninstall_files_from_dir)
+	test -n "$$files" || exit 0; \
-tags TAGS:
+	echo " ( cd '$(DESTDIR)$(localdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(localdir)" && rm -f $$files
+tags: TAGS
+TAGS:
 
-ctags CTAGS:
+ctags: CTAGS
-
+CTAGS:
-cscope cscopelist:
 
 
 distdir: $(DISTFILES)
@@ -472,15 +400,10 @@ install-am: all-am
 
 installcheck: installcheck-am
 install-strip:
-	if test -z '$(STRIP)'; then \
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
-	      install; \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -561,18 +484,17 @@ uninstall-am: uninstall-binSCRIPTS uninstall-dist_localDATA
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	cscopelist-am ctags-am distclean distclean-generic \
+	distclean distclean-generic distclean-libtool distdir dvi \
-	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	dvi-am html html-am info info-am install install-am \
-	install install-am install-binSCRIPTS install-data \
+	install-binSCRIPTS install-data install-data-am \
-	install-data-am install-dist_localDATA install-dvi \
+	install-dist_localDATA install-dvi install-dvi-am install-exec \
-	install-dvi-am install-exec install-exec-am install-html \
+	install-exec-am install-html install-html-am install-info \
-	install-html-am install-info install-info-am install-man \
+	install-info-am install-man install-pdf install-pdf-am \
-	install-pdf install-pdf-am install-ps install-ps-am \
+	install-ps install-ps-am install-strip installcheck \
-	install-strip installcheck installcheck-am installdirs \
+	installcheck-am installdirs maintainer-clean \
-	maintainer-clean maintainer-clean-generic mostlyclean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-	tags-am uninstall uninstall-am uninstall-binSCRIPTS \
+	uninstall-binSCRIPTS uninstall-dist_localDATA
-	uninstall-dist_localDATA
 
 
 test: