From 5597be2ed8dc5f7b7129851a7a35d7c33e0da000 Mon Sep 17 00:00:00 2001
From: Alexander Pyhalov <apyhalov@gmail.com>
Date: Thu, 26 Jan 2017 21:10:40 +0100
Subject: [PATCH] groovy: some cleanup
---
components/developer/groovy-24/files/Makefile | 51 +----
/dev/null | 126 --------------
make-rules/justmake.mk | 5
components/developer/groovy-24/groovy-24.p5m | 108 ++++++++++++
components/developer/groovy-24/Makefile | 29 +-
components/developer/groovy-24/manifests/sample-manifest.p5m | 176 ++++++++----------
6 files changed, 215 insertions(+), 280 deletions(-)
diff --git a/components/developer/groovy-24/Makefile b/components/developer/groovy-24/Makefile
index 0cd97cb..0fa4c74 100644
--- a/components/developer/groovy-24/Makefile
+++ b/components/developer/groovy-24/Makefile
@@ -14,15 +14,16 @@
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME= groovy
-# Commit timestamp and previous known release (none here)
-COMPONENT_VERSION= 2.4.7
+COMPONENT_MAJOR_VERSION= 2.4
+COMPONENT_MINOR_VERSION= 8
+COMPONENT_VERSION= $(COMPONENT_MAJOR_VERSION).$(COMPONENT_MINOR_VERSION)
COMPONENT_ARCHIVE= apache-$(COMPONENT_NAME)-binary-$(COMPONENT_VERSION).zip
-COMPONENT_FMRI= developer/$(COMPONENT_NAME)
+COMPONENT_FMRI= developer/groovy-24
COMPONENT_CLASSIFICATION= Development/Java
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_PROJECT_URL= http://groovy-lang.org/
COMPONENT_ARCHIVE_HASH= \
- sha256:438dd6098252647e88ff12ac5737d0d0f7e16a8e4e42e8be3e05a4c43abefbd5
+ sha256:668a65ea17037371a1952cca5f42ebc03329e15d3619aacb4c7dd5f4b39a8dfd
COMPONENT_ARCHIVE_URL= https://bintray.com/artifact/download/groovy/maven/$(COMPONENT_ARCHIVE)
COMPONENT_LICENSE= Apache-2.0,BSD,MIT,Eclipse,PublicDomain
COMPONENT_LICENSE_FILE= LICENSE
@@ -32,19 +33,17 @@
include $(WS_MAKE_RULES)/justmake.mk
include $(WS_MAKE_RULES)/ips.mk
-# This is an archive with prebuilt binaries, nothing to build
-$(BUILD_$(BITS)): $(SOURCE_DIR)/.prep
- $(MKDIR) $(BUILD_DIR_$(BITS))
- $(TOUCH) $@
+PATH=/usr/gnu/bin:/usr/bin
+
+COMPONENT_PREP_ACTION += (cp $(COMPONENT_DIR)/files/Makefile $(SOURCE_DIR))
+
+COMPONENT_COPY_ACTION = cp -r $(SOURCE_DIR)/* $(@D)/
+
+COMPONENT_INSTALL_ENV += GROOVY_MAJOR_VERSION=$(COMPONENT_MAJOR_VERSION)
+
+COMPONENT_POST_INSTALL_ACTION = $(FIND) $(PROTO_DIR) -name \*.bat -delete
build: $(BUILD_32)
-
-# There are many "intimate" variables to pass into the other Makefile,
-# so rather than run a sub-make we include it into our context.
-include $(COMPONENT_DIR)/files/Makefile
-
-$(INSTALL_32): install-groovy
- $(TOUCH) $@
install: $(INSTALL_32)
diff --git a/components/developer/groovy-24/files/Makefile b/components/developer/groovy-24/files/Makefile
index 1d8cec0..aecf220 100644
--- a/components/developer/groovy-24/files/Makefile
+++ b/components/developer/groovy-24/files/Makefile
@@ -1,44 +1,11 @@
-#
-# This file and its contents are supplied under the terms of the
-# Common Development and Distribution License ("CDDL"). You may
-# only use this file in accordance with the terms of the CDDL.
-#
-# A full copy of the text of the CDDL should have accompanied this
-# source. A copy of the CDDL is also available via the Internet at
-# http://www.illumos.org/license/CDDL.
-#
+SUBDIRS=bin conf embeddable grooid indy lib
+GROOVY_MAJOR_VERSION ?= 2.4
+all: build
-#
-# Copyright 2016 Jim Klimov
-#
+build:
-#
-# This Makefile installs groovy into location specified by variables below,
-# as defined in common oi-userland framework (this file is included from
-# main recipe Makefile).
-# List of FS objects below coresponds to groovy-2.4.7 layout.
-#
-
-LN_S ?= $(LN) -s
-LN_SYM_REL = $(GNUBIN)/ln -s -r
-
-$(BUILD_DIR_$(BITS))/.installed-groovy: $(BUILD_$(BITS)) $(SOURCE_DIR)/.prep
- $(MKDIR) $(PROTOUSRSHAREDIR)/$(COMPONENT_NAME)-$(COMPONENT_VERSION) $(PROTOUSRBINDIR)
- cd $(SOURCE_DIR) && \
- $(CP) -pr \
-bin \
-conf \
-embeddable \
-grooid \
-indy \
-lib \
-LICENSE \
-licenses \
-NOTICE \
- $(PROTOUSRSHAREDIR)/$(COMPONENT_NAME)-$(COMPONENT_VERSION)
- $(RM) $(PROTOUSRSHAREDIR)/$(COMPONENT_NAME)-$(COMPONENT_VERSION)/bin/*.bat
- cd $(PROTOUSRBINDIR) && \
- $(LN_SYM_REL) $(PROTOUSRSHAREDIR)/$(COMPONENT_NAME)-$(COMPONENT_VERSION)/bin/* .
- $(TOUCH) $@
-
-install-groovy: $(BUILD_DIR_$(BITS))/.installed-groovy
+install:
+ mkdir -p $(DESTDIR)/usr/share/groovy-$(GROOVY_MAJOR_VERSION)
+ mkdir -p $(DESTDIR)/usr/bin
+ cp -rf $(SUBDIRS) $(DESTDIR)/usr/share/groovy-$(GROOVY_MAJOR_VERSION)
+ ln -rs $(DESTDIR)/usr/share/groovy-$(GROOVY_MAJOR_VERSION)/bin/* $(DESTDIR)/usr/bin
diff --git a/components/developer/groovy-24/groovy-24.p5m b/components/developer/groovy-24/groovy-24.p5m
new file mode 100644
index 0000000..e163dfe
--- /dev/null
+++ b/components/developer/groovy-24/groovy-24.p5m
@@ -0,0 +1,108 @@
+#
+# This file and its contents are supplied under the terms of the
+# Common Development and Distribution License ("CDDL"), version 1.0.
+# You may only use this file in accordance with the terms of version
+# 1.0 of the CDDL.
+#
+# A full copy of the text of the CDDL should have accompanied this
+# source. A copy of the CDDL is also available via the Internet at
+# http://www.illumos.org/license/CDDL.
+#
+
+#
+# Copyright 2016 Jim Klimov
+#
+
+set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="$(COMPONENT_SUMMARY)"
+set name=info.classification value="$(COMPONENT_CLASSIFICATION)"
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+
+license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)'
+
+depend fmri=__TBD pkg.debug.depend.file=usr/bin/java type=require
+depend fmri=__TBD pkg.debug.depend.file=usr/bin/javac type=require
+
+link path=usr/bin/grape target=../share/groovy-2.4/bin/grape mediator=groovy mediator-version=2.4
+link path=usr/bin/groovy target=../share/groovy-2.4/bin/groovy mediator=groovy mediator-version=2.4
+link path=usr/bin/groovyConsole target=../share/groovy-2.4/bin/groovyConsole mediator=groovy mediator-version=2.4
+link path=usr/bin/groovyc target=../share/groovy-2.4/bin/groovyc mediator=groovy mediator-version=2.4
+link path=usr/bin/groovydoc target=../share/groovy-2.4/bin/groovydoc mediator=groovy mediator-version=2.4
+link path=usr/bin/groovysh target=../share/groovy-2.4/bin/groovysh mediator=groovy mediator-version=2.4
+link path=usr/bin/java2groovy target=../share/groovy-2.4/bin/java2groovy mediator=groovy mediator-version=2.4
+link path=usr/bin/startGroovy target=../share/groovy-2.4/bin/startGroovy mediator=groovy mediator-version=2.4
+
+file path=usr/share/groovy-2.4/bin/grape
+file path=usr/share/groovy-2.4/bin/groovy
+file path=usr/share/groovy-2.4/bin/groovyConsole
+file path=usr/share/groovy-2.4/bin/groovyc
+file path=usr/share/groovy-2.4/bin/groovydoc
+file path=usr/share/groovy-2.4/bin/groovysh
+file path=usr/share/groovy-2.4/bin/java2groovy
+file path=usr/share/groovy-2.4/bin/startGroovy
+file path=usr/share/groovy-2.4/conf/groovy-starter.conf
+file path=usr/share/groovy-2.4/embeddable/groovy-all-$(COMPONENT_VERSION)-indy.jar
+file path=usr/share/groovy-2.4/embeddable/groovy-all-$(COMPONENT_VERSION).jar
+file path=usr/share/groovy-2.4/grooid/groovy-$(COMPONENT_VERSION)-grooid.jar
+file path=usr/share/groovy-2.4/grooid/groovy-test-$(COMPONENT_VERSION)-grooid.jar
+file path=usr/share/groovy-2.4/indy/groovy-$(COMPONENT_VERSION)-indy.jar
+file path=usr/share/groovy-2.4/indy/groovy-ant-$(COMPONENT_VERSION)-indy.jar
+file path=usr/share/groovy-2.4/indy/groovy-bsf-$(COMPONENT_VERSION)-indy.jar
+file path=usr/share/groovy-2.4/indy/groovy-console-$(COMPONENT_VERSION)-indy.jar
+file path=usr/share/groovy-2.4/indy/groovy-docgenerator-$(COMPONENT_VERSION)-indy.jar
+file path=usr/share/groovy-2.4/indy/groovy-groovydoc-$(COMPONENT_VERSION)-indy.jar
+file path=usr/share/groovy-2.4/indy/groovy-groovysh-$(COMPONENT_VERSION)-indy.jar
+file path=usr/share/groovy-2.4/indy/groovy-jmx-$(COMPONENT_VERSION)-indy.jar
+file path=usr/share/groovy-2.4/indy/groovy-json-$(COMPONENT_VERSION)-indy.jar
+file path=usr/share/groovy-2.4/indy/groovy-jsr223-$(COMPONENT_VERSION)-indy.jar
+file path=usr/share/groovy-2.4/indy/groovy-nio-$(COMPONENT_VERSION)-indy.jar
+file path=usr/share/groovy-2.4/indy/groovy-servlet-$(COMPONENT_VERSION)-indy.jar
+file path=usr/share/groovy-2.4/indy/groovy-sql-$(COMPONENT_VERSION)-indy.jar
+file path=usr/share/groovy-2.4/indy/groovy-swing-$(COMPONENT_VERSION)-indy.jar
+file path=usr/share/groovy-2.4/indy/groovy-templates-$(COMPONENT_VERSION)-indy.jar
+file path=usr/share/groovy-2.4/indy/groovy-test-$(COMPONENT_VERSION)-indy.jar
+file path=usr/share/groovy-2.4/indy/groovy-testng-$(COMPONENT_VERSION)-indy.jar
+file path=usr/share/groovy-2.4/indy/groovy-xml-$(COMPONENT_VERSION)-indy.jar
+file path=usr/share/groovy-2.4/lib/ant-1.9.4.jar
+file path=usr/share/groovy-2.4/lib/ant-antlr-1.9.4.jar
+file path=usr/share/groovy-2.4/lib/ant-junit-1.9.4.jar
+file path=usr/share/groovy-2.4/lib/ant-launcher-1.9.4.jar
+file path=usr/share/groovy-2.4/lib/bsf-2.4.0.jar
+file path=usr/share/groovy-2.4/lib/commons-cli-1.2.jar
+file path=usr/share/groovy-2.4/lib/commons-logging-1.2.jar
+file path=usr/share/groovy-2.4/lib/gpars-1.2.1.jar
+file path=usr/share/groovy-2.4/lib/groovy-$(COMPONENT_VERSION).jar
+file path=usr/share/groovy-2.4/lib/groovy-ant-$(COMPONENT_VERSION).jar
+file path=usr/share/groovy-2.4/lib/groovy-bsf-$(COMPONENT_VERSION).jar
+file path=usr/share/groovy-2.4/lib/groovy-console-$(COMPONENT_VERSION).jar
+file path=usr/share/groovy-2.4/lib/groovy-docgenerator-$(COMPONENT_VERSION).jar
+file path=usr/share/groovy-2.4/lib/groovy-groovydoc-$(COMPONENT_VERSION).jar
+file path=usr/share/groovy-2.4/lib/groovy-groovysh-$(COMPONENT_VERSION).jar
+file path=usr/share/groovy-2.4/lib/groovy-jmx-$(COMPONENT_VERSION).jar
+file path=usr/share/groovy-2.4/lib/groovy-json-$(COMPONENT_VERSION).jar
+file path=usr/share/groovy-2.4/lib/groovy-jsr223-$(COMPONENT_VERSION).jar
+file path=usr/share/groovy-2.4/lib/groovy-nio-$(COMPONENT_VERSION).jar
+file path=usr/share/groovy-2.4/lib/groovy-servlet-$(COMPONENT_VERSION).jar
+file path=usr/share/groovy-2.4/lib/groovy-sql-$(COMPONENT_VERSION).jar
+file path=usr/share/groovy-2.4/lib/groovy-swing-$(COMPONENT_VERSION).jar
+file path=usr/share/groovy-2.4/lib/groovy-templates-$(COMPONENT_VERSION).jar
+file path=usr/share/groovy-2.4/lib/groovy-test-$(COMPONENT_VERSION).jar
+file path=usr/share/groovy-2.4/lib/groovy-testng-$(COMPONENT_VERSION).jar
+file path=usr/share/groovy-2.4/lib/groovy-xml-$(COMPONENT_VERSION).jar
+file path=usr/share/groovy-2.4/lib/groovy.icns
+file path=usr/share/groovy-2.4/lib/hamcrest-core-1.3.jar
+file path=usr/share/groovy-2.4/lib/ivy-2.4.0.jar
+file path=usr/share/groovy-2.4/lib/jansi-1.11.jar
+file path=usr/share/groovy-2.4/lib/jcommander-1.47.jar
+file path=usr/share/groovy-2.4/lib/jline-2.12.jar
+file path=usr/share/groovy-2.4/lib/jsp-api-2.0.jar
+file path=usr/share/groovy-2.4/lib/jsr166y-1.7.0.jar
+file path=usr/share/groovy-2.4/lib/junit-4.12.jar
+file path=usr/share/groovy-2.4/lib/multiverse-core-0.7.0.jar
+file path=usr/share/groovy-2.4/lib/qdox-1.12.1.jar
+file path=usr/share/groovy-2.4/lib/servlet-api-2.4.jar
+file path=usr/share/groovy-2.4/lib/testng-6.8.13.jar
+file path=usr/share/groovy-2.4/lib/xmlpull-1.1.3.1.jar
+file path=usr/share/groovy-2.4/lib/xstream-1.4.7.jar
diff --git a/components/developer/groovy-24/groovy.p5m b/components/developer/groovy-24/groovy.p5m
deleted file mode 100644
index 6f16225..0000000
--- a/components/developer/groovy-24/groovy.p5m
+++ /dev/null
@@ -1,126 +0,0 @@
-#
-# This file and its contents are supplied under the terms of the
-# Common Development and Distribution License ("CDDL"), version 1.0.
-# You may only use this file in accordance with the terms of version
-# 1.0 of the CDDL.
-#
-# A full copy of the text of the CDDL should have accompanied this
-# source. A copy of the CDDL is also available via the Internet at
-# http://www.illumos.org/license/CDDL.
-#
-
-#
-# Copyright 2016 Jim Klimov
-#
-
-set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary value="$(COMPONENT_SUMMARY)"
-set name=info.classification value="$(COMPONENT_CLASSIFICATION)"
-set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
-set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
-license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)'
-
-depend type=require-any \
- fmri=developer/java/openjdk8 \
- fmri=developer/java/openjdk7
-
-file path=usr/share/groovy-$(COMPONENT_VERSION)/bin/grape
-file path=usr/share/groovy-$(COMPONENT_VERSION)/bin/groovy
-file path=usr/share/groovy-$(COMPONENT_VERSION)/bin/groovyConsole
-file path=usr/share/groovy-$(COMPONENT_VERSION)/bin/groovyc
-file path=usr/share/groovy-$(COMPONENT_VERSION)/bin/groovydoc
-file path=usr/share/groovy-$(COMPONENT_VERSION)/bin/groovysh
-file path=usr/share/groovy-$(COMPONENT_VERSION)/bin/java2groovy
-file path=usr/share/groovy-$(COMPONENT_VERSION)/bin/startGroovy
-
-file path=usr/share/groovy-$(COMPONENT_VERSION)/conf/groovy-starter.conf
-
-file path=usr/share/groovy-$(COMPONENT_VERSION)/embeddable/groovy-all-$(COMPONENT_VERSION)-indy.jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/embeddable/groovy-all-$(COMPONENT_VERSION).jar
-
-file path=usr/share/groovy-$(COMPONENT_VERSION)/grooid/groovy-$(COMPONENT_VERSION)-grooid.jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/grooid/groovy-test-$(COMPONENT_VERSION)-grooid.jar
-
-file path=usr/share/groovy-$(COMPONENT_VERSION)/indy/groovy-$(COMPONENT_VERSION)-indy.jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/indy/groovy-ant-$(COMPONENT_VERSION)-indy.jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/indy/groovy-bsf-$(COMPONENT_VERSION)-indy.jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/indy/groovy-console-$(COMPONENT_VERSION)-indy.jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/indy/groovy-docgenerator-$(COMPONENT_VERSION)-indy.jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/indy/groovy-groovydoc-$(COMPONENT_VERSION)-indy.jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/indy/groovy-groovysh-$(COMPONENT_VERSION)-indy.jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/indy/groovy-jmx-$(COMPONENT_VERSION)-indy.jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/indy/groovy-json-$(COMPONENT_VERSION)-indy.jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/indy/groovy-jsr223-$(COMPONENT_VERSION)-indy.jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/indy/groovy-nio-$(COMPONENT_VERSION)-indy.jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/indy/groovy-servlet-$(COMPONENT_VERSION)-indy.jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/indy/groovy-sql-$(COMPONENT_VERSION)-indy.jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/indy/groovy-swing-$(COMPONENT_VERSION)-indy.jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/indy/groovy-templates-$(COMPONENT_VERSION)-indy.jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/indy/groovy-test-$(COMPONENT_VERSION)-indy.jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/indy/groovy-testng-$(COMPONENT_VERSION)-indy.jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/indy/groovy-xml-$(COMPONENT_VERSION)-indy.jar
-
-file path=usr/share/groovy-$(COMPONENT_VERSION)/lib/ant-1.9.4.jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/lib/ant-antlr-1.9.4.jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/lib/ant-junit-1.9.4.jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/lib/ant-launcher-1.9.4.jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/lib/bsf-2.4.0.jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/lib/commons-cli-1.2.jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/lib/commons-logging-1.2.jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/lib/gpars-1.2.1.jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/lib/groovy-$(COMPONENT_VERSION).jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/lib/groovy-ant-$(COMPONENT_VERSION).jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/lib/groovy-bsf-$(COMPONENT_VERSION).jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/lib/groovy-console-$(COMPONENT_VERSION).jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/lib/groovy-docgenerator-$(COMPONENT_VERSION).jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/lib/groovy-groovydoc-$(COMPONENT_VERSION).jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/lib/groovy-groovysh-$(COMPONENT_VERSION).jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/lib/groovy-jmx-$(COMPONENT_VERSION).jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/lib/groovy-json-$(COMPONENT_VERSION).jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/lib/groovy-jsr223-$(COMPONENT_VERSION).jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/lib/groovy-nio-$(COMPONENT_VERSION).jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/lib/groovy-servlet-$(COMPONENT_VERSION).jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/lib/groovy-sql-$(COMPONENT_VERSION).jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/lib/groovy-swing-$(COMPONENT_VERSION).jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/lib/groovy-templates-$(COMPONENT_VERSION).jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/lib/groovy-test-$(COMPONENT_VERSION).jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/lib/groovy-testng-$(COMPONENT_VERSION).jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/lib/groovy-xml-$(COMPONENT_VERSION).jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/lib/groovy.icns
-file path=usr/share/groovy-$(COMPONENT_VERSION)/lib/hamcrest-core-1.3.jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/lib/ivy-2.4.0.jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/lib/jansi-1.11.jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/lib/jcommander-1.47.jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/lib/jline-2.12.jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/lib/jsp-api-2.0.jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/lib/jsr166y-1.7.0.jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/lib/junit-4.12.jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/lib/multiverse-core-0.7.0.jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/lib/qdox-1.12.1.jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/lib/servlet-api-2.4.jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/lib/testng-6.8.13.jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/lib/xmlpull-1.1.3.1.jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/lib/xstream-1.4.7.jar
-
-file path=usr/share/groovy-$(COMPONENT_VERSION)/licenses/antlr2-license.txt
-file path=usr/share/groovy-$(COMPONENT_VERSION)/licenses/asm-license.txt
-file path=usr/share/groovy-$(COMPONENT_VERSION)/licenses/hamcrest-license.txt
-file path=usr/share/groovy-$(COMPONENT_VERSION)/licenses/jline2-license.txt
-file path=usr/share/groovy-$(COMPONENT_VERSION)/licenses/jsr166y-license.txt
-file path=usr/share/groovy-$(COMPONENT_VERSION)/licenses/jsr223-license.txt
-file path=usr/share/groovy-$(COMPONENT_VERSION)/licenses/junit-license.txt
-file path=usr/share/groovy-$(COMPONENT_VERSION)/licenses/xstream-license.txt
-
-file path=usr/share/groovy-$(COMPONENT_VERSION)/LICENSE
-file path=usr/share/groovy-$(COMPONENT_VERSION)/NOTICE
-
-link path=usr/bin/grape target=../share/groovy-$(COMPONENT_VERSION)/bin/grape mediator=$(COMPONENT_NAME) mediator-version=$(COMPONENT_VERSION)
-link path=usr/bin/groovy target=../share/groovy-$(COMPONENT_VERSION)/bin/groovy mediator=$(COMPONENT_NAME) mediator-version=$(COMPONENT_VERSION)
-link path=usr/bin/groovyConsole target=../share/groovy-$(COMPONENT_VERSION)/bin/groovyConsole mediator=$(COMPONENT_NAME) mediator-version=$(COMPONENT_VERSION)
-link path=usr/bin/groovyc target=../share/groovy-$(COMPONENT_VERSION)/bin/groovyc mediator=$(COMPONENT_NAME) mediator-version=$(COMPONENT_VERSION)
-link path=usr/bin/groovydoc target=../share/groovy-$(COMPONENT_VERSION)/bin/groovydoc mediator=$(COMPONENT_NAME) mediator-version=$(COMPONENT_VERSION)
-link path=usr/bin/groovysh target=../share/groovy-$(COMPONENT_VERSION)/bin/groovysh mediator=$(COMPONENT_NAME) mediator-version=$(COMPONENT_VERSION)
-link path=usr/bin/java2groovy target=../share/groovy-$(COMPONENT_VERSION)/bin/java2groovy mediator=$(COMPONENT_NAME) mediator-version=$(COMPONENT_VERSION)
-link path=usr/bin/startGroovy target=../share/groovy-$(COMPONENT_VERSION)/bin/startGroovy mediator=$(COMPONENT_NAME) mediator-version=$(COMPONENT_VERSION)
diff --git a/components/developer/groovy-24/manifests/sample-manifest.p5m b/components/developer/groovy-24/manifests/sample-manifest.p5m
index fa30531..9084210 100644
--- a/components/developer/groovy-24/manifests/sample-manifest.p5m
+++ b/components/developer/groovy-24/manifests/sample-manifest.p5m
@@ -22,99 +22,83 @@
license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)'
-link path=usr/bin/grape target=../share/groovy-$(COMPONENT_VERSION)/bin/grape
-link path=usr/bin/groovy target=../share/groovy-$(COMPONENT_VERSION)/bin/groovy
-link path=usr/bin/groovyConsole \
- target=../share/groovy-$(COMPONENT_VERSION)/bin/groovyConsole
-link path=usr/bin/groovyc \
- target=../share/groovy-$(COMPONENT_VERSION)/bin/groovyc
-link path=usr/bin/groovydoc \
- target=../share/groovy-$(COMPONENT_VERSION)/bin/groovydoc
-link path=usr/bin/groovysh \
- target=../share/groovy-$(COMPONENT_VERSION)/bin/groovysh
-link path=usr/bin/java2groovy \
- target=../share/groovy-$(COMPONENT_VERSION)/bin/java2groovy
-link path=usr/bin/startGroovy \
- target=../share/groovy-$(COMPONENT_VERSION)/bin/startGroovy
-file path=usr/share/groovy-$(COMPONENT_VERSION)/LICENSE
-file path=usr/share/groovy-$(COMPONENT_VERSION)/NOTICE
-file path=usr/share/groovy-$(COMPONENT_VERSION)/bin/grape
-file path=usr/share/groovy-$(COMPONENT_VERSION)/bin/groovy
-file path=usr/share/groovy-$(COMPONENT_VERSION)/bin/groovyConsole
-file path=usr/share/groovy-$(COMPONENT_VERSION)/bin/groovyc
-file path=usr/share/groovy-$(COMPONENT_VERSION)/bin/groovydoc
-file path=usr/share/groovy-$(COMPONENT_VERSION)/bin/groovysh
-file path=usr/share/groovy-$(COMPONENT_VERSION)/bin/java2groovy
-file path=usr/share/groovy-$(COMPONENT_VERSION)/bin/startGroovy
-file path=usr/share/groovy-$(COMPONENT_VERSION)/conf/groovy-starter.conf
-file path=usr/share/groovy-$(COMPONENT_VERSION)/embeddable/groovy-all-$(COMPONENT_VERSION)-indy.jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/embeddable/groovy-all-$(COMPONENT_VERSION).jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/grooid/groovy-$(COMPONENT_VERSION)-grooid.jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/grooid/groovy-test-$(COMPONENT_VERSION)-grooid.jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/indy/groovy-$(COMPONENT_VERSION)-indy.jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/indy/groovy-ant-$(COMPONENT_VERSION)-indy.jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/indy/groovy-bsf-$(COMPONENT_VERSION)-indy.jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/indy/groovy-console-$(COMPONENT_VERSION)-indy.jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/indy/groovy-docgenerator-$(COMPONENT_VERSION)-indy.jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/indy/groovy-groovydoc-$(COMPONENT_VERSION)-indy.jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/indy/groovy-groovysh-$(COMPONENT_VERSION)-indy.jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/indy/groovy-jmx-$(COMPONENT_VERSION)-indy.jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/indy/groovy-json-$(COMPONENT_VERSION)-indy.jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/indy/groovy-jsr223-$(COMPONENT_VERSION)-indy.jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/indy/groovy-nio-$(COMPONENT_VERSION)-indy.jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/indy/groovy-servlet-$(COMPONENT_VERSION)-indy.jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/indy/groovy-sql-$(COMPONENT_VERSION)-indy.jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/indy/groovy-swing-$(COMPONENT_VERSION)-indy.jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/indy/groovy-templates-$(COMPONENT_VERSION)-indy.jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/indy/groovy-test-$(COMPONENT_VERSION)-indy.jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/indy/groovy-testng-$(COMPONENT_VERSION)-indy.jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/indy/groovy-xml-$(COMPONENT_VERSION)-indy.jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/lib/ant-1.9.4.jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/lib/ant-antlr-1.9.4.jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/lib/ant-junit-1.9.4.jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/lib/ant-launcher-1.9.4.jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/lib/bsf-2.4.0.jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/lib/commons-cli-1.2.jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/lib/commons-logging-1.2.jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/lib/gpars-1.2.1.jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/lib/groovy-$(COMPONENT_VERSION).jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/lib/groovy-ant-$(COMPONENT_VERSION).jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/lib/groovy-bsf-$(COMPONENT_VERSION).jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/lib/groovy-console-$(COMPONENT_VERSION).jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/lib/groovy-docgenerator-$(COMPONENT_VERSION).jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/lib/groovy-groovydoc-$(COMPONENT_VERSION).jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/lib/groovy-groovysh-$(COMPONENT_VERSION).jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/lib/groovy-jmx-$(COMPONENT_VERSION).jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/lib/groovy-json-$(COMPONENT_VERSION).jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/lib/groovy-jsr223-$(COMPONENT_VERSION).jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/lib/groovy-nio-$(COMPONENT_VERSION).jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/lib/groovy-servlet-$(COMPONENT_VERSION).jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/lib/groovy-sql-$(COMPONENT_VERSION).jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/lib/groovy-swing-$(COMPONENT_VERSION).jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/lib/groovy-templates-$(COMPONENT_VERSION).jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/lib/groovy-test-$(COMPONENT_VERSION).jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/lib/groovy-testng-$(COMPONENT_VERSION).jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/lib/groovy-xml-$(COMPONENT_VERSION).jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/lib/groovy.icns
-file path=usr/share/groovy-$(COMPONENT_VERSION)/lib/hamcrest-core-1.3.jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/lib/ivy-2.4.0.jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/lib/jansi-1.11.jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/lib/jcommander-1.47.jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/lib/jline-2.12.jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/lib/jsp-api-2.0.jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/lib/jsr166y-1.7.0.jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/lib/junit-4.12.jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/lib/multiverse-core-0.7.0.jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/lib/qdox-1.12.1.jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/lib/servlet-api-2.4.jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/lib/testng-6.8.13.jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/lib/xmlpull-1.1.3.1.jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/lib/xstream-1.4.7.jar
-file path=usr/share/groovy-$(COMPONENT_VERSION)/licenses/antlr2-license.txt
-file path=usr/share/groovy-$(COMPONENT_VERSION)/licenses/asm-license.txt
-file path=usr/share/groovy-$(COMPONENT_VERSION)/licenses/hamcrest-license.txt
-file path=usr/share/groovy-$(COMPONENT_VERSION)/licenses/jline2-license.txt
-file path=usr/share/groovy-$(COMPONENT_VERSION)/licenses/jsr166y-license.txt
-file path=usr/share/groovy-$(COMPONENT_VERSION)/licenses/jsr223-license.txt
-file path=usr/share/groovy-$(COMPONENT_VERSION)/licenses/junit-license.txt
-file path=usr/share/groovy-$(COMPONENT_VERSION)/licenses/xstream-license.txt
+link path=usr/bin/grape target=../share/groovy-2.4/bin/grape
+link path=usr/bin/groovy target=../share/groovy-2.4/bin/groovy
+link path=usr/bin/groovyConsole target=../share/groovy-2.4/bin/groovyConsole
+link path=usr/bin/groovyc target=../share/groovy-2.4/bin/groovyc
+link path=usr/bin/groovydoc target=../share/groovy-2.4/bin/groovydoc
+link path=usr/bin/groovysh target=../share/groovy-2.4/bin/groovysh
+link path=usr/bin/java2groovy target=../share/groovy-2.4/bin/java2groovy
+link path=usr/bin/startGroovy target=../share/groovy-2.4/bin/startGroovy
+file path=usr/share/groovy-2.4/bin/grape
+file path=usr/share/groovy-2.4/bin/groovy
+file path=usr/share/groovy-2.4/bin/groovyConsole
+file path=usr/share/groovy-2.4/bin/groovyc
+file path=usr/share/groovy-2.4/bin/groovydoc
+file path=usr/share/groovy-2.4/bin/groovysh
+file path=usr/share/groovy-2.4/bin/java2groovy
+file path=usr/share/groovy-2.4/bin/startGroovy
+file path=usr/share/groovy-2.4/conf/groovy-starter.conf
+file path=usr/share/groovy-2.4/embeddable/groovy-all-$(COMPONENT_VERSION)-indy.jar
+file path=usr/share/groovy-2.4/embeddable/groovy-all-$(COMPONENT_VERSION).jar
+file path=usr/share/groovy-2.4/grooid/groovy-$(COMPONENT_VERSION)-grooid.jar
+file path=usr/share/groovy-2.4/grooid/groovy-test-$(COMPONENT_VERSION)-grooid.jar
+file path=usr/share/groovy-2.4/indy/groovy-$(COMPONENT_VERSION)-indy.jar
+file path=usr/share/groovy-2.4/indy/groovy-ant-$(COMPONENT_VERSION)-indy.jar
+file path=usr/share/groovy-2.4/indy/groovy-bsf-$(COMPONENT_VERSION)-indy.jar
+file path=usr/share/groovy-2.4/indy/groovy-console-$(COMPONENT_VERSION)-indy.jar
+file path=usr/share/groovy-2.4/indy/groovy-docgenerator-$(COMPONENT_VERSION)-indy.jar
+file path=usr/share/groovy-2.4/indy/groovy-groovydoc-$(COMPONENT_VERSION)-indy.jar
+file path=usr/share/groovy-2.4/indy/groovy-groovysh-$(COMPONENT_VERSION)-indy.jar
+file path=usr/share/groovy-2.4/indy/groovy-jmx-$(COMPONENT_VERSION)-indy.jar
+file path=usr/share/groovy-2.4/indy/groovy-json-$(COMPONENT_VERSION)-indy.jar
+file path=usr/share/groovy-2.4/indy/groovy-jsr223-$(COMPONENT_VERSION)-indy.jar
+file path=usr/share/groovy-2.4/indy/groovy-nio-$(COMPONENT_VERSION)-indy.jar
+file path=usr/share/groovy-2.4/indy/groovy-servlet-$(COMPONENT_VERSION)-indy.jar
+file path=usr/share/groovy-2.4/indy/groovy-sql-$(COMPONENT_VERSION)-indy.jar
+file path=usr/share/groovy-2.4/indy/groovy-swing-$(COMPONENT_VERSION)-indy.jar
+file path=usr/share/groovy-2.4/indy/groovy-templates-$(COMPONENT_VERSION)-indy.jar
+file path=usr/share/groovy-2.4/indy/groovy-test-$(COMPONENT_VERSION)-indy.jar
+file path=usr/share/groovy-2.4/indy/groovy-testng-$(COMPONENT_VERSION)-indy.jar
+file path=usr/share/groovy-2.4/indy/groovy-xml-$(COMPONENT_VERSION)-indy.jar
+file path=usr/share/groovy-2.4/lib/ant-1.9.4.jar
+file path=usr/share/groovy-2.4/lib/ant-antlr-1.9.4.jar
+file path=usr/share/groovy-2.4/lib/ant-junit-1.9.4.jar
+file path=usr/share/groovy-2.4/lib/ant-launcher-1.9.4.jar
+file path=usr/share/groovy-2.4/lib/bsf-2.4.0.jar
+file path=usr/share/groovy-2.4/lib/commons-cli-1.2.jar
+file path=usr/share/groovy-2.4/lib/commons-logging-1.2.jar
+file path=usr/share/groovy-2.4/lib/gpars-1.2.1.jar
+file path=usr/share/groovy-2.4/lib/groovy-$(COMPONENT_VERSION).jar
+file path=usr/share/groovy-2.4/lib/groovy-ant-$(COMPONENT_VERSION).jar
+file path=usr/share/groovy-2.4/lib/groovy-bsf-$(COMPONENT_VERSION).jar
+file path=usr/share/groovy-2.4/lib/groovy-console-$(COMPONENT_VERSION).jar
+file path=usr/share/groovy-2.4/lib/groovy-docgenerator-$(COMPONENT_VERSION).jar
+file path=usr/share/groovy-2.4/lib/groovy-groovydoc-$(COMPONENT_VERSION).jar
+file path=usr/share/groovy-2.4/lib/groovy-groovysh-$(COMPONENT_VERSION).jar
+file path=usr/share/groovy-2.4/lib/groovy-jmx-$(COMPONENT_VERSION).jar
+file path=usr/share/groovy-2.4/lib/groovy-json-$(COMPONENT_VERSION).jar
+file path=usr/share/groovy-2.4/lib/groovy-jsr223-$(COMPONENT_VERSION).jar
+file path=usr/share/groovy-2.4/lib/groovy-nio-$(COMPONENT_VERSION).jar
+file path=usr/share/groovy-2.4/lib/groovy-servlet-$(COMPONENT_VERSION).jar
+file path=usr/share/groovy-2.4/lib/groovy-sql-$(COMPONENT_VERSION).jar
+file path=usr/share/groovy-2.4/lib/groovy-swing-$(COMPONENT_VERSION).jar
+file path=usr/share/groovy-2.4/lib/groovy-templates-$(COMPONENT_VERSION).jar
+file path=usr/share/groovy-2.4/lib/groovy-test-$(COMPONENT_VERSION).jar
+file path=usr/share/groovy-2.4/lib/groovy-testng-$(COMPONENT_VERSION).jar
+file path=usr/share/groovy-2.4/lib/groovy-xml-$(COMPONENT_VERSION).jar
+file path=usr/share/groovy-2.4/lib/groovy.icns
+file path=usr/share/groovy-2.4/lib/hamcrest-core-1.3.jar
+file path=usr/share/groovy-2.4/lib/ivy-2.4.0.jar
+file path=usr/share/groovy-2.4/lib/jansi-1.11.jar
+file path=usr/share/groovy-2.4/lib/jcommander-1.47.jar
+file path=usr/share/groovy-2.4/lib/jline-2.12.jar
+file path=usr/share/groovy-2.4/lib/jsp-api-2.0.jar
+file path=usr/share/groovy-2.4/lib/jsr166y-1.7.0.jar
+file path=usr/share/groovy-2.4/lib/junit-4.12.jar
+file path=usr/share/groovy-2.4/lib/multiverse-core-0.7.0.jar
+file path=usr/share/groovy-2.4/lib/qdox-1.12.1.jar
+file path=usr/share/groovy-2.4/lib/servlet-api-2.4.jar
+file path=usr/share/groovy-2.4/lib/testng-6.8.13.jar
+file path=usr/share/groovy-2.4/lib/xmlpull-1.1.3.1.jar
+file path=usr/share/groovy-2.4/lib/xstream-1.4.7.jar
diff --git a/make-rules/justmake.mk b/make-rules/justmake.mk
index 4027272..9dc96a5 100644
--- a/make-rules/justmake.mk
+++ b/make-rules/justmake.mk
@@ -47,6 +47,9 @@
COMPONENT_INSTALL_ARGS += DESTDIR=$(PROTO_DIR)
COMPONENT_INSTALL_ARGS += $(COMPONENT_INSTALL_ARGS.$(BITS))
+COMPONENT_COPY_ACTION ?= \
+ $(CLONEY) $(SOURCE_DIR) $(@D)
+
COMPONENT_BUILD_ACTION ?= \
cd $(@D); $(ENV) $(COMPONENT_BUILD_ENV) \
$(GMAKE) $(COMPONENT_BUILD_GMAKE_ARGS) $(COMPONENT_BUILD_ARGS) $(COMPONENT_BUILD_TARGETS)
@@ -54,7 +57,7 @@
# build the configured source
$(BUILD_DIR)/%/.built: $(SOURCE_DIR)/.prep
$(RM) -r $(@D) ; $(MKDIR) $(@D)
- $(CLONEY) $(SOURCE_DIR) $(@D)
+ $(COMPONENT_COPY_ACTION)
$(COMPONENT_PRE_BUILD_ACTION)
($(COMPONENT_BUILD_ACTION))
$(COMPONENT_POST_BUILD_ACTION)
--
Gitblit v1.9.3