[java-sig-commits] [javapackages] Do not generate requires for optional Require-Bundles.
Alexander Kurtakov
akurtakov at fedoraproject.org
Wed Feb 15 12:56:32 UTC 2012
commit 12da19d8d435e3787f67099b4c6484ec4920d510
Author: Alexander Kurtakov <akurtako at redhat.com>
Date: Wed Feb 15 14:55:04 2012 +0200
Do not generate requires for optional Require-Bundles.
Also add eclipse project files to ease importing into eclipse.
.project | 17 +++++++++++++++++
.pydevproject | 10 ++++++++++
depgenerators/osgi.req | 10 +++++++++-
3 files changed, 36 insertions(+), 1 deletions(-)
---
diff --git a/.project b/.project
new file mode 100644
index 0000000..3c357bb
--- /dev/null
+++ b/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>javapackages</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.python.pydev.PyDevBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.python.pydev.pythonNature</nature>
+ </natures>
+</projectDescription>
diff --git a/.pydevproject b/.pydevproject
new file mode 100644
index 0000000..4e50420
--- /dev/null
+++ b/.pydevproject
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?eclipse-pydev version="1.0"?>
+
+<pydev_project>
+<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>
+<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.7</pydev_property>
+<pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH">
+<path>/javapackages</path>
+</pydev_pathproperty>
+</pydev_project>
diff --git a/depgenerators/osgi.req b/depgenerators/osgi.req
index 2bcd312..c6d515f 100755
--- a/depgenerators/osgi.req
+++ b/depgenerators/osgi.req
@@ -64,13 +64,21 @@ class TagBuilder:
def split_bundle_name (self, bundles):
bundlenames = []
+ bundleline = ""
for bundle in bundles.split(','):
- if ")" in bundle or "]" in bundle:
+ if "(" in bundle or "[" in bundle:
+ bundleline = bundle
+ continue
+ if bundleline:
+ bundle = bundleline + bundle
+ if ":=optional" in bundle:
+ bundleline = ""
continue
if ";" in bundle:
bundlenames.append(bundle.split(";")[0].strip())
else:
bundlenames.append(bundle.strip())
+ bundleline = ""
return bundlenames
def get_osgi_require (self, path):
More information about the java-sig-commits
mailing list