INTEGRATION: CWS sb31 (1.22.6); FILE MERGED

2005/06/02 13:19:08 sb 1.22.6.8: RESYNC: (1.24-1.28); FILE MERGED
2005/06/02 09:58:54 sb 1.22.6.7: #121932# Changes for wntmsci10.
2005/05/25 13:28:20 sb 1.22.6.6: #121932# Adaption for wntmsci10; cleanup.
2005/05/12 16:16:29 sb 1.22.6.5: #121935# Added URE README.
2005/05/09 13:02:20 sb 1.22.6.4: #121392# Reuse OOo LICENSE file for URE.
2005/05/09 08:30:36 sb 1.22.6.3: #121392# Renamed URE use of UNO_[JAVA_]COMPONENT_PATH to URE_INTERNAL_LIB|JAVA_DIR.
2005/04/27 12:31:36 sb 1.22.6.2: RESYNC: (1.22-1.24); FILE MERGED
2005/04/21 13:49:55 sb 1.22.6.1: #121392# Added URE; for now, the URE has a hardcoded services.rdb, where component libraries are addressed via .

1 files changed, 96 insertions, 1 deletions

diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk
index 6442775190ee..ab384e8ca850 100644
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@ -113,7 +113,7 @@ ALLTAR : $(LOCALPYFILES)
     @echo "No EPM: do no packaging at this stage"
 .ELSE			# "$(GUI)"!="WNT" && "$(EPM)"=="NO" && "$(USE_PACKAGER)"==""
 .IF "$(UPDATER)"=="" || "$(USE_PACKAGER)"==""
-ALLTAR : openoffice
+ALLTAR : openoffice ure_en-US
 .ELSE			# "$(UPDATER)"=="" || "$(USE_PACKAGER)"==""
 ALLTAR : updatepack
 .ENDIF			# "$(UPDATER)"=="" || "$(USE_PACKAGER)"==""
@@ -164,6 +164,101 @@ openoffice:
 
 .ENDIF			# "$(alllangiso)"!=""
 
+ure_en-US: $(MISC)$/ure$/services.rdb
+    + $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f openoffice.lst \
+        -l en-US -p URE -u $(OUT) -buildid $(BUILD) $(PKGFORMATSWITCH) \
+        -packagelist $(PRJ)$/inc_ure$/unix$/packagelist.txt \
+        -msitemplate $(PRJ)$/inc_ure$/windows$/msi_templates \
+        -msilanguage $(COMMONMISC)$/win_ulffiles
+
+.IF "$(OS)" == "WNT"
+MY_Q =
+MY_URL = file:///$(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))
+    + $(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))
+    + $(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))
+    + $(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))
+    + $(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))
+    + $(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))
+    + $(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))
+    + $(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))
+    + $(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))
+    + $(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))
+    + $(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))
+    + $(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))
+    + $(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))
+    + $(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))
+    + $(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))
+    + $(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))
+    + $(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))
+    + $(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))
+    + $(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))
+    + $(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))
+    + $(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))
+    + $(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))
+    + $(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))
+    + $(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))
+    + $(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))
+    + $(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))
+
 .IF "$(LOCALPYFILES)"!=""
 $(foreach,i,$(alllangiso) openoffice_$i) updatepack $(foreach,i,$(alllangiso) ooolanguagepack_$i) : $(LOCALPYFILES) $(BIN)$/cp1251.py
 .ENDIF			# "$(LOCALPYFILES)"!=""