summaryrefslogtreecommitdiff
path: root/rules
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2014-06-15 01:38:17 -0400
committerLuke Shumaker <LukeShu@sbcglobal.net>2014-06-15 01:38:17 -0400
commiteaa652dd99d9bd12fda6e4e6043d1b7696cf363a (patch)
tree127f8ef82fd1b6665addd9a2c82d451f7058671d /rules
parent570e0dd0f7bb790ad83adfdb74708fa893a3c4a3 (diff)
so much stuff
Diffstat (limited to 'rules')
l---------rules/asm41
l---------rules/asm51
-rw-r--r--rules/bnd/delete.list12
-rw-r--r--rules/cglib/delete.list1
-rw-r--r--rules/groovy/Makefile39
-rw-r--r--rules/groovy/delete.list3
-rw-r--r--rules/guice-core/sourceDirectory.mk1
-rw-r--r--rules/guice/delete.list3
-rw-r--r--rules/hawtjni-bootstrap/no-maven-plugin.mk1
l---------rules/hawtjni-bootstrap/subdir-deps.mk1
-rw-r--r--rules/hawtjni/subdir-deps.mk3
-rw-r--r--rules/osgi42-core/Makefile35
l---------rules/osgi43-core1
l---------rules/osgi50-core1
-rw-r--r--rules/xbean-bootstrap/delete.list5
-rw-r--r--rules/xbean-bootstrap/no-groovy.patch91
-rw-r--r--rules/xbean-bootstrap/no-log4j.patch (renamed from rules/xbean-reflect-bootstrap/no-log4j.patch)16
-rw-r--r--rules/xbean-bootstrap/no-shading.patch32
-rw-r--r--rules/xbean-bootstrap/no-springframework.patch21
-rw-r--r--rules/xbean-bootstrap/subdir-deps.mk1
20 files changed, 260 insertions, 9 deletions
diff --git a/rules/asm4 b/rules/asm4
new file mode 120000
index 0000000..d22cd68
--- /dev/null
+++ b/rules/asm4
@@ -0,0 +1 @@
+asm2 \ No newline at end of file
diff --git a/rules/asm5 b/rules/asm5
new file mode 120000
index 0000000..d22cd68
--- /dev/null
+++ b/rules/asm5
@@ -0,0 +1 @@
+asm2 \ No newline at end of file
diff --git a/rules/bnd/delete.list b/rules/bnd/delete.list
new file mode 100644
index 0000000..38da0b7
--- /dev/null
+++ b/rules/bnd/delete.list
@@ -0,0 +1,12 @@
+.gradle-wrapper
+biz.aQute.bndlib.tests/compilerversions/*.jar
+biz.aQute.bndlib.tests/compilerversions/src/*/*.class
+biz.aQute.bndlib.tests/jar
+biz.aQute.bndoc/jar/*.jar
+biz.aQute.jpm/lib/*.jar
+biz.aQute.jpm/src/aQute/jpm/platform/windows/*.exe
+biz.aQute.repository*
+cnf/gradle/dependencies
+cnf/plugins
+cnf/repo
+osgi.r5/*.jar
diff --git a/rules/cglib/delete.list b/rules/cglib/delete.list
new file mode 100644
index 0000000..8c5987b
--- /dev/null
+++ b/rules/cglib/delete.list
@@ -0,0 +1 @@
+lib/*.jar
diff --git a/rules/groovy/Makefile b/rules/groovy/Makefile
new file mode 100644
index 0000000..d7e8d3a
--- /dev/null
+++ b/rules/groovy/Makefile
@@ -0,0 +1,39 @@
+DESTDIR ?=
+JAR_DIR ?= /usr/share/java
+
+ANTLR2 = $(JAVA) antlr.Tool
+CP = cp
+FAIL = exit 1
+FIND = find
+INSTALL = install
+JAR = jar
+JAVA = java
+JAVAC = javac
+MKDIRS = mkdir -p
+RM = rm -f
+
+dep_dir = $1 $(shell $(FIND) $1 2>/dev/null)
+
+all: PHONY build/groovy.jar
+
+build/generated-sources: $(call dep_dir,src/main)
+ for grammar in $(filter %.g,$^); do $(MKDIRS) $$(dirname $$grammar) && $(ANTLR2) -o $$(dirname $$grammar) $$grammar || { $(RM) -r $@; $(FAIL); }; done
+build/classes: $(call dep_dir,src/main src/resources build/generated-sources)
+ $(RM) -r $@
+ $(MKDIRS) $@
+ $(CP) -a src/main/META-INF $@
+ $(CP) -a src/resources/* $@
+ $(FIND) src/main build/generated-sources -name '*.java' -exec $(JAVAC) -d $@ {} +
+build/groovy.jar: $(call dep_dir,build/classes)
+ $(JAR) -cf $@ -C build/classes .
+
+install: PHONY $(DESTDIR)$(JAR_DIR)/groovy.jar
+
+$(DESTDIR)$(JAR_DIR)/groovy.jar: build/groovy.jar
+ $(INSTALL) -Dm644 $< $@
+
+clean: PHONY
+ $(RM) -r build
+
+.PHONY: PHONY
+.DELETE_ON_ERROR:
diff --git a/rules/groovy/delete.list b/rules/groovy/delete.list
new file mode 100644
index 0000000..fb2fae2
--- /dev/null
+++ b/rules/groovy/delete.list
@@ -0,0 +1,3 @@
+gradle/wrapper/gradle-wrapper.jar
+security/GroovyJarTest.jar
+src/test/jars/module-test/module-test/1.2-test/module-test-1.2-test.jar
diff --git a/rules/guice-core/sourceDirectory.mk b/rules/guice-core/sourceDirectory.mk
new file mode 100644
index 0000000..4470673
--- /dev/null
+++ b/rules/guice-core/sourceDirectory.mk
@@ -0,0 +1 @@
+sourceDirectory = src
diff --git a/rules/guice/delete.list b/rules/guice/delete.list
new file mode 100644
index 0000000..94870d0
--- /dev/null
+++ b/rules/guice/delete.list
@@ -0,0 +1,3 @@
+lib/build
+lib/*.jar
+extensions/*/build \ No newline at end of file
diff --git a/rules/hawtjni-bootstrap/no-maven-plugin.mk b/rules/hawtjni-bootstrap/no-maven-plugin.mk
new file mode 100644
index 0000000..462c59a
--- /dev/null
+++ b/rules/hawtjni-bootstrap/no-maven-plugin.mk
@@ -0,0 +1 @@
+subdirs := $(filter-out maven-%-plugin,$(subdirs))
diff --git a/rules/hawtjni-bootstrap/subdir-deps.mk b/rules/hawtjni-bootstrap/subdir-deps.mk
new file mode 120000
index 0000000..2aab9d6
--- /dev/null
+++ b/rules/hawtjni-bootstrap/subdir-deps.mk
@@ -0,0 +1 @@
+../hawtjni/subdir-deps.mk \ No newline at end of file
diff --git a/rules/hawtjni/subdir-deps.mk b/rules/hawtjni/subdir-deps.mk
new file mode 100644
index 0000000..453153e
--- /dev/null
+++ b/rules/hawtjni/subdir-deps.mk
@@ -0,0 +1,3 @@
+hawtjni-generator_deps = hawtjni-runtime
+
+subdirs := $(filter-out %-example,$(subdirs))
diff --git a/rules/osgi42-core/Makefile b/rules/osgi42-core/Makefile
new file mode 100644
index 0000000..30eb1f7
--- /dev/null
+++ b/rules/osgi42-core/Makefile
@@ -0,0 +1,35 @@
+DESTDIR ?=
+MAVEN_LOCAL_REPO ?= ~/.m2
+
+FAIL = exit 1
+FIND = find
+INSTALL = install
+JAR = jar
+JAVAC = javac
+MKDIRS = mkdir -p
+RM = rm -f
+
+groupId = org.osgi
+artifactId = org.osgi.core
+version = 5.0.0
+
+dep_dir = $1 $(shell $(FIND) $1 2>/dev/null)
+mvndir = $(DESTDIR)$(MAVEN_LOCAL_REPO)/$(subst .,/,$(groupId))/$(artifactId)/$(version)
+
+all: PHONY build/$(artifactId)-$(version).jar
+install: PHONY $(mvndir)/$(artifactId)-$(version).jar
+
+build/classes: $(call dep_dir,src)
+ $(RM) -r $@
+ $(MKDIRS) $@
+ $(FIND) src -name '*.java' -exec $(JAVAC) -d $@ {} + || { $(RM) -r $@; $(FAIL); }
+build/$(artifactId)-$(version).jar: $(call dep_dir,build/classes)
+ $(JAR) -cf $@ -C build/classes .
+$(mvndir)/$(artifactId)-$(version).jar: build/$(artifactId)-$(version).jar
+ $(INSTALL) -Dm644 $< $@
+
+clean: PHONY
+ $(RM) -r build
+
+.PHONY: PHONY
+.DELETE_ON_ERROR:
diff --git a/rules/osgi43-core b/rules/osgi43-core
new file mode 120000
index 0000000..548ca5d
--- /dev/null
+++ b/rules/osgi43-core
@@ -0,0 +1 @@
+osgi42-core \ No newline at end of file
diff --git a/rules/osgi50-core b/rules/osgi50-core
new file mode 120000
index 0000000..548ca5d
--- /dev/null
+++ b/rules/osgi50-core
@@ -0,0 +1 @@
+osgi42-core \ No newline at end of file
diff --git a/rules/xbean-bootstrap/delete.list b/rules/xbean-bootstrap/delete.list
new file mode 100644
index 0000000..e7a7dae
--- /dev/null
+++ b/rules/xbean-bootstrap/delete.list
@@ -0,0 +1,5 @@
+*-shaded
+maven-*-plugin
+xbean-blueprint
+xbean-bundleutils/src/main/java/org/apache/xbean/osgi/bundle/util/equinox
+xbean-spring
diff --git a/rules/xbean-bootstrap/no-groovy.patch b/rules/xbean-bootstrap/no-groovy.patch
new file mode 100644
index 0000000..f70bf3a
--- /dev/null
+++ b/rules/xbean-bootstrap/no-groovy.patch
@@ -0,0 +1,91 @@
+diff -ruN xbean-bootstrap.orig/xbean-telnet/src/main/java/org/apache/xbean/command/CommandRegistry.java xbean-bootstrap/xbean-telnet/src/main/java/org/apache/xbean/command/CommandRegistry.java
+--- xbean-bootstrap.orig/xbean-telnet/src/main/java/org/apache/xbean/command/CommandRegistry.java 2014-06-15 00:19:37.435655683 -0400
++++ xbean-bootstrap/xbean-telnet/src/main/java/org/apache/xbean/command/CommandRegistry.java 2014-06-15 00:47:21.422787368 -0400
+@@ -77,6 +77,5 @@
+ Help.register();
+ Lookup.register();
+ Version.register();
+- GroovySh.register();
+ }
+ }
+diff -ruN xbean-bootstrap.orig/xbean-telnet/src/main/java/org/apache/xbean/command/GroovySh.java xbean-bootstrap/xbean-telnet/src/main/java/org/apache/xbean/command/GroovySh.java
+--- xbean-bootstrap.orig/xbean-telnet/src/main/java/org/apache/xbean/command/GroovySh.java 2014-06-15 00:19:37.438988951 -0400
++++ xbean-bootstrap/xbean-telnet/src/main/java/org/apache/xbean/command/GroovySh.java 1969-12-31 19:00:00.000000000 -0500
+@@ -1,77 +0,0 @@
+-/**
+- * 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.
+- */
+-package org.apache.xbean.command;
+-
+-import groovy.lang.GroovyShell;
+-import org.codehaus.groovy.runtime.InvokerHelper;
+-
+-import java.io.BufferedReader;
+-import java.io.IOException;
+-import java.io.InputStream;
+-import java.io.InputStreamReader;
+-import java.io.PrintStream;
+-
+-public class GroovySh implements Command {
+- public static void register() {
+- CommandRegistry.register("groovysh", GroovySh.class);
+- }
+-
+- public int main(String[] args, InputStream in, PrintStream out) {
+- GroovyShell shell = new GroovyShell();
+- BufferedReader reader = new BufferedReader(new InputStreamReader(in));
+- String version = InvokerHelper.getVersion();
+- out.println("Lets get Groovy!");
+- out.println("================");
+- out.println("Version: " + version + " JVM: " + System.getProperty("java.vm.version"));
+- out.println("Hit carriage return twice to execute a command");
+- out.println("The command 'quit' will terminate the shell");
+- int counter = 1;
+- while (true) {
+- StringBuffer buffer = new StringBuffer();
+- while (true) {
+- out.print("groovy> ");
+- String line;
+- try {
+- line = reader.readLine();
+- } catch (IOException e) {
+- out.println("Caught: " + e);
+- e.printStackTrace();
+- return -1;
+- }
+- if (line != null) {
+- buffer.append(line);
+- buffer.append('\n');
+- }
+- if (line == null || line.trim().length() == 0) {
+- break;
+- }
+- }
+- String command = buffer.toString().trim();
+- if (command == null || command.equals("quit")) {
+- break;
+- }
+- try {
+- Object answer = shell.evaluate(command, "CommandLine" + counter++ + ".groovy");
+- out.println(InvokerHelper.inspect(answer));
+- } catch (Exception e) {
+- out.println("Caught: " + e);
+- e.printStackTrace();
+- }
+- }
+- return 0;
+- }
+-}
diff --git a/rules/xbean-reflect-bootstrap/no-log4j.patch b/rules/xbean-bootstrap/no-log4j.patch
index 7b9285c..b5adb0c 100644
--- a/rules/xbean-reflect-bootstrap/no-log4j.patch
+++ b/rules/xbean-bootstrap/no-log4j.patch
@@ -1,7 +1,6 @@
-Index: xbean-reflect/src/main/java/org/apache/xbean/propertyeditor/Log4jConverter.java
-===================================================================
---- xbean-reflect/src/main/java/org/apache/xbean/propertyeditor/Log4jConverter.java (revision 1598206)
-+++ xbean-reflect/src/main/java/org/apache/xbean/propertyeditor/Log4jConverter.java (working copy)
+diff -ruN xbean-bootstrap.orig/xbean-reflect/src/main/java/org/apache/xbean/propertyeditor/Log4jConverter.java xbean-bootstrap/xbean-reflect/src/main/java/org/apache/xbean/propertyeditor/Log4jConverter.java
+--- xbean-bootstrap.orig/xbean-reflect/src/main/java/org/apache/xbean/propertyeditor/Log4jConverter.java 2014-06-15 00:19:37.108995430 -0400
++++ xbean-bootstrap/xbean-reflect/src/main/java/org/apache/xbean/propertyeditor/Log4jConverter.java 1969-12-31 19:00:00.000000000 -0500
@@ -1,32 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -35,11 +34,10 @@ Index: xbean-reflect/src/main/java/org/apache/xbean/propertyeditor/Log4jConverte
- return Logger.getLogger(text);
- }
-}
-Index: xbean-reflect/src/main/java/org/apache/xbean/propertyeditor/PropertyEditors.java
-===================================================================
---- xbean-reflect/src/main/java/org/apache/xbean/propertyeditor/PropertyEditors.java (revision 1598206)
-+++ xbean-reflect/src/main/java/org/apache/xbean/propertyeditor/PropertyEditors.java (working copy)
-@@ -120,11 +120,6 @@
+diff -ruN xbean-bootstrap.orig/xbean-reflect/src/main/java/org/apache/xbean/propertyeditor/PropertyEditors.java xbean-bootstrap/xbean-reflect/src/main/java/org/apache/xbean/propertyeditor/PropertyEditors.java
+--- xbean-bootstrap.orig/xbean-reflect/src/main/java/org/apache/xbean/propertyeditor/PropertyEditors.java 2014-06-15 00:19:37.082329286 -0400
++++ xbean-bootstrap/xbean-reflect/src/main/java/org/apache/xbean/propertyeditor/PropertyEditors.java 2014-06-15 00:42:19.005548051 -0400
+@@ -122,11 +122,6 @@
registerConverter(new WeakHashMapEditor());
try {
diff --git a/rules/xbean-bootstrap/no-shading.patch b/rules/xbean-bootstrap/no-shading.patch
new file mode 100644
index 0000000..0ad79d7
--- /dev/null
+++ b/rules/xbean-bootstrap/no-shading.patch
@@ -0,0 +1,32 @@
+diff -ru xbean-bootstrap.orig/xbean-reflect/src/main/java/org/apache/xbean/recipe/ReflectionUtil.java xbean-bootstrap/xbean-reflect/src/main/java/org/apache/xbean/recipe/ReflectionUtil.java
+--- xbean-bootstrap.orig/xbean-reflect/src/main/java/org/apache/xbean/recipe/ReflectionUtil.java 2014-06-15 00:19:37.188993859 -0400
++++ xbean-bootstrap/xbean-reflect/src/main/java/org/apache/xbean/recipe/ReflectionUtil.java 2014-06-15 00:35:25.070408339 -0400
+@@ -43,7 +43,7 @@
+ private static ParameterNameLoader parameterNamesLoader;
+
+ static {
+- if (isClassAvailable("org.apache.xbean.asm.ClassReader")) {
++ if (isClassAvailable("org.objectweb.asm.ClassReader")) {
+ parameterNamesLoader = new XbeanAsmParameterNameLoader();
+ } else if (isClassAvailable("org.objectweb.asm.ClassReader")) {
+ parameterNamesLoader = new AsmParameterNameLoader();
+diff -ru xbean-bootstrap.orig/xbean-reflect/src/main/java/org/apache/xbean/recipe/XbeanAsmParameterNameLoader.java xbean-bootstrap/xbean-reflect/src/main/java/org/apache/xbean/recipe/XbeanAsmParameterNameLoader.java
+--- xbean-bootstrap.orig/xbean-reflect/src/main/java/org/apache/xbean/recipe/XbeanAsmParameterNameLoader.java 2014-06-15 00:19:37.188993859 -0400
++++ xbean-bootstrap/xbean-reflect/src/main/java/org/apache/xbean/recipe/XbeanAsmParameterNameLoader.java 2014-06-15 00:35:25.070408339 -0400
+@@ -30,11 +30,11 @@
+ import java.util.WeakHashMap;
+ import java.util.Arrays;
+
+-import org.apache.xbean.asm.ClassReader;
+-import org.apache.xbean.asm.Label;
+-import org.apache.xbean.asm.MethodVisitor;
+-import org.apache.xbean.asm.Type;
+-import org.apache.xbean.asm.commons.EmptyVisitor;
++import org.objectweb.asm.ClassReader;
++import org.objectweb.asm.Label;
++import org.objectweb.asm.MethodVisitor;
++import org.objectweb.asm.Type;
++import org.objectweb.asm.commons.EmptyVisitor;
+
+ /**
+ * Implementation of ParameterNameLoader that uses ASM to read the parameter names from the local variable table in the
diff --git a/rules/xbean-bootstrap/no-springframework.patch b/rules/xbean-bootstrap/no-springframework.patch
new file mode 100644
index 0000000..c1cfc27
--- /dev/null
+++ b/rules/xbean-bootstrap/no-springframework.patch
@@ -0,0 +1,21 @@
+diff -ruN xbean-bootstrap.orig/xbean-classloader/src/main/java/org/apache/xbean/classloader/ThreadContextClassLoaderFactoryBean.java xbean-bootstrap/xbean-classloader/src/main/java/org/apache/xbean/classloader/ThreadContextClassLoaderFactoryBean.java
+--- xbean-bootstrap.orig/xbean-classloader/src/main/java/org/apache/xbean/classloader/ThreadContextClassLoaderFactoryBean.java 2014-06-15 00:19:37.572319666 -0400
++++ xbean-bootstrap/xbean-classloader/src/main/java/org/apache/xbean/classloader/ThreadContextClassLoaderFactoryBean.java 2014-06-15 00:51:06.431593352 -0400
+@@ -16,8 +16,6 @@
+ */
+ package org.apache.xbean.classloader;
+
+-import org.springframework.beans.factory.FactoryBean;
+-
+ /**
+ * A factory bean to expose the current thread context class loader.
+ *
+@@ -25,7 +23,7 @@
+ * element="threadContextClassLoader" description="References the ClassLoader of the current thread context"
+ * @version $Revision: 437551 $
+ */
+-public class ThreadContextClassLoaderFactoryBean implements FactoryBean {
++public class ThreadContextClassLoaderFactoryBean {
+
+ public Object getObject() throws Exception {
+ return Thread.currentThread().getContextClassLoader();
diff --git a/rules/xbean-bootstrap/subdir-deps.mk b/rules/xbean-bootstrap/subdir-deps.mk
new file mode 100644
index 0000000..4eb0564
--- /dev/null
+++ b/rules/xbean-bootstrap/subdir-deps.mk
@@ -0,0 +1 @@
+xbean-finder_deps = xbean-bundleutils