diff --git a/1.1.6.tar.gz b/1.1.6.tar.gz new file mode 100644 index 0000000..09b74cc Binary files /dev/null and b/1.1.6.tar.gz differ diff --git a/README.en.md b/README.en.md deleted file mode 100644 index 3d082ac..0000000 --- a/README.en.md +++ /dev/null @@ -1,36 +0,0 @@ -# parboiled - -#### Description -{**When you're done, you can delete the content in this README and update the file with details for others getting started with your repository**} - -#### Software Architecture -Software architecture description - -#### Installation - -1. xxxx -2. xxxx -3. xxxx - -#### Instructions - -1. xxxx -2. xxxx -3. xxxx - -#### Contribution - -1. Fork the repository -2. Create Feat_xxx branch -3. Commit your code -4. Create Pull Request - - -#### Gitee Feature - -1. You can use Readme\_XXX.md to support different languages, such as Readme\_en.md, Readme\_zh.md -2. Gitee blog [blog.gitee.com](https://blog.gitee.com) -3. Explore open source project [https://gitee.com/explore](https://gitee.com/explore) -4. The most valuable open source project [GVP](https://gitee.com/gvp) -5. The manual of Gitee [https://gitee.com/help](https://gitee.com/help) -6. The most popular members [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) diff --git a/README.md b/README.md deleted file mode 100644 index 4c49275..0000000 --- a/README.md +++ /dev/null @@ -1,39 +0,0 @@ -# parboiled - -#### 介绍 -{**以下是码云平台说明,您可以替换此简介** -码云是 OSCHINA 推出的基于 Git 的代码托管平台(同时支持 SVN)。专为开发者提供稳定、高效、安全的云端软件开发协作平台 -无论是个人、团队、或是企业,都能够用码云实现代码托管、项目管理、协作开发。企业项目请看 [https://gitee.com/enterprises](https://gitee.com/enterprises)} - -#### 软件架构 -软件架构说明 - - -#### 安装教程 - -1. xxxx -2. xxxx -3. xxxx - -#### 使用说明 - -1. xxxx -2. xxxx -3. xxxx - -#### 参与贡献 - -1. Fork 本仓库 -2. 新建 Feat_xxx 分支 -3. 提交代码 -4. 新建 Pull Request - - -#### 码云特技 - -1. 使用 Readme\_XXX.md 来支持不同的语言,例如 Readme\_en.md, Readme\_zh.md -2. 码云官方博客 [blog.gitee.com](https://blog.gitee.com) -3. 你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解码云上的优秀开源项目 -4. [GVP](https://gitee.com/gvp) 全称是码云最有价值开源项目,是码云综合评定出的优秀开源项目 -5. 码云官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help) -6. 码云封面人物是一档用来展示码云会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) diff --git a/parboiled-core-1.1.6.pom b/parboiled-core-1.1.6.pom new file mode 100644 index 0000000..249f790 --- /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..83f89da --- /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-port-to-objectweb-asm-5.0.1.patch b/parboiled-port-to-objectweb-asm-5.0.1.patch new file mode 100644 index 0000000..949bd0e --- /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-add_antrun_plugin.patch b/parboiled-scala-add_antrun_plugin.patch new file mode 100644 index 0000000..fb5a441 --- /dev/null +++ b/parboiled-scala-add_antrun_plugin.patch @@ -0,0 +1,96 @@ +diff -uprN parboiled-1.1.6_raw/parboiled-scala/pom.xml parboiled-1.1.6/parboiled-scala/pom.xml +--- parboiled-1.1.6_raw/parboiled-scala/pom.xml 2020-01-19 09:43:54.000000000 +0800 ++++ parboiled-1.1.6/parboiled-scala/pom.xml 2020-01-19 10:16:58.432735290 +0800 +@@ -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 ++ ++ ++ ++ ++ ++ + +\ No newline at end of file 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..752da2f --- /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..efa5dbf --- /dev/null +++ b/parboiled.spec @@ -0,0 +1,167 @@ +Name: parboiled +Version: 1.1.6 +Release: 17 +Summary: A mixed Java/Scala library +License: ASL 2.0 +URL: http://parboiled.org/ +Source0: https://github.com/sirthias/parboiled/archive/%{version}.tar.gz +Source1: https://repo1.maven.org/maven2/org/parboiled/parboiled-core/%{version}/parboiled-core-%{version}.pom +Source2: https://repo1.maven.org/maven2/org/parboiled/parboiled-java/%{version}/parboiled-java-%{version}.pom +Source3: pom.xml +Source4: http://repo1.maven.org/maven2/org/parboiled/parboiled-scala_2.10/%{version}/parboiled-scala_2.10-%{version}.pom +Patch0000: parboiled-port-to-objectweb-asm-5.0.1.patch +Patch9000: parboiled-scala-add_antrun_plugin.patch +BuildArch: noarch +BuildRequires: maven-local, mvn(org.apache.felix:maven-bundle-plugin), mvn(org.apache.maven.plugins:maven-antrun-plugin) +BuildRequires: mvn(org.ow2.asm:asm), mvn(org.ow2.asm:asm-analysis), mvn(org.ow2.asm:asm-tree), mvn(org.ow2.asm:asm-util) +BuildRequires: mvn(org.scala-lang:scala-compiler), mvn(org.scala-lang:scala-library) +Provides: parboiled-scala%{?_isa} parboiled-scala parboiled-javadoc%{?_isa} parboiled-javadoc +Obsoletes: parboiled-scala parboiled-javadoc + +%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 parsers via CFGs. +parboiled is released under the Apache License 2.0. + +%package help +Summary: Documentation for parboiled + +%description help +Documentation for parboiled api. + +%prep +%setup -q + +find . \( -name "*.jar" -o -name "*.class" \) -delete + +cp -p %{SOURCE1} parboiled-core/pom.xml +cp -p %{SOURCE2} parboiled-java/pom.xml +cp -p %{SOURCE4} parboiled-scala/pom.xml + +for m in core java; do +%pom_xpath_inject "pom:project" \ +" + + + +" \ +parboiled-${m} + +%pom_add_plugin org.apache.maven.plugins:maven-jar-plugin parboiled-${m} \ +" + + + \${project.build.outputDirectory}/META-INF/MANIFEST.MF + + +" +done + +%pom_add_plugin org.apache.felix:maven-bundle-plugin parboiled-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 parboiled-java \ +" + true + + + + + org.parboiled.java + + + org.parboiled.java + + + \${project.version} + + + org.parboiled.core + + + org.parboiled.java.* + + + + + + + bundle-manifest + + + process-classes + + + + manifest + + + +" + +%patch0 -p1 +%patch9000 -p1 + +cp -p %{SOURCE3} pom.xml +sed -i "s|@VERSION@|%{version}|" pom.xml + +%mvn_file :parboiled-java parboiled/java +%mvn_file :parboiled-core parboiled/core +%mvn_package :parboiled-project __noinstall +%pom_xpath_inject "pom:modules" "parboiled-scala" +%mvn_file :parboiled-scala_2.10 parboiled/scala +%mvn_package :parboiled-scala_2.10 scala + +%build +%mvn_build -f -- -Dproject.build.sourceEncoding=UTF-8 + +%install +%mvn_install + +%files -f .mfiles +%doc README.markdown LICENSE +%{_javadir}/parboiled/*.jar +/usr/share/maven* + +%files help +%{_javadocdir}/parboiled/* + +%changelog +* Fri Feb 14 2020 Ling Yang - 1.1.6-17 +- Package init diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..a3c0e2b --- /dev/null +++ b/pom.xml @@ -0,0 +1,39 @@ + + + + 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 + + + + +