Commit 0ffc370d9911f10d2806802524dbe94412f76207
1 parent
4b340d90
Exists in
master
and in
5 other branches
Work in progress
Showing
4 changed files
with
10 additions
and
6 deletions
Show diff stats
configure.ac
| ... | ... | @@ -489,10 +489,10 @@ if test "$IDLC" == "no" ; then |
| 489 | 489 | app_cv_office="no" |
| 490 | 490 | fi |
| 491 | 491 | |
| 492 | -#AC_PATH_TOOL([UCPP], ucpp, "no", path=$PATH:$OO_SDK_HOME/bin) | |
| 493 | -#if test "$UCPP" == "no" ; then | |
| 494 | -# app_cv_office="no" | |
| 495 | -#fi | |
| 492 | +AC_PATH_TOOL([UNOPKG], unopkg, "no", path=$PATH:$OO_SDK_HOME/bin) | |
| 493 | +if test "$UNOPKG" == "no" ; then | |
| 494 | + app_cv_office="no" | |
| 495 | +fi | |
| 496 | 496 | |
| 497 | 497 | AC_PATH_TOOL([REGMERGE], regmerge, "no", path=$PATH:$OO_SDK_URE_BIN_DIR) |
| 498 | 498 | if test "$REGMERGE" == "no" ; then | ... | ... |
src/openoffice/Makefile.in
| ... | ... | @@ -128,6 +128,9 @@ include/$(PACKAGE_NAME)/lib3270.hpp: $(RDBDIR)/$(PACKAGE_NAME).rdb |
| 128 | 128 | |
| 129 | 129 | Debug: $(BINDBG)/$(PACKAGE_NAME).oxt |
| 130 | 130 | |
| 131 | +add: $(BINDBG)/$(PACKAGE_NAME).oxt | |
| 132 | + @$(UNOPKG) add --verbose --force $(BINDBG)/$(PACKAGE_NAME).oxt | |
| 133 | + | |
| 131 | 134 | $(BINDBG)/testprogram: $(OBJDBG)/testprogram@OBJEXT@ $(foreach SRC, $(basename $(SOURCES)), $(OBJDBG)/$(SRC)@OBJEXT@) |
| 132 | 135 | @echo $@ ... |
| 133 | 136 | @$(MKDIR) `dirname $@` |
| ... | ... | @@ -166,6 +169,7 @@ $(BINDBG)/$(PACKAGE_NAME).oxt: \ |
| 166 | 169 | @cp $(BINDBG)/$(PACKAGE_NAME).uno@DLLEXT@ $(BINDBG)/$(PACKAGE_NAME).oxt.tmp |
| 167 | 170 | @cp $(PACKAGE_NAME).rdb $(BINDBG)/$(PACKAGE_NAME).oxt.tmp |
| 168 | 171 | @cd $(BINDBG)/$(PACKAGE).oxt.tmp ; $(ZIP) -r -m ../$(PACKAGE_NAME).oxt . |
| 172 | + @rm -fr $(BINDBG)/$(PACKAGE).oxt.tmp | |
| 169 | 173 | @echo $@ Ok. |
| 170 | 174 | |
| 171 | 175 | ... | ... |
src/openoffice/description.xml.in
| ... | ... | @@ -7,7 +7,7 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> |
| 7 | 7 | |
| 8 | 8 | <identifier value="@PACKAGE_NAME@" /> |
| 9 | 9 | |
| 10 | - <platform value="linux_x86" /> | |
| 10 | + <platform value="linux_@host_cpu@" /> | |
| 11 | 11 | |
| 12 | 12 | <dependencies> |
| 13 | 13 | <OpenOffice.org-minimal-version value="2.2" d:name="OpenOffice.org 2.2"/> | ... | ... |
src/openoffice/manifest.xml.in
| 1 | 1 | <?xml version="1.0" encoding="UTF-8"?> |
| 2 | 2 | <manifest:manifest> |
| 3 | -<manifest:file-entry manifest:media-type= "application/vnd.sun.star.uno-component;type=native;platform=Linux_x86" manifest:full-path="@PACKAGE_NAME@.uno.so"/> | |
| 3 | +<manifest:file-entry manifest:media-type= "application/vnd.sun.star.uno-component;type=native;platform=Linux_@host_cpu@" manifest:full-path="@PACKAGE_NAME@.uno.so"/> | |
| 4 | 4 | <manifest:file-entry manifest:media-type="application/vnd.sun.star.uno-typelibrary;type=RDB" manifest:full-path="@PACKAGE_NAME@.rdb"/> |
| 5 | 5 | </manifest:manifest> |
| 6 | 6 | ... | ... |