diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-03-01 14:58:43 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-03-01 14:58:43 +0000 |
| commit | 48370514607ad00c8d684689006d699976144300 (patch) | |
| tree | 84e7c6ccf7c1bc6e07138fe4432c7de91b9054ba /instsetoo_native | |
| parent | d8108d0659b984639f8f67538c6e2bc40bab0785 (diff) | |
INTEGRATION: CWS updatefeed3 (1.65.6); FILE MERGED
2007/03/01 08:26:21 rt 1.65.6.2: #i74775# Small syntax fix (specify path; for distributed packing in build server).
2007/02/27 12:01:10 obr 1.65.6.1: #i74775# generate update information file as needed for online update
Diffstat (limited to 'instsetoo_native')
| -rw-r--r-- | instsetoo_native/util/makefile.mk | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk index c25ef9876e02..0d9d5dbf0bcc 100644 --- a/instsetoo_native/util/makefile.mk +++ b/instsetoo_native/util/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.65 $ +# $Revision: 1.66 $ # -# last change: $Author: obo $ $Date: 2007-01-25 16:02:30 $ +# last change: $Author: vg $ $Date: 2007-03-01 15:58:43 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -39,6 +39,7 @@ TARGET=util GEN_HID2=TRUE .INCLUDE: settings.mk +.INCLUDE: $(SOLARINCDIR)$/rtlbootstrap.mk # PERL:=@echo @@ -199,6 +200,7 @@ 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$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product OpenOffice --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml > $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH).update.xml .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_* @@ -227,6 +229,7 @@ openofficedev_%{$(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$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product OpenOffice_Dev --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml > $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH).update.xml 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 |