From c59564560cb5ed6afd059eb5c450ee718d76f5be Mon Sep 17 00:00:00 2001 From: Kazuki Ohta Date: Sat, 31 Mar 2012 23:37:47 -0700 Subject: [PATCH] don't support automake/conf style build on fluentd repo. Maintainig automake/conf style files are complex, but no user. We've decided not to have those files anymore. Otherwise it's still used at rpm/deb packaging scripts. --- Makefile.am | 54 --------------------------------------- autogen.sh | 72 ---------------------------------------------------- configure.in | 59 ------------------------------------------ 3 files changed, 185 deletions(-) delete mode 100644 Makefile.am delete mode 100755 autogen.sh delete mode 100644 configure.in diff --git a/Makefile.am b/Makefile.am deleted file mode 100644 index 06ad6e17fd..0000000000 --- a/Makefile.am +++ /dev/null @@ -1,54 +0,0 @@ -SUBDIRS = deps/jemalloc deps/ruby - -bin_SCRIPTS = fluent-gem fluent-cat fluentd - -MOSTLYCLEANFILES = $(bin_SCRIPTS) - -unexport GEM_HOME -unexport GEM_PATH -DEST_RUBY = $(DESTDIR)$(RUBY_BINDIR)/ruby -DEST_GEM = $(DEST_RUBY) -rrubygems -rrubygems/gem_runner -rrubygems/exceptions -rrubygems/installer -e 'class Gem::Installer; def shebang(bin_file_name) "\#\!$(RUBY_BINDIR)/ruby" end; end; Gem::GemRunner.new.run ARGV' -DEST_RAKE = $(DEST_RUBY) -rrake -e 'Rake.application.run' -DEST_RUBY_LIBDIR = $(DESTDIR)$(RUBY_LIBDIR)/ruby - -fluent-gem: - echo '#!/bin/sh' > $@ - echo 'exec "$(RUBY_BINDIR)/gem" "$$@"' >> $@ - chmod 755 $@ - -fluent-cat: - echo '#!/bin/sh' > $@ - echo 'export FLUENT_CONF="$(sysconfdir)/fluent/fluent.conf"' >> $@ - echo 'export FLUENT_PLUGIN="$(sysconfdir)/fluent/plugin"' >> $@ - echo 'export FLUENT_SOCKET="$(localstatedir)/run/fluent.sock"' >> $@ - echo 'exec "$(RUBY_BINDIR)/fluent-cat" "$$@"' >> $@ - chmod 755 $@ - -fluentd: - echo '#!/bin/sh' > $@ - echo 'export FLUENT_CONF="$(sysconfdir)/fluent/fluent.conf"' >> $@ - echo 'export FLUENT_PLUGIN="$(sysconfdir)/fluent/plugin"' >> $@ - echo 'export FLUENT_SOCKET="$(localstatedir)/run/fluent.sock"' >> $@ - echo 'exec "$(RUBY_BINDIR)/fluentd" "$$@"' >> $@ - chmod 755 $@ - -install: install-recursive - for gem in $(srcdir)/deps/*.gem; do \ - RUBYLIB="$(DEST_RUBY_LIBDIR)/1.9.1:$(DEST_RUBY_LIBDIR)/1.9.1/$(shell $(DEST_RUBY) --version | sed -E 's/.*\[(.*)\]/\1/')" \ - $(DEST_GEM) install --no-rdoc --no-ri "$$gem"; \ - done - cd "$(srcdir)" && \ - RUBYLIB="$(DEST_RUBY_LIBDIR)/1.9.1:$(DEST_RUBY_LIBDIR)/1.9.1/$(shell $(DEST_RUBY) --version | sed -E 's/.*\[(.*)\]/\1/')" \ - $(DEST_RAKE) - RUBYLIB="$(DEST_RUBY_LIBDIR)/1.9.1:$(DEST_RUBY_LIBDIR)/1.9.1/$(shell $(DEST_RUBY) --version | sed -E 's/.*\[(.*)\]/\1/')" \ - $(DEST_GEM) install --no-rdoc --no-ri "$(srcdir)/pkg/fluentd-$(VERSION).gem" - mkdir -p $(DESTDIR)$(sysconfdir)/fluent - cp -f $(srcdir)/fluent.conf $(DESTDIR)$(sysconfdir)/fluent/fluent.conf - mkdir -p $(DESTDIR)$(sysconfdir)/fluent/plugin - -distdir: - @echo do nothing - -dist: - cd $(srcdir) && ./make_dist.sh - diff --git a/autogen.sh b/autogen.sh deleted file mode 100755 index cc06406522..0000000000 --- a/autogen.sh +++ /dev/null @@ -1,72 +0,0 @@ -#!/bin/bash - -mkdir -p ac -test -f AUTHORS || touch AUTHORS -test -f COPYING || touch COPYING -test -f ChangeLog || touch ChangeLog -test -f NEWS || touch NEWS -test -f NOTICE || touch NOTICE -test -f README || cp -f README.rdoc README - -function download() { - if [ ! -f "$2" ];then - wget "$1/$2" -O "$2" || exit 1 - fi -} - -mkdir -p deps -mkdir -p deps/jemalloc -mkdir -p deps/ruby -mkdir -p plugins -cd deps -download "http://www.canonware.com/download/jemalloc" "jemalloc-2.2.5.tar.bz2" -download "http://ftp.ruby-lang.org/pub/ruby/1.9" "ruby-1.9.2-p290.tar.bz2" -download "http://rubygems.org/downloads" "json-1.5.2.gem" -download "http://rubygems.org/downloads" "msgpack-0.4.4.gem" -download "http://rubygems.org/downloads" "iobuffer-0.1.3.gem" -download "http://rubygems.org/downloads" "cool.io-1.1.0.gem" -download "http://rubygems.org/downloads" "http_parser.rb-0.5.1.gem" -download "http://rubygems.org/downloads" "yajl-ruby-1.0.0.gem" -download "http://rubygems.org/downloads" "jeweler-1.6.2.gem" -cd .. - -echo "#!/bin/sh - -## -## Generated by autogen.sh -## - -version=\`cat VERSION\` -dst=fluentd-\$version -rm -rf \$dst -mkdir \$dst || exit 1 -cp -fpR lib bin \$dst/ || exit 1 -mkdir -p \$dst/deps || exit 1 -mkdir -p \$dst/pkg || exit 1 -cp pkg/fluentd-\$version.gem \$dst/pkg/ -cp deps/*.gem deps/ruby-*.tar.bz2 deps/jemalloc-*.tar.bz2 \$dst/deps/ -cp README.rdoc README COPYING NEWS ChangeLog AUTHORS INSTALL NOTICE \\ - configure.in Makefile.in Makefile.am configure aclocal.m4 \\ - Rakefile VERSION fluent.conf make_dist.sh \\ - \$dst/ || exit 1 -cp -f README.rdoc \$dst/README || exit 1 -mkdir -p \$dst/ac || exit 1 -cp ac/* \$dst/ac/ || exit 1 -tar czvf \$dst.tar.gz \$dst || exit 1 -rm -rf \$dst -" > make_dist.sh -chmod 755 make_dist.sh - -if [ x`uname` = x"Darwin" ]; then - glibtoolize --force --copy -else - libtoolize --force --copy -fi -aclocal -#autoheader -automake --add-missing --copy -autoconf - -rmdir deps/jemalloc 2>/dev/null -rmdir deps/ruby 2>/dev/null - diff --git a/configure.in b/configure.in deleted file mode 100644 index 4c52a38e4e..0000000000 --- a/configure.in +++ /dev/null @@ -1,59 +0,0 @@ -AC_INIT(lib/fluent/engine.rb) -AC_CONFIG_AUX_DIR(ac) -AM_INIT_AUTOMAKE(fluentd, 0.10.6) - -AC_CHECK_LIB(z,deflate,, - AC_MSG_ERROR([zlib library not found])) - -AC_CHECK_HEADERS(openssl/sha.h,, - AC_MSG_ERROR([find openssl header not found])) -AC_CHECK_LIB(crypto,SHA1,, - AC_MSG_ERROR([openssl library not found])) - -#AC_CONFIG_SUBDIRS([deps/ruby]) - -orig_exec_prefix=$exec_prefix -orig_prefix=$prefix - -if test "$prefix" = "NONE"; then - prefix=$ac_default_prefix -fi -exec_prefix=$prefix -ruby_prefix=`eval echo $libdir/fluent/ruby` - -exec_prefix=$orig_exec_prefix -prefix=$orig_prefix - -AC_SUBST(RUBY_PREFIX) -AC_SUBST(RUBY_BINDIR) -AC_SUBST(RUBY_LIBDIR) -RUBY_PREFIX=$ruby_prefix -RUBY_BINDIR=$ruby_prefix/bin -RUBY_LIBDIR=$ruby_prefix/lib - -AC_OUTPUT([Makefile]) - -if test ! -d deps/jemalloc; then - mkdir -p deps/jemalloc-extract - tar jxf deps/jemalloc-*.tar.bz2 -C deps/jemalloc-extract - mv deps/jemalloc-extract/* deps/jemalloc -fi - -cd deps/jemalloc && ./configure && cd ../.. - -if test ! -d deps/ruby; then - mkdir -p deps/ruby-extract - tar jxf deps/ruby-*.tar.bz2 -C deps/ruby-extract - mv deps/ruby-extract/* deps/ruby -fi - -cd deps/ruby && ./configure "--prefix=$ruby_prefix" \ - --disable-install-doc \ - --with-out-ext=dbm \ - --with-out-ext=fiddle \ - --with-out-ext=gdbm \ - --with-out-ext=probe \ - --with-out-ext=racc \ - --with-out-ext=ripper \ - --with-out-ext=sdbm \ - --with-out-ext=tk