From 81e768c0b60834d9ef845e4803ad93d7f87c6bd0 Mon Sep 17 00:00:00 2001 From: Oliver Bolte Date: Thu, 25 Jan 2007 15:02:30 +0000 Subject: INTEGRATION: CWS ause069 (1.60.6); FILE MERGED 2007/01/24 12:43:19 hjs 1.60.6.5: RESYNC: (1.62-1.63); FILE MERGED 2007/01/10 22:25:26 hjs 1.60.6.4: RESYNC: (1.61-1.62); FILE MERGED 2006/11/24 14:54:11 hjs 1.60.6.3: #i70359# remove forced shell calls 2006/11/07 06:28:30 hjs 1.60.6.2: RESYNC: (1.60-1.61); FILE MERGED 2006/10/18 17:11:30 hjs 1.60.6.1: #i70359# remove forced shell calls --- instsetoo_native/util/makefile.mk | 144 +++++++++++++++++++------------------- 1 file changed, 72 insertions(+), 72 deletions(-) (limited to 'instsetoo_native') diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk index d2a23e9872f5..c25ef9876e02 100644 --- a/instsetoo_native/util/makefile.mk +++ b/instsetoo_native/util/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.64 $ +# $Revision: 1.65 $ # -# last change: $Author: obo $ $Date: 2007-01-25 11:14:13 $ +# last change: $Author: obo $ $Date: 2007-01-25 16:02:30 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -126,7 +126,7 @@ PKGFORMATSWITCH=-format xxx .ENDIF # "$(PKGFORMAT)"!="" updatepack: - +$(PERL) -w $(SOLARENV)$/bin$/packager.pl + $(PERL) -w $(SOLARENV)$/bin$/packager.pl .IF "$(alllangiso)"!="" @@ -198,17 +198,17 @@ openoffice_%{$(PKGFORMAT:^".")} : openoffice_% : .ENDIF # "$(PKGFORMAT)"!="" .IF "$(OS)"!="MACOSX" || "$(PKGFORMAT)"!="portable" - +$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice -packagelist $(PRJ)$/inc_openoffice$/unix$/packagelist.txt -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -addsystemintegration $(subst,xxx,$(@:e:s/.//) $(PKGFORMATSWITCH)) + $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice -packagelist $(PRJ)$/inc_openoffice$/unix$/packagelist.txt -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -addsystemintegration $(subst,xxx,$(@:e:s/.//) $(PKGFORMATSWITCH)) .ELSE # "$(OS)"!="MACOSX" || "$(PKGFORMAT)"!="" - +$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice -packagelist $(PRJ)$/inc_openoffice$/unix$/packagelist.txt -u $(OUT) -buildid $(BUILD) -destdir $(subst,$(@:s/_/ /:1)_,$(OUT)$/OpenOffice$/install$/ $(@:b))_inprogress$/ -simple staging - +$(RM) $(subst,$(@:s/_/ /:1)_,$(OUT)$/OpenOffice$/install$/ $(@:b))$/gid_* - +-$(MKDIR) $(subst,$(@:s/_/ /:1)_,$(OUT)$/OpenOffice$/install$/ $(@:b))$/staging$/.background - +$(COPY) $(PRJ)$/res/osxdndinstall.png $(subst,$(@:s/_/ /:1)_,$(OUT)$/OpenOffice$/install$/ $(@:b))$/staging$/.background$/background.png - +$(COPY) $(PRJ)$/res/DS_Store $(subst,$(@:s/_/ /:1)_,$(OUT)$/OpenOffice$/install$/ $(@:b))$/staging$/.DS_Store - +ln -s /Applications $(subst,$(@:s/_/ /:1)_,$(OUT)$/OpenOffice$/install$/ $(@:b))$/staging$/ - +cd $(subst,$(@:s/_/ /:1)_,$(OUT)$/OpenOffice$/install$/ $(@:b)) && hdiutil makehybrid -hfs -hfs-openfolder staging staging \ + $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice -packagelist $(PRJ)$/inc_openoffice$/unix$/packagelist.txt -u $(OUT) -buildid $(BUILD) -destdir $(subst,$(@:s/_/ /:1)_,$(OUT)$/OpenOffice$/install$/ $(@:b))_inprogress$/ -simple staging + $(RM) $(subst,$(@:s/_/ /:1)_,$(OUT)$/OpenOffice$/install$/ $(@:b))$/gid_* + -$(MKDIR) $(subst,$(@:s/_/ /:1)_,$(OUT)$/OpenOffice$/install$/ $(@:b))$/staging$/.background + $(COPY) $(PRJ)$/res/osxdndinstall.png $(subst,$(@:s/_/ /:1)_,$(OUT)$/OpenOffice$/install$/ $(@:b))$/staging$/.background$/background.png + $(COPY) $(PRJ)$/res/DS_Store $(subst,$(@:s/_/ /:1)_,$(OUT)$/OpenOffice$/install$/ $(@:b))$/staging$/.DS_Store + ln -s /Applications $(subst,$(@:s/_/ /:1)_,$(OUT)$/OpenOffice$/install$/ $(@:b))$/staging$/ + cd $(subst,$(@:s/_/ /:1)_,$(OUT)$/OpenOffice$/install$/ $(@:b)) && hdiutil makehybrid -hfs -hfs-openfolder staging staging \ -hfs-volume-name OpenOffice.org -ov -o tmp && hdiutil convert -ov -format UDZO tmp.dmg \ - -o $(subst,$(@:s/_/ /:1),OpenOffice.org-$(shell sed -n '/^OpenOffice$$/,/^}$$/ s/.*PACKAGEVERSION //p' openoffice.lst) $(@:b)) && $(RM) tmp.dmg + -o $(subst,$(@:s/_/ /:1),OpenOffice.org-$(shell sed -n '/^OpenOffice$$/,/^}$$/ s/.*PACKAGEVERSION //p' openoffice.lst) $(@:b)) && $(RM:s/+//) tmp.dmg .ENDIF # "$(OS)"!="MACOSX" || "$(PKGFORMAT)"!="" @@ -218,7 +218,7 @@ openofficewithjre_%{$(PKGFORMAT:^".")} : .ELSE # "$(PKGFORMAT)"!="" openofficewithjre_% : .ENDIF # "$(PKGFORMAT)"!="" - +$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice_wJRE -packagelist $(PRJ)$/inc_openoffice$/unix$/packagelist.txt -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -addchildprojects -addsystemintegration $(subst,xxx,$(@:e:s/.//) $(PKGFORMATSWITCH)) + $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice_wJRE -packagelist $(PRJ)$/inc_openoffice$/unix$/packagelist.txt -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -addchildprojects -addsystemintegration $(subst,xxx,$(@:e:s/.//) $(PKGFORMATSWITCH)) .IF "$(PKGFORMAT)"!="" $(foreach,i,$(alllangiso) openofficedev_$i) : $$@{$(PKGFORMAT:^".")} @@ -226,10 +226,10 @@ openofficedev_%{$(PKGFORMAT:^".")} : .ELSE # "$(PKGFORMAT)"!="" openofficedev_% : .ENDIF # "$(PKGFORMAT)"!="" - +$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice_Dev -packagelist $(PRJ)$/inc_openoffice$/unix$/packagelist.txt -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles $(subst,xxx,$(@:e:s/.//) $(PKGFORMATSWITCH)) + $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice_Dev -packagelist $(PRJ)$/inc_openoffice$/unix$/packagelist.txt -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles $(subst,xxx,$(@:e:s/.//) $(PKGFORMATSWITCH)) openofficedevarchive_% : - +$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice_Dev -packagelist $(PRJ)$/inc_openoffice$/unix$/packagelist.txt -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -format archive + $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice_Dev -packagelist $(PRJ)$/inc_openoffice$/unix$/packagelist.txt -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -format archive .IF "$(PKGFORMAT)"!="" $(foreach,i,$(alllangiso) ooolanguagepack_$i) : $$@{$(PKGFORMAT:^".")} @@ -237,7 +237,7 @@ ooolanguagepack_%{$(PKGFORMAT:^".")} : .ELSE # "$(PKGFORMAT)"!="" ooolanguagepack_% : .ENDIF # "$(PKGFORMAT)"!="" - +$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice -packagelist $(PRJ)$/inc_openoffice$/unix$/packagelist_language.txt -u $(OUT) -buildid $(BUILD) -msitemplate $(MSILANGPACKTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -languagepack $(subst,xxx,$(@:e:s/.//) $(PKGFORMATSWITCH)) + $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice -packagelist $(PRJ)$/inc_openoffice$/unix$/packagelist_language.txt -u $(OUT) -buildid $(BUILD) -msitemplate $(MSILANGPACKTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -languagepack $(subst,xxx,$(@:e:s/.//) $(PKGFORMATSWITCH)) .IF "$(PKGFORMAT)"!="" $(foreach,i,$(alllangiso) sdkoo_$i) : $$@{$(PKGFORMAT:^".")} @@ -246,12 +246,12 @@ sdkoo_%{$(PKGFORMAT:^".")} : sdkoo_% : .ENDIF # "$(PKGFORMAT)"!="" .IF "$(OS)"!="MACOSX" || "$(PKGFORMAT)"!="portable" - +$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice_SDK -packagelist $(PRJ)$/inc_sdkoo$/unix$/packagelist.txt -u $(OUT) -buildid $(BUILD) -msitemplate $(MSISDKOOTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles $(subst,xxx,$(@:e:s/.//) -dontstrip $(PKGFORMATSWITCH)) + $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice_SDK -packagelist $(PRJ)$/inc_sdkoo$/unix$/packagelist.txt -u $(OUT) -buildid $(BUILD) -msitemplate $(MSISDKOOTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles $(subst,xxx,$(@:e:s/.//) -dontstrip $(PKGFORMATSWITCH)) .ELSE # "$(OS)"!="MACOSX" || "$(PKGFORMAT)"!="" - +$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice_SDK -packagelist $(PRJ)$/inc_sdkoo$/unix$/packagelist.txt -u $(OUT) -buildid $(BUILD) -destdir $(subst,$(@:s/_/ /:1)_,$(OUT)$/OpenOffice_SDK$/install$/ $(@:b))_inprogress$/ -simple 'SDK/OpenOffice.org SDK' - +$(RM) $(subst,$(@:s/_/ /:1)_,$(OUT)$/OpenOffice_SDK$/install$/ $(@:b))$/gid_* - +rmdir $(subst,$(@:s/_/ /:1)_,$(OUT)$/OpenOffice_SDK$/install$/ $(@:b))$/SDK/OpenOffice.org - +cd $(subst,$(@:s/_/ /:1)_,$(OUT)$/OpenOffice_SDK$/install$/ $(@:b)) && hdiutil create -srcfolder 'SDK' -volname 'OpenOffice.org SDK' -ov -o $(subst,$(@:s/_/ /:1),OpenOffice.org-SDK-$(shell sed -n '/^OpenOffice_SDK$$/,/^}$$/ s/.*PACKAGEVERSION //p' openoffice.lst) $(@:b)) + $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice_SDK -packagelist $(PRJ)$/inc_sdkoo$/unix$/packagelist.txt -u $(OUT) -buildid $(BUILD) -destdir $(subst,$(@:s/_/ /:1)_,$(OUT)$/OpenOffice_SDK$/install$/ $(@:b))_inprogress$/ -simple 'SDK/OpenOffice.org SDK' + $(RM) $(subst,$(@:s/_/ /:1)_,$(OUT)$/OpenOffice_SDK$/install$/ $(@:b))$/gid_* + rmdir $(subst,$(@:s/_/ /:1)_,$(OUT)$/OpenOffice_SDK$/install$/ $(@:b))$/SDK/OpenOffice.org + cd $(subst,$(@:s/_/ /:1)_,$(OUT)$/OpenOffice_SDK$/install$/ $(@:b)) && hdiutil create -srcfolder 'SDK' -volname 'OpenOffice.org SDK' -ov -o $(subst,$(@:s/_/ /:1),OpenOffice.org-SDK-$(shell sed -n '/^OpenOffice_SDK$$/,/^}$$/ s/.*PACKAGEVERSION //p' openoffice.lst) $(@:b)) .ENDIF # "$(OS)"!="MACOSX" || "$(PKGFORMAT)"!="" .ELSE # "$(alllangiso)"!="" @@ -267,19 +267,19 @@ ure_en-US{$(PKGFORMAT:^".")} : $(MISC)$/ure$/services.rdb ure_en-US: $(MISC)$/ure$/services.rdb .ENDIF # "$(PKGFORMAT)"!="" .IF "$(OS)"!="MACOSX" || "$(PKGFORMAT)"!="portable" - +$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst \ + $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst \ -l en-US -p URE -u $(OUT) -buildid $(BUILD) $(subst,xxx,$(@:e:s/.//) $(PKGFORMATSWITCH)) \ -packagelist $(PRJ)$/inc_ure$/unix$/packagelist.txt \ -msitemplate $(MSIURETEMPLATEDIR) \ -msilanguage $(COMMONMISC)$/win_ulffiles .ELSE # "$(OS)"!="MACOSX" || "$(PKGFORMAT)"!="" - +$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst \ + $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst \ -l en-US -p URE -u $(OUT) -buildid $(BUILD) \ -packagelist $(PRJ)$/inc_ure$/unix$/packagelist.txt \ -destdir $(subst,$(@:s/_/ /:1)_,$(OUT)$/URE$/install$/ $(@:b))_inprogress$/ -simple 'URE/OpenOffice.org URE' - +$(RM) $(subst,$(@:s/_/ /:1)_,$(OUT)$/URE$/install$/ $(@:b))$/gid_* - +rmdir $(subst,$(@:s/_/ /:1)_,$(OUT)$/URE$/install$/ $(@:b))$/URE/OpenOffice.org - +cd $(subst,$(@:s/_/ /:1)_,$(OUT)$/URE$/install$/ $(@:b)) && hdiutil create -srcfolder 'URE' -volname 'OpenOffice.org URE' -ov -o $(subst,$(@:s/_/ /:1),OpenOffice.org-URE-$(shell sed -n '/^URE$$/,/^}$$/ s/.*PACKAGEVERSION //p' openoffice.lst) $(@:b)) + $(RM) $(subst,$(@:s/_/ /:1)_,$(OUT)$/URE$/install$/ $(@:b))$/gid_* + rmdir $(subst,$(@:s/_/ /:1)_,$(OUT)$/URE$/install$/ $(@:b))$/URE/OpenOffice.org + cd $(subst,$(@:s/_/ /:1)_,$(OUT)$/URE$/install$/ $(@:b)) && hdiutil create -srcfolder 'URE' -volname 'OpenOffice.org URE' -ov -o $(subst,$(@:s/_/ /:1),OpenOffice.org-URE-$(shell sed -n '/^URE$$/,/^}$$/ s/.*PACKAGEVERSION //p' openoffice.lst) $(@:b)) .ENDIF # "$(OS)"!="MACOSX" || "$(PKGFORMAT)"!="" .IF "$(USE_SHELL)"!="4nt" @@ -288,90 +288,90 @@ MY_Q = ' MY_Q = .ENDIF .IF "$(OS)" == "WNT" -MY_URL = $(strip $(subst,\,/ file:///$(shell +$(WRAPCMD) echo $(SOLARBINDIR)))) +MY_URL = $(strip $(subst,\,/ file:///$(shell $(WRAPCMD) echo $(SOLARBINDIR)))) .ELSE MY_URL = file://$(SOLARLIBDIR) .ENDIF $(MISC)$/ure$/services.rdb .ERRREMOVE: - $(MKDIR) $(@:d) - + $(REGCOMP) -register -r $@ -c \ + $(REGCOMP) -register -r $@ -c \ $(MY_Q)vnd.sun.star.expand:$$URE_INTERNAL_LIB_DIR/acceptor.uno$(DLLPOST)$(MY_Q) \ -env:URE_INTERNAL_LIB_DIR=$(MY_URL) - + $(REGCOMP) -register -r $@ -c \ + $(REGCOMP) -register -r $@ -c \ $(MY_Q)vnd.sun.star.expand:$$URE_INTERNAL_LIB_DIR/bridgefac.uno$(DLLPOST)$(MY_Q) \ -env:URE_INTERNAL_LIB_DIR=$(MY_URL) - + $(REGCOMP) -register -r $@ -c \ + $(REGCOMP) -register -r $@ -c \ $(MY_Q)vnd.sun.star.expand:$$URE_INTERNAL_LIB_DIR/connector.uno$(DLLPOST)$(MY_Q) \ -env:URE_INTERNAL_LIB_DIR=$(MY_URL) - + $(REGCOMP) -register -r $@ -c \ + $(REGCOMP) -register -r $@ -c \ $(MY_Q)vnd.sun.star.expand:$$URE_INTERNAL_LIB_DIR/implreg.uno$(DLLPOST)$(MY_Q) \ -env:URE_INTERNAL_LIB_DIR=$(MY_URL) - + $(REGCOMP) -register -r $@ -c \ + $(REGCOMP) -register -r $@ -c \ $(MY_Q)vnd.sun.star.expand:$$URE_INTERNAL_LIB_DIR/introspection.uno$(DLLPOST)$(MY_Q) \ -env:URE_INTERNAL_LIB_DIR=$(MY_URL) - + $(REGCOMP) -register -r $@ -c \ + $(REGCOMP) -register -r $@ -c \ $(MY_Q)vnd.sun.star.expand:$$URE_INTERNAL_LIB_DIR/invocadapt.uno$(DLLPOST)$(MY_Q) \ -env:URE_INTERNAL_LIB_DIR=$(MY_URL) - + $(REGCOMP) -register -r $@ -c \ + $(REGCOMP) -register -r $@ -c \ $(MY_Q)vnd.sun.star.expand:$$URE_INTERNAL_LIB_DIR/invocation.uno$(DLLPOST)$(MY_Q) \ -env:URE_INTERNAL_LIB_DIR=$(MY_URL) .IF "$(SOLAR_JAVA)"!="" - + $(REGCOMP) -register -r $@ -c \ + $(REGCOMP) -register -r $@ -c \ $(MY_Q)vnd.sun.star.expand:$$URE_INTERNAL_LIB_DIR/javaloader.uno$(DLLPOST)$(MY_Q) \ -env:URE_INTERNAL_LIB_DIR=$(MY_URL) - + $(REGCOMP) -register -r $@ -c \ + $(REGCOMP) -register -r $@ -c \ $(MY_Q)vnd.sun.star.expand:$$URE_INTERNAL_LIB_DIR/javavm.uno$(DLLPOST)$(MY_Q) \ -env:URE_INTERNAL_LIB_DIR=$(MY_URL) .ENDIF - + $(REGCOMP) -register -r $@ -c \ + $(REGCOMP) -register -r $@ -c \ $(MY_Q)vnd.sun.star.expand:$$URE_INTERNAL_LIB_DIR/namingservice.uno$(DLLPOST)$(MY_Q) \ -env:URE_INTERNAL_LIB_DIR=$(MY_URL) - + $(REGCOMP) -register -r $@ -c \ + $(REGCOMP) -register -r $@ -c \ $(MY_Q)vnd.sun.star.expand:$$URE_INTERNAL_LIB_DIR/nestedreg.uno$(DLLPOST)$(MY_Q) \ -env:URE_INTERNAL_LIB_DIR=$(MY_URL) - + $(REGCOMP) -register -r $@ -c \ + $(REGCOMP) -register -r $@ -c \ $(MY_Q)vnd.sun.star.expand:$$URE_INTERNAL_LIB_DIR/proxyfac.uno$(DLLPOST)$(MY_Q) \ -env:URE_INTERNAL_LIB_DIR=$(MY_URL) - + $(REGCOMP) -register -r $@ -c \ + $(REGCOMP) -register -r $@ -c \ $(MY_Q)vnd.sun.star.expand:$$URE_INTERNAL_LIB_DIR/reflection.uno$(DLLPOST)$(MY_Q) \ -env:URE_INTERNAL_LIB_DIR=$(MY_URL) - + $(REGCOMP) -register -r $@ -c \ + $(REGCOMP) -register -r $@ -c \ $(MY_Q)vnd.sun.star.expand:$$URE_INTERNAL_LIB_DIR/regtypeprov.uno$(DLLPOST)$(MY_Q) \ -env:URE_INTERNAL_LIB_DIR=$(MY_URL) - + $(REGCOMP) -register -r $@ -c \ + $(REGCOMP) -register -r $@ -c \ $(MY_Q)vnd.sun.star.expand:$$URE_INTERNAL_LIB_DIR/remotebridge.uno$(DLLPOST)$(MY_Q) \ -env:URE_INTERNAL_LIB_DIR=$(MY_URL) - + $(REGCOMP) -register -r $@ -c \ + $(REGCOMP) -register -r $@ -c \ $(MY_Q)vnd.sun.star.expand:$$URE_INTERNAL_LIB_DIR/security.uno$(DLLPOST)$(MY_Q) \ -env:URE_INTERNAL_LIB_DIR=$(MY_URL) - + $(REGCOMP) -register -r $@ -c \ + $(REGCOMP) -register -r $@ -c \ $(MY_Q)vnd.sun.star.expand:$$URE_INTERNAL_LIB_DIR/servicemgr.uno$(DLLPOST)$(MY_Q) \ -env:URE_INTERNAL_LIB_DIR=$(MY_URL) - + $(REGCOMP) -register -r $@ -c \ + $(REGCOMP) -register -r $@ -c \ $(MY_Q)vnd.sun.star.expand:$$URE_INTERNAL_LIB_DIR/shlibloader.uno$(DLLPOST)$(MY_Q) \ -env:URE_INTERNAL_LIB_DIR=$(MY_URL) - + $(REGCOMP) -register -r $@ -c \ + $(REGCOMP) -register -r $@ -c \ $(MY_Q)vnd.sun.star.expand:$$URE_INTERNAL_LIB_DIR/simplereg.uno$(DLLPOST)$(MY_Q) \ -env:URE_INTERNAL_LIB_DIR=$(MY_URL) - + $(REGCOMP) -register -r $@ -c \ + $(REGCOMP) -register -r $@ -c \ $(MY_Q)vnd.sun.star.expand:$$URE_INTERNAL_LIB_DIR/streams.uno$(DLLPOST)$(MY_Q) \ -env:URE_INTERNAL_LIB_DIR=$(MY_URL) - + $(REGCOMP) -register -r $@ -c \ + $(REGCOMP) -register -r $@ -c \ $(MY_Q)vnd.sun.star.expand:$$URE_INTERNAL_LIB_DIR/textinstream.uno$(DLLPOST)$(MY_Q) \ -env:URE_INTERNAL_LIB_DIR=$(MY_URL) - + $(REGCOMP) -register -r $@ -c \ + $(REGCOMP) -register -r $@ -c \ $(MY_Q)vnd.sun.star.expand:$$URE_INTERNAL_LIB_DIR/textoutstream.uno$(DLLPOST)$(MY_Q) \ -env:URE_INTERNAL_LIB_DIR=$(MY_URL) - + $(REGCOMP) -register -r $@ -c \ + $(REGCOMP) -register -r $@ -c \ $(MY_Q)vnd.sun.star.expand:$$URE_INTERNAL_LIB_DIR/typeconverter.uno$(DLLPOST)$(MY_Q) \ -env:URE_INTERNAL_LIB_DIR=$(MY_URL) - + $(REGCOMP) -register -r $@ -c \ + $(REGCOMP) -register -r $@ -c \ $(MY_Q)vnd.sun.star.expand:$$URE_INTERNAL_LIB_DIR/typemgr.uno$(DLLPOST)$(MY_Q) \ -env:URE_INTERNAL_LIB_DIR=$(MY_URL) - + $(REGCOMP) -register -r $@ -c \ + $(REGCOMP) -register -r $@ -c \ $(MY_Q)vnd.sun.star.expand:$$URE_INTERNAL_LIB_DIR/uriproc.uno$(DLLPOST)$(MY_Q) \ -env:URE_INTERNAL_LIB_DIR=$(MY_URL) - + $(REGCOMP) -register -r $@ -c \ + $(REGCOMP) -register -r $@ -c \ $(MY_Q)vnd.sun.star.expand:$$URE_INTERNAL_LIB_DIR/uuresolver.uno$(DLLPOST)$(MY_Q) \ -env:URE_INTERNAL_LIB_DIR=$(MY_URL) @@ -384,13 +384,13 @@ $(foreach,i,$(alllangiso) openoffice_$i{$(PKGFORMAT:^".")} openofficewithjre_$i{ .ENDIF # "$(LOCALPYFILES)"!="" $(BIN)$/%.py : $(SOLARSHAREDBIN)$/pyuno$/%.py - @+$(COPY) $< $@ + @$(COPY) $< $@ .IF "$(SYSTEM_PYTHON)" != "YES" $(BIN)$/cp1251.py : $(SOLARLIBDIR)$/python$/encodings$/cp1251.py - @+$(COPY) $< $@ + @$(COPY) $< $@ $(BIN)$/iso8859_1.py : $(SOLARLIBDIR)$/python$/encodings$/iso8859_1.py - @+$(COPY) $< $@ + @$(COPY) $< $@ .ELSE $(BIN)$/cp1251.py : @echo "Using system python - nothing more to do here" @@ -399,28 +399,28 @@ $(BIN)$/iso8859_1.py : .ENDIF $(BIN)$/intro.bmp : $(SOLARCOMMONPCKDIR)$/openoffice$/nologointro.bmp - +$(COPY) $< $@ + $(COPY) $< $@ hack_msitemplates .PHONY: - +-$(MKDIRHIER) $(MSIOFFICETEMPLATEDIR) - +-$(MKDIRHIER) $(MSILANGPACKTEMPLATEDIR) - +-$(MKDIRHIER) $(MSIURETEMPLATEDIR) - +-$(MKDIRHIER) $(MSISDKOOTEMPLATEDIR) - +-$(MKDIRHIER) $(MSIURETEMPLATEDIR) + -$(MKDIRHIER) $(MSIOFFICETEMPLATEDIR) + -$(MKDIRHIER) $(MSILANGPACKTEMPLATEDIR) + -$(MKDIRHIER) $(MSIURETEMPLATEDIR) + -$(MKDIRHIER) $(MSISDKOOTEMPLATEDIR) + -$(MKDIRHIER) $(MSIURETEMPLATEDIR) $(GNUCOPY) -ua $(MSIOFFICETEMPLATESOURCE) $(MSIOFFICETEMPLATEDIR:d:d) $(GNUCOPY) -ua $(MSILANGPACKTEMPLATESOURCE) $(MSILANGPACKTEMPLATEDIR:d:d) $(GNUCOPY) -ua $(MSIURETEMPLATESOURCE) $(MSIURETEMPLATEDIR:d:d) $(GNUCOPY) -ua $(MSISDKOOTEMPLATESOURCE) $(MSISDKOOTEMPLATEDIR:d:d) $(GNUCOPY) -ua $(MSIURETEMPLATESOURCE) $(MSIURETEMPLATEDIR:d:d) - +$(RM) $(MSIOFFICETEMPLATEDIR)$/Binary$/Image.bmp - +$(RM) $(MSILANGPACKTEMPLATEDIR)$/Binary$/Image.bmp - +$(RM) $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp - +$(RM) $(MSISDKOOTEMPLATEDIR)$/Binary$/Image.bmp - +$(RM) $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp - +$(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSIOFFICETEMPLATEDIR)$/Binary$/Image.bmp - +$(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSILANGPACKTEMPLATEDIR)$/Binary$/Image.bmp - +$(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp - +$(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSISDKOOTEMPLATEDIR)$/Binary$/Image.bmp - +$(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp + $(RM) $(MSIOFFICETEMPLATEDIR)$/Binary$/Image.bmp + $(RM) $(MSILANGPACKTEMPLATEDIR)$/Binary$/Image.bmp + $(RM) $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp + $(RM) $(MSISDKOOTEMPLATEDIR)$/Binary$/Image.bmp + $(RM) $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp + $(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSIOFFICETEMPLATEDIR)$/Binary$/Image.bmp + $(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSILANGPACKTEMPLATEDIR)$/Binary$/Image.bmp + $(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp + $(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSISDKOOTEMPLATEDIR)$/Binary$/Image.bmp + $(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp -- cgit v1.2.3