diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/xmlGenerator/Android.mk | 5 | ||||
| -rwxr-xr-x | tools/xmlGenerator/hostDomainGenerator.sh | 11 | ||||
| -rw-r--r-- | tools/xmlValidator/README.md | 36 |
3 files changed, 24 insertions, 28 deletions
diff --git a/tools/xmlGenerator/Android.mk b/tools/xmlGenerator/Android.mk index 452668e..ebbc9e3 100644 --- a/tools/xmlGenerator/Android.mk +++ b/tools/xmlGenerator/Android.mk @@ -34,6 +34,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := PFWScriptGenerator.py +LOCAL_MODULE_OWNER := intel LOCAL_SRC_FILES := $(LOCAL_MODULE) LOCAL_MODULE_CLASS := EXECUTABLES LOCAL_IS_HOST_MODULE := true @@ -41,6 +42,7 @@ include $(BUILD_PREBUILT) include $(CLEAR_VARS) LOCAL_MODULE := hostConfig.py +LOCAL_MODULE_OWNER := intel LOCAL_SRC_FILES := $(LOCAL_MODULE) LOCAL_MODULE_CLASS := EXECUTABLES LOCAL_IS_HOST_MODULE := true @@ -48,6 +50,7 @@ include $(BUILD_PREBUILT) include $(CLEAR_VARS) LOCAL_MODULE := portAllocator.py +LOCAL_MODULE_OWNER := intel LOCAL_SRC_FILES := $(LOCAL_MODULE) LOCAL_MODULE_CLASS := EXECUTABLES LOCAL_IS_HOST_MODULE := true @@ -55,6 +58,7 @@ include $(BUILD_PREBUILT) include $(CLEAR_VARS) LOCAL_MODULE := hostDomainGenerator.sh +LOCAL_MODULE_OWNER := intel LOCAL_SRC_FILES := $(LOCAL_MODULE) LOCAL_REQUIRED_MODULES := \ PFWScriptGenerator.py \ @@ -78,6 +82,7 @@ include $(BUILD_PREBUILT) include $(CLEAR_VARS) LOCAL_MODULE := lightRoutingUpdate.sh +LOCAL_MODULE_OWNER := intel LOCAL_SRC_FILES := $(LOCAL_MODULE) LOCAL_REQUIRED_MODULES := \ PFWScriptGenerator.py diff --git a/tools/xmlGenerator/hostDomainGenerator.sh b/tools/xmlGenerator/hostDomainGenerator.sh index 4cfce4d..c084753 100755 --- a/tools/xmlGenerator/hostDomainGenerator.sh +++ b/tools/xmlGenerator/hostDomainGenerator.sh @@ -99,15 +99,6 @@ clean_up () { status=$? set +e # An error should not abort clean up - ( if test $status -ne 0 - then - echo "$0 is exiting on error, printing debug information." - echo "Test platform port: $TPSocket" - echo "PFW port: $PFWSocket" - netstat --program --all --numeric --extend --tcp - ps -ejHlf - fi ) >&5 - # Exit the test-platform only if it was created by this process if $TPCreated then @@ -313,5 +304,5 @@ m4 "$@" | $PFWSendCommand getDomainsWithSettingsXML | # Delete trailing carriage return and format absolute paths sed -r -e 's/\r$//' \ - -e 's/(xsi:noNamespaceSchemaLocation=")[^"]*tmp/\1/' >&4 + -e 's@(xsi:noNamespaceSchemaLocation=")'"$tmpDir"'/?@\1@' >&4 diff --git a/tools/xmlValidator/README.md b/tools/xmlValidator/README.md index 11d64a6..c50f33e 100644 --- a/tools/xmlValidator/README.md +++ b/tools/xmlValidator/README.md @@ -27,24 +27,24 @@ where: In the example, we have the following files: - ├── ParameterFrameworkConfiguration.xml - ├── Schemas - │ ├── ComponentLibrary.xsd - │ ├── ComponentTypeSet.xsd - │ ├── ConfigurableDomains.xsd - │ ├── FileIncluder.xsd - │ ├── ParameterFrameworkConfiguration.xsd - │ ├── ParameterSettings.xsd - │ ├── Parameter.xsd - │ ├── Subsystem.xsd - │ └── SystemClass.xsd - ├── Settings - │ └── FS - │ └── Genres.xml - └── Structure - └── FS - ├── MusicLibraries.xml - └── my_music.xml + |-- ParameterFrameworkConfiguration.xml + |-- Schemas + | |-- ComponentLibrary.xsd + | |-- ComponentTypeSet.xsd + | |-- ConfigurableDomains.xsd + | |-- FileIncluder.xsd + | |-- ParameterFrameworkConfiguration.xsd + | |-- ParameterSettings.xsd + | |-- Parameter.xsd + | |-- Subsystem.xsd + | `-- SystemClass.xsd + |-- Settings + | `-- FS + | `-- Genres.xml + `--- Structure + `-- FS + |-- MusicLibraries.xml + `-- my_music.xml ### Command We are in the directory which contains the structure detailed previously. |