You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@celix.apache.org by bp...@apache.org on 2016/02/09 11:59:31 UTC
celix git commit: CELIX-346: fixed formatting issue, documentation
Repository: celix
Updated Branches:
refs/heads/develop 6bf16bd8c -> 5c5f35ae0
CELIX-346: fixed formatting issue, documentation
Project: http://git-wip-us.apache.org/repos/asf/celix/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/5c5f35ae
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/5c5f35ae
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/5c5f35ae
Branch: refs/heads/develop
Commit: 5c5f35ae0cd0781a99d34e3a3aae68da78eae72f
Parents: 6bf16bd
Author: Bjoern Petri <bp...@apache.org>
Authored: Tue Feb 9 11:59:09 2016 +0100
Committer: Bjoern Petri <bp...@apache.org>
Committed: Tue Feb 9 11:59:09 2016 +0100
----------------------------------------------------------------------
celix-bootstrap/README.md | 2 +-
.../bootstrap/templates/bundle/bundle.yaml | 66 ++++++++++----------
2 files changed, 34 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/celix/blob/5c5f35ae/celix-bootstrap/README.md
----------------------------------------------------------------------
diff --git a/celix-bootstrap/README.md b/celix-bootstrap/README.md
index 32296c6..0bc5553 100644
--- a/celix-bootstrap/README.md
+++ b/celix-bootstrap/README.md
@@ -19,7 +19,7 @@ A (python based) code generation tool for [Apache Celix](https://celix.apache.or
* Clone this repository
* Create a celix-bootstrap alias:
```
-alias celix-bootstrap='PYTHONPATH=${cog_dir}:${celix-boostrap_dir} python -m celix-bootstrap'
+alias celix-bootstrap='PYTHONPATH=${cog_dir}:${celix-boostrap_dir} python -m celix.bootstrap'
```
#Concept
http://git-wip-us.apache.org/repos/asf/celix/blob/5c5f35ae/celix-bootstrap/celix/bootstrap/templates/bundle/bundle.yaml
----------------------------------------------------------------------
diff --git a/celix-bootstrap/celix/bootstrap/templates/bundle/bundle.yaml b/celix-bootstrap/celix/bootstrap/templates/bundle/bundle.yaml
index 1bf752e..5476d55 100644
--- a/celix-bootstrap/celix/bootstrap/templates/bundle/bundle.yaml
+++ b/celix-bootstrap/celix/bootstrap/templates/bundle/bundle.yaml
@@ -25,44 +25,44 @@ components:
# componentName = checkInput('\nPlease enter componentName', '([a-zA-Z_][a-zA-Z0-9_]*)', 'example')
# cog.outl('- name: \'%s\'' % componentName )
# cog.outl(' providedServices:')
- # while yn('Should component \'%s\' provide %s service?' % (componentName, 'a' if 'psInclude' not in vars() else 'another')):
- # psServiceName1 = checkInput('(1) Please enter a name, which can be used for the filename and the include guards', '([a-zA-Z_][a-zA-Z0-9_]*)');
- # psServiceName2 = checkInput('(2) Please enter a name, which is used to register and lookup the service', '([a-zA-Z_][a-zA-Z0-9_]*)', (psServiceName1.lower() + ('_service' if not psServiceName1.endswith('_service') else '')));
- # psServiceVersion = checkInput('(3) Please enter a version number', '(\d+\.)?(\d+\.)?(\d+\.)?(\*|\d+)', '1.0.0.0');
- # psServiceType = checkInput('(4) Please enter a type', '([a-zA-Z_][a-zA-Z0-9_]*)', (psServiceName1.lower() + ('_service_t' if not psServiceName1.endswith('_service_t') else '')) );
- # psInclude = checkInput('(5) Please enter the name of the include file', '(.+?)(\.[^.]*$|$)', psServiceName1.lower() + '.h');
+ # while yn('Should component \'%s\' provide %s service?' % (componentName, 'a' if 'psInclude' not in vars() else 'another')):
+ # psServiceName1 = checkInput('(1) Please enter a name, which can be used for the filename and the include guards', '([a-zA-Z_][a-zA-Z0-9_]*)');
+ # psServiceName2 = checkInput('(2) Please enter a name, which is used to register and lookup the service', '([a-zA-Z_][a-zA-Z0-9_]*)', (psServiceName1.lower() + ('_service' if not psServiceName1.endswith('_service') else '')));
+ # psServiceVersion = checkInput('(3) Please enter a version number', '(\d+\.)?(\d+\.)?(\d+\.)?(\*|\d+)', '1.0.0.0');
+ # psServiceType = checkInput('(4) Please enter a type', '([a-zA-Z_][a-zA-Z0-9_]*)', (psServiceName1.lower() + ('_service_t' if not psServiceName1.endswith('_service_t') else '')) );
+ # psInclude = checkInput('(5) Please enter the name of the include file', '(.+?)(\.[^.]*$|$)', psServiceName1.lower() + '.h');
#
- # print("\n Summary:")
- # print("\tname :\t%s" % (psServiceName1))
- # print("\tservice_name:\t%s" % (psServiceName2))
- # print("\tservice_version:\t%s" % (psServiceVersion))
- # print("\tservice_type:\t%s" % (psServiceType))
- # print("\tinclude file:\t%s" % (psInclude))
- # if yn('Are those information correct?'):
- # cog.outl(' - {include: \'%s\', name: \'%s\', service_name: \'%s\', service_version: \'%s\', type: \'%s\'}' % (psInclude, psServiceName1, psServiceName2, psServiceVersion, psServiceType))
- # else:
- # print("Service was not added.")
+ # print("\n Summary:")
+ # print("\tname :\t%s" % (psServiceName1))
+ # print("\tservice_name:\t%s" % (psServiceName2))
+ # print("\tservice_version:\t%s" % (psServiceVersion))
+ # print("\tservice_type:\t%s" % (psServiceType))
+ # print("\tinclude file:\t%s" % (psInclude))
+ # if yn('Are those information correct?'):
+ # cog.outl(' - {include: \'%s\', name: \'%s\', service_name: \'%s\', service_version: \'%s\', type: \'%s\'}' % (psInclude, psServiceName1, psServiceName2, psServiceVersion, psServiceType))
+ # else:
+ # print("Service was not added.")
#
# cog.outl(' serviceDependencies:')
# while yn('Should component \'%s\' depend on %s service?' % (componentName, 'a' if 'sdInclude' not in vars() else 'another')):
- # sdInclude = checkInclude('(1) Please enter the include filename, which describes the service', '(.+?)(\.[^.]*$|$)');
- # sdServiceName1 = checkInput('(2) Please enter a name, which is used to generate the code', '([a-zA-Z_][a-zA-Z0-9_]*)');
- # sdServiceName2 = checkIncludeContent('(3) Please enter the variable/constants, which is used to register the service within the framework', sdInclude);
- # sdServiceRange = checkIncludeContent('(4) Please enter the variable/constants, which contains the version range', sdInclude);
- # sdServiceType = checkIncludeContent('(5) Please enter the type of the service', sdInclude);
- # sdCardinality = checkInput('(6) Please enter the cardinality (one|many|optional)', '(one)|(many)|(optional)');
+ # sdInclude = checkInclude('(1) Please enter the include filename, which describes the service', '(.+?)(\.[^.]*$|$)');
+ # sdServiceName1 = checkInput('(2) Please enter a name, which is used to generate the code', '([a-zA-Z_][a-zA-Z0-9_]*)');
+ # sdServiceName2 = checkIncludeContent('(3) Please enter the variable/constants, which is used to register the service within the framework', sdInclude);
+ # sdServiceRange = checkIncludeContent('(4) Please enter the variable/constants, which contains the version range', sdInclude);
+ # sdServiceType = checkIncludeContent('(5) Please enter the type of the service', sdInclude);
+ # sdCardinality = checkInput('(6) Please enter the cardinality (one|many|optional)', '(one)|(many)|(optional)');
#
- # print("\n Summary:")
- # print("\tname :\t%s" % (sdServiceName1))
- # print("\tservice_name:\t%s" % (sdServiceName2))
- # print("\tservice_range:\t%s" % (sdServiceRange))
- # print("\tservice_type:\t%s" % (sdServiceType))
- # print("\tcardinality:\t%s" % (sdCardinality))
- # print("\tinclude file:\t%s" % (sdInclude))
- # if yn('Are those information correct?'):
- # cog.outl(' - {include: \'%s\', name: \'%s\', service_name: \'%s\', service_versionrange: \'%s\', type: \'%s\', cardinality: \'%s\'}' % (sdInclude, sdServiceName1, sdServiceName2, sdServiceRange, sdServiceType, sdCardinality))
- # else:
- # print("Service dependency was not added.")
+ # print("\n Summary:")
+ # print("\tname :\t%s" % (sdServiceName1))
+ # print("\tservice_name:\t%s" % (sdServiceName2))
+ # print("\tservice_range:\t%s" % (sdServiceRange))
+ # print("\tservice_type:\t%s" % (sdServiceType))
+ # print("\tcardinality:\t%s" % (sdCardinality))
+ # print("\tinclude file:\t%s" % (sdInclude))
+ # if yn('Are those information correct?'):
+ # cog.outl(' - {include: \'%s\', name: \'%s\', service_name: \'%s\', service_versionrange: \'%s\', type: \'%s\', cardinality: \'%s\'}' % (sdInclude, sdServiceName1, sdServiceName2, sdServiceRange, sdServiceType, sdCardinality))
+ # else:
+ # print("Service dependency was not added.")
#}}
#{{end}}