diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-04-24 12:44:08 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-04-24 12:45:47 +0300 |
| commit | 5a15474709cb7bc047a9a89d6b5bffa79a45acbe (patch) | |
| tree | e2807fdf1374055543cd4134c37227cfa139bd54 | |
| parent | e0c8cfd2ac753a5c557f5960889bf35085747b2e (diff) | |
Adapt to changes in type rdb file locations and names
The old bin/ure/types.rdb was just a duplicate of bin/udkapi.rdb. There is no
bin/types.rdb any more either. We have just udkapi.rdb, offapi.rdb and
oovbaapi.rdb now.
Change-Id: Idd0911f1d4d48f172af159b852918d429f17cc92
| -rw-r--r-- | android/experimental/DocumentLoader/Makefile | 5 | ||||
| -rw-r--r-- | android/experimental/LibreOffice4Android/Makefile | 5 | ||||
| -rw-r--r-- | android/experimental/desktop/Makefile | 5 |
3 files changed, 6 insertions, 9 deletions
diff --git a/android/experimental/DocumentLoader/Makefile b/android/experimental/DocumentLoader/Makefile index 123042f23f5d..759cf6506fd0 100644 --- a/android/experimental/DocumentLoader/Makefile +++ b/android/experimental/DocumentLoader/Makefile @@ -25,8 +25,7 @@ copy-stuff: mkdir -p assets/gz.unpack/program/ure assets/lib assets/program assets/xml/ure assets/ComponentTarget/i18npool/util gzip -9 <$(OUTDIR)/bin/offapi.rdb >assets/gz.unpack/program/offapi.rdb gzip -9 <$(OUTDIR)/bin/oovbaapi.rdb >assets/gz.unpack/program/oovbaapi.rdb - gzip -9 <$(OUTDIR)/bin/types.rdb >assets/gz.unpack/program/types.rdb - gzip -9 <$(OUTDIR)/bin/ure/types.rdb >assets/gz.unpack/program/ure/types.rdb + gzip -9 <$(OUTDIR)/bin/udkapi.rdb >assets/gz.unpack/program/udkapi.rdb # 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... for F in xml/services xml/ure/services; do \ @@ -71,7 +70,7 @@ copy-stuff: # Set up unorc echo '[Bootstrap]' > assets/program/unorc echo "URE_INTERNAL_LIB_DIR=file://$(APP_DATA_PATH)/lib/" >> assets/program/unorc - echo 'UNO_TYPES=file://$(APP_DATA_PATH)/program/ure/types.rdb file://$(APP_DATA_PATH)/program/types.rdb $${URE_MORE_TYPES}' >> assets/program/unorc + echo 'UNO_TYPES=file://$(APP_DATA_PATH)/program/udkapi.rdb $${URE_MORE_TYPES}' >> assets/program/unorc echo 'UNO_SERVICES=file:///assets/xml/ure/services.rdb $${URE_MORE_SERVICES}' >> assets/program/unorc # # Set up bootstraprc diff --git a/android/experimental/LibreOffice4Android/Makefile b/android/experimental/LibreOffice4Android/Makefile index 598cc6a02c46..e523a4de5349 100644 --- a/android/experimental/LibreOffice4Android/Makefile +++ b/android/experimental/LibreOffice4Android/Makefile @@ -26,8 +26,7 @@ copy-stuff: mkdir -p assets/gz.unpack/program/ure assets/lib assets/program assets/xml/ure assets/ComponentTarget/i18npool/util gzip -9 <$(OUTDIR)/bin/offapi.rdb >assets/gz.unpack/program/offapi.rdb gzip -9 <$(OUTDIR)/bin/oovbaapi.rdb >assets/gz.unpack/program/oovbaapi.rdb - gzip -9 <$(OUTDIR)/bin/types.rdb >assets/gz.unpack/program/types.rdb - gzip -9 <$(OUTDIR)/bin/ure/types.rdb >assets/gz.unpack/program/ure/types.rdb + gzip -9 <$(OUTDIR)/bin/udkapi.rdb >assets/gz.unpack/program/udkapi.rdb # For some reason the vnd.sun.star.expand:$LO_LIB_DIR doesn't seem to work, it expands to empty!? for F in xml/services xml/ure/services; do \ sed -e 's!uri="vnd.sun.star.expand:$$LO_LIB_DIR/!uri="file://$$APP_DATA_DIR/lib/!g' <$(OUTDIR)/$$F.rdb >assets/$$F.rdb; \ @@ -69,7 +68,7 @@ copy-stuff: # Set up unorc echo '[Bootstrap]' > assets/program/unorc echo 'URE_INTERNAL_LIB_DIR=file://$$APP_DATA_DIR/lib/' >> assets/program/unorc - echo 'UNO_TYPES=file://$$APP_DATA_DIR/program/ure/types.rdb file://$$APP_DATA_DIR/program/types.rdb file://$$APP_DATA_DIR/program/offapi.rdb file://$$APP_DATA_DIR/program/oovbaapi.rdb' >> assets/program/unorc + echo 'UNO_TYPES=file://$$APP_DATA_DIR/program/udkapi.rdb file://$$APP_DATA_DIR/program/offapi.rdb file://$$APP_DATA_DIR/program/oovbaapi.rdb' >> assets/program/unorc echo 'UNO_SERVICES=file:///assets/xml/ure/services.rdb file:///assets/xml/services.rdb <$$BRAND_BASE_DIR/program/services>*' >> assets/program/unorc # # Set up bootstraprc diff --git a/android/experimental/desktop/Makefile b/android/experimental/desktop/Makefile index 86935f355c4c..49937769075f 100644 --- a/android/experimental/desktop/Makefile +++ b/android/experimental/desktop/Makefile @@ -26,8 +26,7 @@ copy-stuff: mkdir -p assets/gz.unpack/program/ure assets/lib assets/program assets/xml/ure assets/ComponentTarget/i18npool/util gzip -9 <$(OUTDIR)/bin/offapi.rdb >assets/gz.unpack/program/offapi.rdb gzip -9 <$(OUTDIR)/bin/oovbaapi.rdb >assets/gz.unpack/program/oovbaapi.rdb - gzip -9 <$(OUTDIR)/bin/types.rdb >assets/gz.unpack/program/types.rdb - gzip -9 <$(OUTDIR)/bin/ure/types.rdb >assets/gz.unpack/program/ure/types.rdb + gzip -9 <$(OUTDIR)/bin/udkapi.rdb >assets/gz.unpack/program/udkapi.rdb # 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... for F in xml/services xml/ure/services; do \ @@ -72,7 +71,7 @@ copy-stuff: # Set up unorc echo '[Bootstrap]' > assets/program/unorc echo "URE_INTERNAL_LIB_DIR=file://$(APP_DATA_PATH)/lib/" >> assets/program/unorc - echo 'UNO_TYPES=file://$(APP_DATA_PATH)/program/ure/types.rdb file://$(APP_DATA_PATH)/program/types.rdb $${URE_MORE_TYPES}' >> assets/program/unorc + echo 'UNO_TYPES=file://$(APP_DATA_PATH)/program/udkapi.rdb $${URE_MORE_TYPES}' >> assets/program/unorc echo 'UNO_SERVICES=file:///assets/xml/ure/services.rdb $${URE_MORE_SERVICES}' >> assets/program/unorc # # Set up bootstraprc |