You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by co...@apache.org on 2014/02/12 00:37:25 UTC
git commit: BIGTOP-1097. introduce bigtop-groovy package
Updated Branches:
refs/heads/master f91f87b3d -> f7a08bad0
BIGTOP-1097. introduce bigtop-groovy package
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/f7a08bad
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/f7a08bad
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/f7a08bad
Branch: refs/heads/master
Commit: f7a08bad0b006e0aa69bb582732aa376255a5ddb
Parents: f91f87b
Author: Konstantin Boudnik <co...@apache.org>
Authored: Thu Jan 23 00:09:57 2014 -0800
Committer: Konstantin Boudnik <co...@apache.org>
Committed: Tue Feb 11 15:37:11 2014 -0800
----------------------------------------------------------------------
.../src/common/bigtop-groovy/do-component-build | 19 ++++
.../src/common/bigtop-groovy/install_groovy.sh | 108 +++++++++++++++++++
.../src/deb/bigtop-groovy/bigtop-groovy.install | 4 +
.../deb/bigtop-groovy/bigtop-groovy.postinst | 36 +++++++
bigtop-packages/src/deb/bigtop-groovy/changelog | 1 +
bigtop-packages/src/deb/bigtop-groovy/compat | 1 +
bigtop-packages/src/deb/bigtop-groovy/control | 27 +++++
bigtop-packages/src/deb/bigtop-groovy/copyright | 15 +++
bigtop-packages/src/deb/bigtop-groovy/rules | 39 +++++++
.../src/deb/bigtop-groovy/source/format | 1 +
.../src/rpm/bigtop-groovy/SPECS/.gitignore | 0
.../rpm/bigtop-groovy/SPECS/bigtop-groovy.spec | 60 +++++++++++
.../package/src/main/resources/package_data.xml | 12 +++
bigtop.mk | 14 +++
14 files changed, 337 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/f7a08bad/bigtop-packages/src/common/bigtop-groovy/do-component-build
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/bigtop-groovy/do-component-build b/bigtop-packages/src/common/bigtop-groovy/do-component-build
new file mode 100644
index 0000000..def8791
--- /dev/null
+++ b/bigtop-packages/src/common/bigtop-groovy/do-component-build
@@ -0,0 +1,19 @@
+#!/bin/bash
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -ex
+
+. `dirname ${0}`/bigtop.bom
http://git-wip-us.apache.org/repos/asf/bigtop/blob/f7a08bad/bigtop-packages/src/common/bigtop-groovy/install_groovy.sh
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/bigtop-groovy/install_groovy.sh b/bigtop-packages/src/common/bigtop-groovy/install_groovy.sh
new file mode 100755
index 0000000..c5a819a
--- /dev/null
+++ b/bigtop-packages/src/common/bigtop-groovy/install_groovy.sh
@@ -0,0 +1,108 @@
+#!/bin/bash -x
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -ex
+
+usage() {
+ echo "
+usage: $0 <options>
+ Required not-so-options:
+ --build-dir=DIR path to hive/build/dist
+ --prefix=PREFIX path to install into
+ "
+ exit 1
+}
+
+OPTS=$(getopt \
+ -n $0 \
+ -o '' \
+ -l 'prefix:' \
+ -l 'version:' \
+ -l 'build-dir:' \
+ -l 'lib-dir:' \
+ -l 'bin-dir:' \
+ -l 'conf-dir:' \
+ -- "$@")
+
+if [ $? != 0 ] ; then
+ usage
+fi
+
+eval set -- "$OPTS"
+while true ; do
+ case "$1" in
+ --prefix)
+ PREFIX=$2 ; shift 2
+ ;;
+ --version)
+ VERSION=$2 ; shift 2
+ ;;
+ --build-dir)
+ BUILD_DIR=$2 ; shift 2
+ ;;
+ --bin-dir)
+ BIN_DIR=$2 ; shift 2
+ ;;
+ --lib-dir)
+ LIB_DIR=$2 ; shift 2
+ ;;
+ --conf-dir)
+ CONF_DIR=$2 ; shift 2
+ ;;
+ --doc-dir)
+ DOC_DIR=$2 ; shift 2
+ ;;
+ --)
+ shift ; break
+ ;;
+ *)
+ echo "Unknown option: $1"
+ usage
+ exit 1
+ ;;
+ esac
+done
+
+for var in PREFIX BUILD_DIR; do
+ if [ -z "$(eval "echo \$$var")" ]; then
+ echo Missing param: $var
+ usage
+ fi
+done
+
+. `dirname ${0}`/bigtop.bom
+
+BIN_DIR=${BIN_DIR:-/usr/lib/bigtop-groovy/bin}
+CONF_DIR=${CONF_DIR:-/usr/lib/bigtop-groovy/conf}
+LIB_DIR=${LIB_DIR:-/usr/lib/bigtop-groovy/lib}
+echo ${BIGTOP_GROOVY_BASE_VERSION}
+
+#bin
+install -d -m 0755 ${PREFIX}/${BIN_DIR}
+cp ${BUILD_DIR}/bin/startGroovy ${PREFIX}/${BIN_DIR}
+cp ${BUILD_DIR}/bin/groovy ${PREFIX}/${BIN_DIR}
+
+# lib
+install -d -m 0755 ${PREFIX}/${LIB_DIR}
+cp ${BUILD_DIR}/lib/groovy-${BIGTOP_GROOVY_VERSION}.jar ${PREFIX}/${LIB_DIR}
+cp ${BUILD_DIR}/embeddable/groovy-all-${BIGTOP_GROOVY_VERSION}.jar ${PREFIX}/${LIB_DIR}
+cp ${BUILD_DIR}/lib/commons-cli-1.2.jar ${PREFIX}/${LIB_DIR}
+cp ${BUILD_DIR}/lib/asm*.jar ${PREFIX}/${LIB_DIR}
+cp ${BUILD_DIR}/lib/antlr*.jar ${PREFIX}/${LIB_DIR}
+
+#conf
+install -d -m 0755 ${PREFIX}/${CONF_DIR}
+cp ${BUILD_DIR}/conf/groovy-starter.conf ${PREFIX}/${CONF_DIR}
http://git-wip-us.apache.org/repos/asf/bigtop/blob/f7a08bad/bigtop-packages/src/deb/bigtop-groovy/bigtop-groovy.install
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/deb/bigtop-groovy/bigtop-groovy.install b/bigtop-packages/src/deb/bigtop-groovy/bigtop-groovy.install
new file mode 100644
index 0000000..625ae2e
--- /dev/null
+++ b/bigtop-packages/src/deb/bigtop-groovy/bigtop-groovy.install
@@ -0,0 +1,4 @@
+/usr/lib/bigtop-groovy
+/usr/lib/bigtop-groovy/bin
+/usr/lib/bigtop-groovy/conf
+/usr/lib/bigtop-groovy/lib
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/bigtop/blob/f7a08bad/bigtop-packages/src/deb/bigtop-groovy/bigtop-groovy.postinst
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/deb/bigtop-groovy/bigtop-groovy.postinst b/bigtop-packages/src/deb/bigtop-groovy/bigtop-groovy.postinst
new file mode 100644
index 0000000..29db417
--- /dev/null
+++ b/bigtop-packages/src/deb/bigtop-groovy/bigtop-groovy.postinst
@@ -0,0 +1,36 @@
+#!/bin/bash
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# postinst script for bigtop-groovy
+
+set -e
+
+case "$1" in
+ configure)
+ chmod 0755 /usr/lib/bigtop-groovy/bin/*
+ ;;
+
+ abort-upgrade|abort-remove|abort-deconfigure)
+ ;;
+
+ *)
+ echo "postinst called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+#DEBHELPER#
http://git-wip-us.apache.org/repos/asf/bigtop/blob/f7a08bad/bigtop-packages/src/deb/bigtop-groovy/changelog
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/deb/bigtop-groovy/changelog b/bigtop-packages/src/deb/bigtop-groovy/changelog
new file mode 100755
index 0000000..547ed02
--- /dev/null
+++ b/bigtop-packages/src/deb/bigtop-groovy/changelog
@@ -0,0 +1 @@
+--- This is auto-generated
http://git-wip-us.apache.org/repos/asf/bigtop/blob/f7a08bad/bigtop-packages/src/deb/bigtop-groovy/compat
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/deb/bigtop-groovy/compat b/bigtop-packages/src/deb/bigtop-groovy/compat
new file mode 100755
index 0000000..7f8f011
--- /dev/null
+++ b/bigtop-packages/src/deb/bigtop-groovy/compat
@@ -0,0 +1 @@
+7
http://git-wip-us.apache.org/repos/asf/bigtop/blob/f7a08bad/bigtop-packages/src/deb/bigtop-groovy/control
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/deb/bigtop-groovy/control b/bigtop-packages/src/deb/bigtop-groovy/control
new file mode 100755
index 0000000..fe8469c
--- /dev/null
+++ b/bigtop-packages/src/deb/bigtop-groovy/control
@@ -0,0 +1,27 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+Source: bigtop-groovy
+Section: misc
+Priority: extra
+Maintainer: Bigtop <de...@bigtop.apache.org>
+Build-Depends: debhelper (>= 7.0.50~)
+Standards-Version: 3.8.0
+Homepage: http://groovy.codehaus.org/
+
+Package: bigtop-groovy
+Architecture: any
+Depends: bigtop-utils (>= 0.7)
+Description: Groovy provides a JVM based runtime environment
+ for function programming and scripting.Application to launch java daemon
http://git-wip-us.apache.org/repos/asf/bigtop/blob/f7a08bad/bigtop-packages/src/deb/bigtop-groovy/copyright
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/deb/bigtop-groovy/copyright b/bigtop-packages/src/deb/bigtop-groovy/copyright
new file mode 100755
index 0000000..35ed5ff
--- /dev/null
+++ b/bigtop-packages/src/deb/bigtop-groovy/copyright
@@ -0,0 +1,15 @@
+Format: http://dep.debian.net/deps/dep5
+Source: http://commons.apache.org/daemon/
+Upstream-Name: Apache Commons Daemon
+
+Files: *
+Copyright: 2008-2012, The Apache Software Foundation
+License: Apache-2.0
+
+Files debian/*
+Copyright: 2012, The Apache Software Foundation
+License: Apache-2.0
+
+License: Apache-2.0
+ On Debian systems, the complete text of the Apache 2.0 license
+ can be found in "/usr/share/common-licenses/Apache-2.0".
http://git-wip-us.apache.org/repos/asf/bigtop/blob/f7a08bad/bigtop-packages/src/deb/bigtop-groovy/rules
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/deb/bigtop-groovy/rules b/bigtop-packages/src/deb/bigtop-groovy/rules
new file mode 100755
index 0000000..f4cd744
--- /dev/null
+++ b/bigtop-packages/src/deb/bigtop-groovy/rules
@@ -0,0 +1,39 @@
+#!/usr/bin/make -f
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# -*- makefile -*-
+
+# Uncomment this to turn on verbose mode.
+export DH_VERBOSE=1
+
+# This has to be exported to make some magic below work.
+export DH_OPTIONS=-s
+
+%:
+ dh $@
+
+override_dh_auto_build:
+ bash debian/do-component-build
+
+override_dh_auto_install:
+ sh -x debian/install_groovy.sh \
+ --build-dir=. \
+ --prefix=debian/tmp \
+ --bin-dir=usr/lib/bigtop-groovy/bin \
+ --version=%{bigtop_groovy_version} \
+ --lib-dir=usr/lib/bigtop-groovy/lib \
+ --conf-dir=usr/lib/bigtop-groovy/conf
http://git-wip-us.apache.org/repos/asf/bigtop/blob/f7a08bad/bigtop-packages/src/deb/bigtop-groovy/source/format
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/deb/bigtop-groovy/source/format b/bigtop-packages/src/deb/bigtop-groovy/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/bigtop-packages/src/deb/bigtop-groovy/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
http://git-wip-us.apache.org/repos/asf/bigtop/blob/f7a08bad/bigtop-packages/src/rpm/bigtop-groovy/SPECS/.gitignore
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/rpm/bigtop-groovy/SPECS/.gitignore b/bigtop-packages/src/rpm/bigtop-groovy/SPECS/.gitignore
new file mode 100644
index 0000000..e69de29
http://git-wip-us.apache.org/repos/asf/bigtop/blob/f7a08bad/bigtop-packages/src/rpm/bigtop-groovy/SPECS/bigtop-groovy.spec
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/rpm/bigtop-groovy/SPECS/bigtop-groovy.spec b/bigtop-packages/src/rpm/bigtop-groovy/SPECS/bigtop-groovy.spec
new file mode 100644
index 0000000..f76ae53
--- /dev/null
+++ b/bigtop-packages/src/rpm/bigtop-groovy/SPECS/bigtop-groovy.spec
@@ -0,0 +1,60 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+%define bin_groovy /usr/lib/bigtop-groovy
+
+Name: bigtop-groovy
+Version: %{bigtop_groovy_version}
+Release: %{bigtop_groovy_release}
+Summary: An agile and dynamic language for the Java Virtual Machine
+URL: http://groovy.codehaus.org/
+Group: Development/Libraries
+Buildroot: %{_topdir}/INSTALL/%{name}-%{version}
+BuildArch: noarch
+License: ASL 2.0
+Source0: %{name}-%{bigtop_groovy_base_version}.tar.gz
+Source1: do-component-build
+Source2: install_groovy.sh
+Requires: bigtop-utils >= 0.7
+
+%description
+Groovy provides a JVM based runtime environment for function programming and scripting.
+
+%prep
+%setup -n %{name}-%{bigtop_groovy_base_version}
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%build
+bash %{SOURCE1}
+
+%install
+%__rm -rf $RPM_BUILD_ROOT
+sh %{SOURCE2} \
+ --build-dir=. \
+ --bin-dir=%{bin_groovy}/bin \
+ --version=%{bigtop_groovy_version} \
+ --lib-dir=%{bin_groovy}/lib \
+ --conf-dir=%{bin_groovy}/conf \
+ --prefix=$RPM_BUILD_ROOT
+
+%files
+%defattr(-,root,root)
+%{bin_groovy}
+%attr(0775,root,root) %{bin_groovy}/bin/*
+
+%changelog
+
http://git-wip-us.apache.org/repos/asf/bigtop/blob/f7a08bad/bigtop-tests/test-artifacts/package/src/main/resources/package_data.xml
----------------------------------------------------------------------
diff --git a/bigtop-tests/test-artifacts/package/src/main/resources/package_data.xml b/bigtop-tests/test-artifacts/package/src/main/resources/package_data.xml
index 3eb24f7..9cbbbfe 100644
--- a/bigtop-tests/test-artifacts/package/src/main/resources/package_data.xml
+++ b/bigtop-tests/test-artifacts/package/src/main/resources/package_data.xml
@@ -30,6 +30,18 @@
<url>http://commons.apache.org/daemon/</url>
</metadata>
</bigtop-jsvc>
+
+ <bigtop-jsvc>
+ <metadata>
+ <summary>An agile and dynamic language for the Java Virtual Machine</summary>
+ <description>Groovy provides a JVM based runtime environment for function programming and scripting.</description>
+ <url>http://groovy.codehaus.org/</url>
+ </metadata>
+ <deps>
+ <bigtop-utils/>
+ </deps>
+ </bigtop-jsvc>
+
<bigtop-tomcat>
<metadata>
<summary>Apache Tomcat</summary>
http://git-wip-us.apache.org/repos/asf/bigtop/blob/f7a08bad/bigtop.mk
----------------------------------------------------------------------
diff --git a/bigtop.mk b/bigtop.mk
index 36bd415..fb08fdf 100644
--- a/bigtop.mk
+++ b/bigtop.mk
@@ -249,6 +249,19 @@ PHOENIX_SITE=https://github.com/forcedotcom/phoenix/archive
PHOENIX_ARCHIVE=$(PHOENIX_SITE)
$(eval $(call PACKAGE,phoenix,PHOENIX))
+# Groovy
+BIGTOP_GROOVY_NAME=bigtop-groovy
+BIGTOP_GROOVY_RELNOTES_NAME=Grovvy: a dynamic language for the Java platform
+BIGTOP_GROOVY_PKG_NAME=bigtop-groovy
+BIGTOP_GROOVY_BASE_VERSION=2.2.1
+BIGTOP_GROOVY_PKG_VERSION=2.2.1
+BIGTOP_GROOVY_RELEASE_VERSION=1
+BIGTOP_GROOVY_TARBALL_DST=$(BIGTOP_GROOVY_NAME)-$(BIGTOP_GROOVY_BASE_VERSION).tar.gz
+BIGTOP_GROOVY_TARBALL_SRC=groovy-binary-$(BIGTOP_GROOVY_BASE_VERSION).zip
+BIGTOP_GROOVY_SITE=http://dist.groovy.codehaus.org/distributions/
+BIGTOP_GROOVY_ARCHIVE=$(BIGTOP_GROOVY_SITE)
+$(eval $(call PACKAGE,bigtop-groovy,BIGTOP_GROOVY))
+
# Bigtop-utils
BIGTOP_UTILS_NAME=bigtop-utils
BIGTOP_UTILS__RELNOTES_NAME=Bigtop-utils
@@ -256,6 +269,7 @@ BIGTOP_UTILS_PKG_NAME=bigtop-utils
BIGTOP_UTILS_BASE_VERSION=$(subst -,.,$(BIGTOP_VERSION))
BIGTOP_UTILS_PKG_VERSION=$(BIGTOP_UTILS_BASE_VERSION)
BIGTOP_UTILS_RELEASE_VERSION=1
+BIGTOP_UTILS_TARBALL_DST=$(BIGTOP_UTILS_PKG_NAME)-$(BIGTOP_UTILS_BASE_VERSION).tar.gz
$(eval $(call PACKAGE,bigtop-utils,BIGTOP_UTILS))
# Bigtop-jsvc