diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2012-01-13 01:27:37 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2012-01-13 01:31:50 +0200 |
| commit | 81301aae9699472bd4e491755c8ee76920711b01 (patch) | |
| tree | 293e791b5c9a7ac7371630b6b375e23ba78b48e9 /android | |
| parent | Fontconfig must have a cachedir, so hardcode one for now (diff) | |
| download | core-81301aae9699472bd4e491755c8ee76920711b01.tar.gz core-81301aae9699472bd4e491755c8ee76920711b01.zip | |
More workarounds for weird problem with vnd.sun.star.expand
Diffstat (limited to 'android')
| -rw-r--r-- | android/qa/sc/Makefile | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/android/qa/sc/Makefile b/android/qa/sc/Makefile index 738d101384f8..1b9ac87ebdae 100644 --- a/android/qa/sc/Makefile +++ b/android/qa/sc/Makefile @@ -133,20 +133,23 @@ copy-stuff: mkdir -p assets/bin assets/lib assets/xml/ure cp $(OUTDIR)/bin/udkapi.rdb assets/bin cp $(OUTDIR)/bin/types.rdb assets/bin - cp $(OUTDIR)/xml/ure/services.rdb assets/xml/ure # For some reason the vnd.sun.star.expand:$LO_LIB_DIR doesn't seem to work, it expands to empty!? # So just hardcode the known APP_DATA_PATH for now... +# Ditto for URE_INTERNAL_LIB_DIR + for F in xml/ure/services; do \ + sed -e 's!uri="vnd.sun.star.expand:$$URE_INTERNAL_LIB_DIR/!uri="$(APP_DATA_PATH)/lib/!g' <$(OUTDIR)/$$F.rdb >assets/$$F.rdb; \ + done for F in framework/util/fwk i18npool/util/i18npool sfx2/util/sfx unoxml/source/service/unoxml configmgr/source/configmgr; do \ mkdir -p assets/ComponentTarget/`dirname $$F`; \ - sed -e 's!uri="vnd.sun.star.expand:$$LO_LIB_DIR/!uri="$(APP_DATA_PATH)/lib/!' <$(WORKDIR)/ComponentTarget/$$F.component >assets/ComponentTarget/$$F.component; \ + sed -e 's!uri="vnd.sun.star.expand:$$LO_LIB_DIR/!uri="$(APP_DATA_PATH)/lib/!g' <$(WORKDIR)/ComponentTarget/$$F.component >assets/ComponentTarget/$$F.component; \ done for F in ucb1 ucpfile1; do \ - sed -e 's!uri="vnd.sun.star.expand:$$LO_LIB_DIR/!uri="$(APP_DATA_PATH)/lib/!' <$(OUTDIR)/xml/$$F.component > assets/xml/$$F.component; \ + sed -e 's!uri="vnd.sun.star.expand:$$LO_LIB_DIR/!uri="$(APP_DATA_PATH)/lib/!g' <$(OUTDIR)/xml/$$F.component >assets/xml/$$F.component; \ done - cp -R $(OUTDIR)/xml/registry assets/xml for F in uno_services uno_types; do \ sed -e 's!uri="./!uri="$(APP_DATA_PATH)/lib/!g' <$(SRC_ROOT)/testtools/$(INPATH)/lib/$$F.rdb >assets/lib/$$F.rdb; \ done + cp -R $(OUTDIR)/xml/registry assets/xml # Then assets that are unpacked at run-time into the app's data directory. mkdir -p assets/unpack/bin for F in $(OUTDIR)/bin/*.res; do \ |