From 8a6f07f819fe7b6496909fa5e527715e3530b6f50b7beaf2f6fdffeb7e5d2c68 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 15 Feb 2019 12:45:57 +0000 Subject: [PATCH] Accepting request 676528 from home:fstrba:maven OBS-URL: https://build.opensuse.org/request/show/676528 OBS-URL: https://build.opensuse.org/package/show/Java:packages/parboiled?expand=0&rev=1 --- .gitattributes | 23 +++ .gitignore | 1 + 1.1.6.tar.gz | 3 + parboiled-1.1.6-scala-use-antrun-plugin.patch | 95 ++++++++++ parboiled-core-1.1.6.pom | 47 +++++ parboiled-java-1.1.6.pom | 72 ++++++++ parboiled-pom.xml | 46 +++++ parboiled-port-to-objectweb-asm-5.0.1.patch | 54 ++++++ parboiled-scala_2.10-1.1.6.pom | 57 ++++++ parboiled.spec | 173 ++++++++++++++++++ sources | 1 + 11 files changed, 572 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 1.1.6.tar.gz create mode 100644 parboiled-1.1.6-scala-use-antrun-plugin.patch create mode 100644 parboiled-core-1.1.6.pom create mode 100644 parboiled-java-1.1.6.pom create mode 100644 parboiled-pom.xml create mode 100644 parboiled-port-to-objectweb-asm-5.0.1.patch create mode 100644 parboiled-scala_2.10-1.1.6.pom create mode 100644 parboiled.spec create mode 100644 sources diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..57affb6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.osc diff --git a/1.1.6.tar.gz b/1.1.6.tar.gz new file mode 100644 index 0000000..66b85af --- /dev/null +++ b/1.1.6.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:793fe27f8aa5ae71e6dc09bcda702835ad9a23329d61cd26de046cfdcb0fbe5d +size 215393 diff --git a/parboiled-1.1.6-scala-use-antrun-plugin.patch b/parboiled-1.1.6-scala-use-antrun-plugin.patch new file mode 100644 index 0000000..e9f320c --- /dev/null +++ b/parboiled-1.1.6-scala-use-antrun-plugin.patch @@ -0,0 +1,95 @@ +--- parboiled-scala/pom.xml 2013-08-26 12:54:13.000000000 +0200 ++++ parboiled-scala/pom.xml-gil 2014-03-20 07:40:12.564265870 +0100 +@@ -54,4 +54,91 @@ + test + + ++ ++ ++ ++ org.apache.maven.plugins ++ maven-antrun-plugin ++ 1.7 ++ ++ ++ scala-compile ++ compile ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ run ++ ++ ++ ++ ++ ++ ++ ++ org.scala-lang ++ scala-compiler ++ 2.10.2 ++ ++ ++ ++ ++ org.apache.felix ++ maven-bundle-plugin ++ 2.3.7 ++ true ++ ++ ++ org.parboiled.scala ++ org.parboiled.scala ++ ${project.version} ++ org.parboiled.scala.* ++ ++ ++ ++ ++ bundle-manifest ++ process-classes ++ ++ manifest ++ ++ ++ ++ ++ ++ org.apache.maven.plugins ++ maven-jar-plugin ++ 2.4 ++ ++ ++ ${project.build.outputDirectory}/META-INF/MANIFEST.MF ++ ++ ++ ++ ++ ++ + +\ Manca newline alla fine del file diff --git a/parboiled-core-1.1.6.pom b/parboiled-core-1.1.6.pom new file mode 100644 index 0000000..1c061d8 --- /dev/null +++ b/parboiled-core-1.1.6.pom @@ -0,0 +1,47 @@ + + + 4.0.0 + org.parboiled + parboiled-core + bundle + Elegant parsing in Java and Scala - lightweight, easy-to-use, powerful + http://parboiled.org + 1.1.6 + + + Apache 2 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + parboiled-core + 2009 + + org.parboiled + http://parboiled.org + + + git@github.com:sirthias/parboiled.git + scm:git:git@github.com:sirthias/parboiled.git + + + + sirthias + Mathias Doenitz + + + + + org.testng + testng + 5.14.1 + test + + + org.scalatest + scalatest_2.9.3 + 1.9.1 + test + + + \ No newline at end of file diff --git a/parboiled-java-1.1.6.pom b/parboiled-java-1.1.6.pom new file mode 100644 index 0000000..ca7805e --- /dev/null +++ b/parboiled-java-1.1.6.pom @@ -0,0 +1,72 @@ + + + 4.0.0 + org.parboiled + parboiled-java + bundle + Elegant parsing in Java and Scala - lightweight, easy-to-use, powerful + http://parboiled.org + 1.1.6 + + + Apache 2 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + parboiled-java + 2009 + + org.parboiled + http://parboiled.org + + + git@github.com:sirthias/parboiled.git + scm:git:git@github.com:sirthias/parboiled.git + + + + sirthias + Mathias Doenitz + + + + + org.parboiled + parboiled-core + 1.1.6 + + + org.testng + testng + 5.14.1 + test + + + org.scalatest + scalatest_2.9.3 + 1.9.1 + test + + + org.ow2.asm + asm + 4.1 + + + org.ow2.asm + asm-tree + 4.1 + + + org.ow2.asm + asm-analysis + 4.1 + + + org.ow2.asm + asm-util + 4.1 + + + \ No newline at end of file diff --git a/parboiled-pom.xml b/parboiled-pom.xml new file mode 100644 index 0000000..7b174e8 --- /dev/null +++ b/parboiled-pom.xml @@ -0,0 +1,46 @@ + + + + + + + 4.0.0 + org.parboiled + parboiled-project + pom + @VERSION@ + + + + parboiled-core + parboiled-java + + + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.5 + 1.6 + + + + org.apache.maven.plugins + maven-surefire-plugin + + + **/*Tests.java + + + **/Abstract*.java + + -Xmx512m + + + + + diff --git a/parboiled-port-to-objectweb-asm-5.0.1.patch b/parboiled-port-to-objectweb-asm-5.0.1.patch new file mode 100644 index 0000000..369f968 --- /dev/null +++ b/parboiled-port-to-objectweb-asm-5.0.1.patch @@ -0,0 +1,54 @@ +From 66129b1155188b4c2b1d3b34641a7118fd99eb51 Mon Sep 17 00:00:00 2001 +From: Michal Srb +Date: Thu, 27 Mar 2014 10:59:08 +0100 +Subject: [PATCH] Port to objectweb-asm 5.0.1 + +--- + .../src/main/java/org/parboiled/transform/ParserClassNode.java | 2 ++ + parboiled-java/src/main/java/org/parboiled/transform/RuleMethod.java | 3 ++- + 2 files changed, 4 insertions(+), 1 deletion(-) + +diff --git a/parboiled-java/src/main/java/org/parboiled/transform/ParserClassNode.java b/parboiled-java/src/main/java/org/parboiled/transform/ParserClassNode.java +index 6534f24..3da751b 100644 +--- a/parboiled-java/src/main/java/org/parboiled/transform/ParserClassNode.java ++++ b/parboiled-java/src/main/java/org/parboiled/transform/ParserClassNode.java +@@ -26,6 +26,7 @@ import static org.parboiled.common.Preconditions.*; + import org.objectweb.asm.Type; + import org.objectweb.asm.tree.ClassNode; + import org.objectweb.asm.tree.MethodNode; ++import org.objectweb.asm.Opcodes; + + import java.util.*; + +@@ -39,6 +40,7 @@ class ParserClassNode extends ClassNode { + private Class extendedClass; + + public ParserClassNode(Class parentClass) { ++ super(Opcodes.ASM4); + this.parentClass = checkArgNotNull(parentClass, "parentClass"); + parentType = Type.getType(parentClass); + } +diff --git a/parboiled-java/src/main/java/org/parboiled/transform/RuleMethod.java b/parboiled-java/src/main/java/org/parboiled/transform/RuleMethod.java +index c60ef8a..8c023ca 100644 +--- a/parboiled-java/src/main/java/org/parboiled/transform/RuleMethod.java ++++ b/parboiled-java/src/main/java/org/parboiled/transform/RuleMethod.java +@@ -31,6 +31,7 @@ import org.objectweb.asm.tree.LabelNode; + import org.objectweb.asm.tree.LocalVariableNode; + import org.objectweb.asm.tree.MethodNode; + import org.objectweb.asm.tree.analysis.BasicValue; ++import org.objectweb.asm.Opcodes; + import org.parboiled.BaseParser; + import org.parboiled.common.StringUtils; + import org.parboiled.support.Var; +@@ -71,7 +72,7 @@ class RuleMethod extends MethodNode { + + public RuleMethod(Class ownerClass, int access, String name, String desc, String signature, String[] exceptions, + boolean hasExplicitActionOnlyAnno, boolean hasDontLabelAnno, boolean hasSkipActionsInPredicates) { +- super(access, name, desc, signature, exceptions); ++ super(Opcodes.ASM4, access, name, desc, signature, exceptions); + this.ownerClass = ownerClass; + parameterCount = Type.getArgumentTypes(desc).length; + hasCachedAnnotation = parameterCount == 0; +-- +1.9.0 + diff --git a/parboiled-scala_2.10-1.1.6.pom b/parboiled-scala_2.10-1.1.6.pom new file mode 100644 index 0000000..15b5cf1 --- /dev/null +++ b/parboiled-scala_2.10-1.1.6.pom @@ -0,0 +1,57 @@ + + + 4.0.0 + org.parboiled + parboiled-scala_2.10 + bundle + Elegant parsing in Java and Scala - lightweight, easy-to-use, powerful + http://parboiled.org + 1.1.6 + + + Apache 2 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + parboiled-scala + 2009 + + org.parboiled + http://parboiled.org + + + git@github.com:sirthias/parboiled.git + scm:git:git@github.com:sirthias/parboiled.git + + + + sirthias + Mathias Doenitz + + + + + org.parboiled + parboiled-core + 1.1.6 + + + org.scala-lang + scala-library + 2.10.2 + + + org.testng + testng + 5.14.1 + test + + + org.scalatest + scalatest_2.10 + 1.9.1 + test + + + \ No newline at end of file diff --git a/parboiled.spec b/parboiled.spec new file mode 100644 index 0000000..a002dd0 --- /dev/null +++ b/parboiled.spec @@ -0,0 +1,173 @@ +# +# spec file for package parboiled +# +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# + + +%global scala_short_version 2.10 +Name: parboiled +Version: 1.1.6 +Release: 0 +Summary: Java/Scala library providing parsing of input text based on PEGs +License: Apache-2.0 +Group: Development/Libraries/Java +URL: http://parboiled.org/ +Source0: https://github.com/sirthias/parboiled/archive/%{version}.tar.gz +# for build see https://github.com/sirthias/parboiled/wiki/Building-parboiled +Source1: http://repo1.maven.org/maven2/org/parboiled/%{name}-core/%{version}/%{name}-core-%{version}.pom +Source2: http://repo1.maven.org/maven2/org/parboiled/%{name}-java/%{version}/%{name}-java-%{version}.pom +# customized aggregator pom +Source3: %{name}-pom.xml +Source4: http://repo1.maven.org/maven2/org/parboiled/%{name}-scala_%{scala_short_version}/%{version}/%{name}-scala_%{scala_short_version}-%{version}.pom +Patch0: %{name}-1.1.6-scala-use-antrun-plugin.patch +Patch1: parboiled-port-to-objectweb-asm-5.0.1.patch +BuildRequires: fdupes +BuildRequires: maven-local +BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) +BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin) +BuildRequires: mvn(org.ow2.asm:asm) +BuildRequires: mvn(org.ow2.asm:asm-analysis) +BuildRequires: mvn(org.ow2.asm:asm-tree) +BuildRequires: mvn(org.ow2.asm:asm-util) +BuildRequires: mvn(org.scala-lang:scala-compiler) +BuildRequires: mvn(org.scala-lang:scala-library) +BuildConflicts: java-devel >= 9 +BuildArch: noarch +%if 0 +# test deps +BuildRequires: mvn(org.scalatest:scalatest_2.9.3) +BuildRequires: mvn(org.testng:testng) +%endif + +%description +parboiled is a mixed Java/Scala library providing for lightweight and +easy-to-use, yet powerful and elegant parsing of arbitrary input text +based on Parsing expression grammars (PEGs). PEGs are an alternative to +context free grammars (CFGs) for formally specifying syntax, they +make a good replacement for regular expressions and generally have quite +a few advantages over the "traditional" way of building parser via CFGs. + +%package scala +Summary: Parboiled for Scala + +%description scala +An internal Scala DSL for efficiently defining your parser rules. + +%package javadoc +Summary: Javadoc for %{name} + +%description javadoc +This package contains javadoc for %{name}. + +%prep +%setup -q + +find . -name "*.class" -delete +find . -name "*.jar" -delete + +cp -p %{SOURCE1} %{name}-core/pom.xml +cp -p %{SOURCE2} %{name}-java/pom.xml +cp -p %{SOURCE4} %{name}-scala/pom.xml + +for m in core java; do +%pom_xpath_inject "pom:project" " + + + + +" %{name}-${m} + +%pom_add_plugin org.apache.maven.plugins:maven-jar-plugin %{name}-${m} " + + + \${project.build.outputDirectory}/META-INF/MANIFEST.MF + +" +done + +%pom_add_plugin org.apache.felix:maven-bundle-plugin %{name}-core " +true + + + org.parboiled.core + org.parboiled.core + \${project.version} + org.parboiled.core.* + + + + + bundle-manifest + process-classes + + manifest + + +" + +%pom_add_plugin org.apache.felix:maven-bundle-plugin %{name}-java " +true + + + org.parboiled.java + org.parboiled.java + \${project.version} + org.parboiled.core + org.parboiled.java.* + + + + + bundle-manifest + process-classes + + manifest + + +" + +%patch0 +%patch1 -p1 + +cp -p %{SOURCE3} pom.xml +sed -i "s|@VERSION@|%{version}|" pom.xml + +%{mvn_file} :%{name}-core %{name}/core +%{mvn_file} :%{name}-java %{name}/java +%{mvn_package} :%{name}-project __noinstall +%pom_xpath_inject "pom:modules" "%{name}-scala" +%{mvn_file} :%{name}-scala_%{scala_short_version} %{name}/scala +%{mvn_package} :%{name}-scala_%{scala_short_version} scala + +%build + +# test skipped unavailable dep org.scalatest scalatest_2.9.0 1.6.1 +%{mvn_build} -f -- -Dproject.build.sourceEncoding=UTF-8 + +%install +%mvn_install +%fdupes -s %{buildroot}%{_javadocdir} + +%files -f .mfiles +%doc CHANGELOG README.markdown +%license LICENSE + +%files scala -f .mfiles-scala +%license LICENSE + +%files javadoc -f .mfiles-javadoc +%license LICENSE + +%changelog diff --git a/sources b/sources new file mode 100644 index 0000000..bb78597 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +70585bd417ea7ffaf39c9902554f4743 1.1.6.tar.gz