rpms/openoffice.org/devel openoffice.org-1.9.112.ooo51049.javareg.patch, NONE, 1.1 openoffice.org.spec, 1.249, 1.250 revert.this.for.now.patch, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Mon Jun 27 10:33:43 UTC 2005
Author: caolanm
Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21883
Modified Files:
openoffice.org.spec
Added Files:
openoffice.org-1.9.112.ooo51049.javareg.patch
Removed Files:
revert.this.for.now.patch
Log Message:
try again
openoffice.org-1.9.112.ooo51049.javareg.patch:
instsetoo_native/util/makefile.mk | 61 ++++++++++++++++----------------
solenv/bin/guw.pl | 2 -
testtools/source/bridgetest/makefile.mk | 18 ++++-----
3 files changed, 41 insertions(+), 40 deletions(-)
--- NEW FILE openoffice.org-1.9.112.ooo51049.javareg.patch ---
Index: solenv/bin/guw.pl
===================================================================
RCS file: /cvs/tools/solenv/bin/guw.pl,v
retrieving revision 1.22
diff -u -r1.22 guw.pl
--- openoffice.org.orig/solenv/bin/guw.pl 11 Feb 2005 18:24:47 -0000 1.22
+++ openoffice.org/solenv/bin/guw.pl 23 Jun 2005 03:06:15 -0000
@@ -77,7 +77,7 @@
#---------------------------------------------------------------------------
# Define known parameter exceptions
-%knownpara = ( 'echo', [ '/TEST', 'QQQ', 'CCC' ],
+%knownpara = ( 'echo', [ '/TEST', 'QQQ', 'CCC', 'uno:' ],
'cl', [ '-clr:', '-Z' ],
'csc', [ '-target:' ],
'lib', [ 'OUT:', 'EXTRACT:','out:', 'def:', 'machine:' ],
Index: testtools/source/bridgetest/makefile.mk
===================================================================
RCS file: /cvs/udk/testtools/source/bridgetest/makefile.mk,v
retrieving revision 1.21
diff -u -r1.21 makefile.mk
--- openoffice.org.orig/testtools/source/bridgetest/makefile.mk 17 Jun 2005 09:42:46 -0000 1.21
+++ openoffice.org/testtools/source/bridgetest/makefile.mk 23 Jun 2005 03:06:15 -0000
@@ -76,9 +76,13 @@
.IF "$(GUI)"=="WNT"
BATCH_SUFFIX=.bat
GIVE_EXEC_RIGHTS=@echo
+MY_URE_INTERNAL_JAVA_DIR=$(strip $(subst,\,/ file:///$(shell +$(WRAPCMD) echo $(SOLARBINDIR))))
+MY_LOCAL_CLASSDIR=$(subst,\,/ file:///$(PWD)$/$(CLASSDIR))
.ELSE
BATCH_INPROCESS=bridgetest_inprocess
GIVE_EXEC_RIGHTS=chmod +x
+MY_URE_INTERNAL_JAVA_DIR=file://$(SOLARBINDIR)
+MY_LOCAL_CLASSDIR=file://$(PWD)$/$(CLASSDIR)
.ENDIF
UNOUCRDEP=$(SOLARBINDIR)$/udkapi.rdb
@@ -204,23 +208,17 @@
# Use "127.0.0.1" instead of "localhost", see #i32281#:
$(DLLDEST)$/bridgetest_javaserver$(BATCH_SUFFIX) : makefile.mk
-rm -f $@
- +echo java -classpath $(MY_CLASSPATH)$(PATH_SEPERATOR)..$/class$/testComponent.jar \
+ +$(WRAPCMD) echo java -classpath $(MY_CLASSPATH)$(PATH_SEPERATOR)..$/class$/testComponent.jar \
com.sun.star.comp.bridge.TestComponentMain \
\""uno:socket,host=127.0.0.1,port=2002;urp;test"\" \
> $@
$(GIVE_EXEC_RIGHTS) $@
-.IF "$(GUI)" == "WNT"
-FILEURLPREFIX = file:///
-.ELSE
-FILEURLPREFIX = file://
-.ENDIF
-
$(DLLDEST)$/bridgetest_inprocess_java$(BATCH_SUFFIX) : makefile.mk
-rm -f $@
+echo uno -ro uno_services.rdb -ro uno_types.rdb \
-s com.sun.star.test.bridge.BridgeTest \
- $(subst,$/,/ -env:URE_INTERNAL_JAVA_DIR=$(FILEURLPREFIX)$(SOLARBINDIR)) \
+ -env:URE_INTERNAL_JAVA_DIR=$(MY_URE_INTERNAL_JAVA_DIR) \
-- com.sun.star.test.bridge.JavaTestObject > $@
$(GIVE_EXEC_RIGHTS) $@
.ENDIF
@@ -242,8 +240,8 @@
$(REGCOMP) -register -br $(DLLDEST)$/uno_types.rdb -r $@ \
-c javaloader.uno$(DLLPOST) -c javavm.uno$(DLLPOST)
$(REGCOMP) -register -br $(MISC)$/$(TARGET)$/bootstrap.rdb -r $@ -c \
- $(subst,$/,/ $(FILEURLPREFIX)$(PWD)$/$(CLASSDIR)$/testComponent.jar) \
- $(subst,$/,/ -env:URE_INTERNAL_JAVA_DIR=$(FILEURLPREFIX)$(SOLARBINDIR))
+ $(MY_LOCAL_CLASSDIR)/testComponent.jar \
+ -env:URE_INTERNAL_JAVA_DIR=$(MY_URE_INTERNAL_JAVA_DIR)
.ENDIF
$(MISC)$/$(TARGET)$/bootstrap.rdb .ERRREMOVE:
Index: instsetoo_native/util/makefile.mk
===================================================================
RCS file: /cvs/installation/instsetoo_native/util/makefile.mk,v
retrieving revision 1.32
diff -u -r1.32 makefile.mk
--- openoffice.org.orig/instsetoo_native/util/makefile.mk 20 Jun 2005 08:32:40 -0000 1.32
+++ openoffice.org/instsetoo_native/util/makefile.mk 23 Jun 2005 03:06:15 -0000
@@ -177,93 +177,96 @@
-msitemplate $(PRJ)$/inc_ure$/windows$/msi_templates \
-msilanguage $(COMMONMISC)$/win_ulffiles
-.IF "$(OS)" == "WNT"
+.IF "$(USE_SHELL)"!="4nt"
+MY_Q = '
+.ELSE
MY_Q =
-MY_URL = file:///$(SOLARBINDIR)
+.ENDIF
+.IF "$(OS)" == "WNT"
+MY_URL = $(strip $(subst,\,/ file:///$(shell +$(WRAPCMD) echo $(SOLARBINDIR))))
.ELSE
-MY_Q = '
MY_URL = file://$(SOLARLIBDIR)
.ENDIF
$(MISC)$/ure$/services.rdb .ERRREMOVE:
- $(MKDIR) $(@:d)
+ $(REGCOMP) -register -r $@ -c \
$(MY_Q)vnd.sun.star.expand:$$URE_INTERNAL_LIB_DIR/acceptor.uno$(DLLPOST)$(MY_Q) \
- $(subst,$/,/ -env:URE_INTERNAL_LIB_DIR=$(MY_URL))
+ -env:URE_INTERNAL_LIB_DIR=$(MY_URL)
+ $(REGCOMP) -register -r $@ -c \
$(MY_Q)vnd.sun.star.expand:$$URE_INTERNAL_LIB_DIR/bridgefac.uno$(DLLPOST)$(MY_Q) \
- $(subst,$/,/ -env:URE_INTERNAL_LIB_DIR=$(MY_URL))
+ -env:URE_INTERNAL_LIB_DIR=$(MY_URL)
+ $(REGCOMP) -register -r $@ -c \
$(MY_Q)vnd.sun.star.expand:$$URE_INTERNAL_LIB_DIR/connector.uno$(DLLPOST)$(MY_Q) \
- $(subst,$/,/ -env:URE_INTERNAL_LIB_DIR=$(MY_URL))
+ -env:URE_INTERNAL_LIB_DIR=$(MY_URL)
+ $(REGCOMP) -register -r $@ -c \
$(MY_Q)vnd.sun.star.expand:$$URE_INTERNAL_LIB_DIR/implreg.uno$(DLLPOST)$(MY_Q) \
- $(subst,$/,/ -env:URE_INTERNAL_LIB_DIR=$(MY_URL))
+ -env:URE_INTERNAL_LIB_DIR=$(MY_URL)
+ $(REGCOMP) -register -r $@ -c \
$(MY_Q)vnd.sun.star.expand:$$URE_INTERNAL_LIB_DIR/introspection.uno$(DLLPOST)$(MY_Q) \
- $(subst,$/,/ -env:URE_INTERNAL_LIB_DIR=$(MY_URL))
+ -env:URE_INTERNAL_LIB_DIR=$(MY_URL)
+ $(REGCOMP) -register -r $@ -c \
$(MY_Q)vnd.sun.star.expand:$$URE_INTERNAL_LIB_DIR/invocadapt.uno$(DLLPOST)$(MY_Q) \
- $(subst,$/,/ -env:URE_INTERNAL_LIB_DIR=$(MY_URL))
+ -env:URE_INTERNAL_LIB_DIR=$(MY_URL)
+ $(REGCOMP) -register -r $@ -c \
$(MY_Q)vnd.sun.star.expand:$$URE_INTERNAL_LIB_DIR/invocation.uno$(DLLPOST)$(MY_Q) \
- $(subst,$/,/ -env:URE_INTERNAL_LIB_DIR=$(MY_URL))
+ -env:URE_INTERNAL_LIB_DIR=$(MY_URL)
+ $(REGCOMP) -register -r $@ -c \
$(MY_Q)vnd.sun.star.expand:$$URE_INTERNAL_LIB_DIR/javaloader.uno$(DLLPOST)$(MY_Q) \
- $(subst,$/,/ -env:URE_INTERNAL_LIB_DIR=$(MY_URL))
+ -env:URE_INTERNAL_LIB_DIR=$(MY_URL)
+ $(REGCOMP) -register -r $@ -c \
$(MY_Q)vnd.sun.star.expand:$$URE_INTERNAL_LIB_DIR/javavm.uno$(DLLPOST)$(MY_Q) \
- $(subst,$/,/ -env:URE_INTERNAL_LIB_DIR=$(MY_URL))
+ -env:URE_INTERNAL_LIB_DIR=$(MY_URL)
+ $(REGCOMP) -register -r $@ -c \
$(MY_Q)vnd.sun.star.expand:$$URE_INTERNAL_LIB_DIR/namingservice.uno$(DLLPOST)$(MY_Q) \
- $(subst,$/,/ -env:URE_INTERNAL_LIB_DIR=$(MY_URL))
+ -env:URE_INTERNAL_LIB_DIR=$(MY_URL)
+ $(REGCOMP) -register -r $@ -c \
$(MY_Q)vnd.sun.star.expand:$$URE_INTERNAL_LIB_DIR/nestedreg.uno$(DLLPOST)$(MY_Q) \
- $(subst,$/,/ -env:URE_INTERNAL_LIB_DIR=$(MY_URL))
+ -env:URE_INTERNAL_LIB_DIR=$(MY_URL)
+ $(REGCOMP) -register -r $@ -c \
$(MY_Q)vnd.sun.star.expand:$$URE_INTERNAL_LIB_DIR/proxyfac.uno$(DLLPOST)$(MY_Q) \
- $(subst,$/,/ -env:URE_INTERNAL_LIB_DIR=$(MY_URL))
+ -env:URE_INTERNAL_LIB_DIR=$(MY_URL)
+ $(REGCOMP) -register -r $@ -c \
$(MY_Q)vnd.sun.star.expand:$$URE_INTERNAL_LIB_DIR/reflection.uno$(DLLPOST)$(MY_Q) \
- $(subst,$/,/ -env:URE_INTERNAL_LIB_DIR=$(MY_URL))
+ -env:URE_INTERNAL_LIB_DIR=$(MY_URL)
+ $(REGCOMP) -register -r $@ -c \
$(MY_Q)vnd.sun.star.expand:$$URE_INTERNAL_LIB_DIR/regtypeprov.uno$(DLLPOST)$(MY_Q) \
- $(subst,$/,/ -env:URE_INTERNAL_LIB_DIR=$(MY_URL))
+ -env:URE_INTERNAL_LIB_DIR=$(MY_URL)
+ $(REGCOMP) -register -r $@ -c \
$(MY_Q)vnd.sun.star.expand:$$URE_INTERNAL_LIB_DIR/remotebridge.uno$(DLLPOST)$(MY_Q) \
- $(subst,$/,/ -env:URE_INTERNAL_LIB_DIR=$(MY_URL))
+ -env:URE_INTERNAL_LIB_DIR=$(MY_URL)
+ $(REGCOMP) -register -r $@ -c \
$(MY_Q)vnd.sun.star.expand:$$URE_INTERNAL_LIB_DIR/security.uno$(DLLPOST)$(MY_Q) \
- $(subst,$/,/ -env:URE_INTERNAL_LIB_DIR=$(MY_URL))
+ -env:URE_INTERNAL_LIB_DIR=$(MY_URL)
+ $(REGCOMP) -register -r $@ -c \
$(MY_Q)vnd.sun.star.expand:$$URE_INTERNAL_LIB_DIR/servicemgr.uno$(DLLPOST)$(MY_Q) \
- $(subst,$/,/ -env:URE_INTERNAL_LIB_DIR=$(MY_URL))
+ -env:URE_INTERNAL_LIB_DIR=$(MY_URL)
+ $(REGCOMP) -register -r $@ -c \
$(MY_Q)vnd.sun.star.expand:$$URE_INTERNAL_LIB_DIR/shlibloader.uno$(DLLPOST)$(MY_Q) \
- $(subst,$/,/ -env:URE_INTERNAL_LIB_DIR=$(MY_URL))
+ -env:URE_INTERNAL_LIB_DIR=$(MY_URL)
+ $(REGCOMP) -register -r $@ -c \
$(MY_Q)vnd.sun.star.expand:$$URE_INTERNAL_LIB_DIR/simplereg.uno$(DLLPOST)$(MY_Q) \
- $(subst,$/,/ -env:URE_INTERNAL_LIB_DIR=$(MY_URL))
+ -env:URE_INTERNAL_LIB_DIR=$(MY_URL)
+ $(REGCOMP) -register -r $@ -c \
$(MY_Q)vnd.sun.star.expand:$$URE_INTERNAL_LIB_DIR/streams.uno$(DLLPOST)$(MY_Q) \
- $(subst,$/,/ -env:URE_INTERNAL_LIB_DIR=$(MY_URL))
+ -env:URE_INTERNAL_LIB_DIR=$(MY_URL)
+ $(REGCOMP) -register -r $@ -c \
$(MY_Q)vnd.sun.star.expand:$$URE_INTERNAL_LIB_DIR/textinstream.uno$(DLLPOST)$(MY_Q) \
- $(subst,$/,/ -env:URE_INTERNAL_LIB_DIR=$(MY_URL))
+ -env:URE_INTERNAL_LIB_DIR=$(MY_URL)
+ $(REGCOMP) -register -r $@ -c \
$(MY_Q)vnd.sun.star.expand:$$URE_INTERNAL_LIB_DIR/textoutstream.uno$(DLLPOST)$(MY_Q) \
- $(subst,$/,/ -env:URE_INTERNAL_LIB_DIR=$(MY_URL))
+ -env:URE_INTERNAL_LIB_DIR=$(MY_URL)
+ $(REGCOMP) -register -r $@ -c \
$(MY_Q)vnd.sun.star.expand:$$URE_INTERNAL_LIB_DIR/typeconverter.uno$(DLLPOST)$(MY_Q) \
- $(subst,$/,/ -env:URE_INTERNAL_LIB_DIR=$(MY_URL))
+ -env:URE_INTERNAL_LIB_DIR=$(MY_URL)
+ $(REGCOMP) -register -r $@ -c \
$(MY_Q)vnd.sun.star.expand:$$URE_INTERNAL_LIB_DIR/typemgr.uno$(DLLPOST)$(MY_Q) \
- $(subst,$/,/ -env:URE_INTERNAL_LIB_DIR=$(MY_URL))
+ -env:URE_INTERNAL_LIB_DIR=$(MY_URL)
+ $(REGCOMP) -register -r $@ -c \
$(MY_Q)vnd.sun.star.expand:$$URE_INTERNAL_LIB_DIR/uriproc.uno$(DLLPOST)$(MY_Q) \
- $(subst,$/,/ -env:URE_INTERNAL_LIB_DIR=$(MY_URL))
+ -env:URE_INTERNAL_LIB_DIR=$(MY_URL)
+ $(REGCOMP) -register -r $@ -c \
$(MY_Q)vnd.sun.star.expand:$$URE_INTERNAL_LIB_DIR/uuresolver.uno$(DLLPOST)$(MY_Q) \
- $(subst,$/,/ -env:URE_INTERNAL_LIB_DIR=$(MY_URL))
+ -env:URE_INTERNAL_LIB_DIR=$(MY_URL)
.IF "$(LOCALPYFILES)"!=""
$(foreach,i,$(alllangiso) openoffice_$i openofficewithjre_$i ooolanguagepack_$i) updatepack : $(LOCALPYFILES) $(BIN)$/cp1251.py
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.249
retrieving revision 1.250
diff -u -r1.249 -r1.250
--- openoffice.org.spec 25 Jun 2005 09:11:25 -0000 1.249
+++ openoffice.org.spec 27 Jun 2005 10:33:40 -0000 1.250
@@ -114,7 +114,7 @@
Patch44: openoffice.org-1.9.111.ooo51091.exportgcjsymbolname.jvmaccess.patch
Patch45: hsqldb.fix1.patch
Patch46: hsqldb.fix2.patch
-Patch47: revert.this.for.now.patch
+Patch47: openoffice.org-1.9.112.ooo51049.javareg.patch
%define instdir %{_libdir}/openoffice.org2.0
@@ -740,7 +740,7 @@
%patch44 -p1 -b .ooo51091.exportgcjsymbolname.jvmaccess.patch
%patch45 -p1 -b hsqldb.fix1.patch
%patch46 -p1 -b hsqldb.fix2.patch
-%patch47 -p1 -b revert.this.for.now.patch
+%patch47 -p1 -b .ooo51049.javareg.patch
#start ludicrous workaround
#while we include these libs we need this, if/when we move to system
--- revert.this.for.now.patch DELETED ---
More information about the fedora-cvs-commits
mailing list