Author: af
Date: Wed Oct 30 08:30:26 2013
New Revision: 1537001
URL: http://svn.apache.org/r1537001
Log:
123532: Factored out MAKE_INSTALLER_COMMAND and GEN_UPDATE_INFO_COMMAND macros.
Modified:
openoffice/trunk/main/instsetoo_native/util/makefile.mk
Modified: openoffice/trunk/main/instsetoo_native/util/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/instsetoo_native/util/makefile.mk?rev=1537001&r1=1537000&r2=1537001&view=diff
==============================================================================
--- openoffice/trunk/main/instsetoo_native/util/makefile.mk (original)
+++ openoffice/trunk/main/instsetoo_native/util/makefile.mk Wed Oct 30 08:30:26
2013
@@ -198,34 +198,71 @@ $(MAKETARGETS) : $$@{$(PKGFORMAT:^".")}
$(MAKETARGETS){$(PKGFORMAT:^".")} : $(ADDDEPS)
.ENDIF # "$(MAKETARGETS:e)"=="" &&
"$(MAKETARGETS:s/_//)"!="$(MAKETARGETS)"
.ENDIF # "$(MAKETARGETS)"!=""
+
+
+# This macro makes calling the make_installer.pl script a bit easier.
+# Just add -p and -msitemplate switches.
+MAKE_INSTALLER_COMMAND= \
+ $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl \
+ -f $(PRJ)$/util$/openoffice.lst \
+ -l $(subst,$(@:s/_/ /:1)_, $(@:b)) \
+ -u $(OUT) \
+ -buildid $(BUILD) \
+ -msilanguage $(MISC)$/win_ulffiles \
+ -format $(@:e:s/.//) \
+ $(VERBOSESWITCH)
+
+# This macro makes calling gen_update_info.pl a bit easier
+# Just add --product switches, and xml input file and redirect output.
+GEN_UPDATE_INFO_COMMAND= \
+ $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl \
+ --buildid $(BUILD) \
+ --arch "$(RTL_ARCH)" \
+ --os "$(RTL_OS)" \
+ --lstfile $(PRJ)$/util$/openoffice.lst \
+ --languages $(subst,$(@:s/_/ /:1)_, $(@:b))
+
openoffice_%{$(PKGFORMAT:^".") .archive} :
- $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f
$(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p
Apache_OpenOffice -u $(OUT) -buildid $(BUILD) -msitemplate
$(MSIOFFICETEMPLATEDIR) -msilanguage $(MISC)$/win_ulffiles -format $(@:e:s/.//)
$(VERBOSESWITCH)
- $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD)
--arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst
--product Apache_OpenOffice --languages $(subst,$(@:s/_/ /:1)_, $(@:b))
$(PRJ)$/util$/update.xml > $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
+ $(MAKE_INSTALLER_COMMAND) \
+ -p Apache_OpenOffice \
+ -msitemplate $(MSIOFFICETEMPLATEDIR)
+ $(GEN_UPDATE_INFO_COMMAND) \
+ --product Apache_OpenOffice \
+ $(PRJ)$/util$/update.xml \
+ > $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
$(foreach,i,$(alllangiso) openofficewithjre_$i) : $$@{$(PKGFORMAT:^".")}
openofficewithjre_%{$(PKGFORMAT:^".")} :
- $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f
$(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p
Aapche_OpenOffice_wJRE -u $(OUT) -buildid $(BUILD) -msitemplate
$(MSIOFFICETEMPLATEDIR) -msilanguage $(MISC)$/win_ulffiles -format $(@:e:s/.//)
$(VERBOSESWITCH)
+ $(MAKE_INSTALLER_COMMAND) -p Apache_OpenOffice_wJRE -msitemplate
$(MSIOFFICETEMPLATEDIR)
$(foreach,i,$(alllangiso) openofficedev_$i) : $$@{$(PKGFORMAT:^".")}
openofficedev_%{$(PKGFORMAT:^".")} :
- $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f
$(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p
Apache_OpenOffice_Dev -u $(OUT) -buildid $(BUILD) -msitemplate
$(MSIOFFICETEMPLATEDIR) -msilanguage $(MISC)$/win_ulffiles -format $(@:e:s/.//)
$(VERBOSESWITCH)
- $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD)
--arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst
--product Apache_OpenOffice_Dev --languages $(subst,$(@:s/_/ /:1)_, $(@:b))
$(PRJ)$/util$/update.xml > $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
+ $(MAKE_INSTALLER_COMMAND) \
+ -p Apache_OpenOffice_Dev \
+ -msitemplate $(MSIOFFICETEMPLATEDIR)
+ $(GEN_UPDATE_INFO_COMMAND) \
+ --product Apache_OpenOffice_Dev \
+ $(PRJ)$/util$/update.xml \
+ > $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
$(foreach,i,$(alllangiso) ooolanguagepack_$i) : $$@{$(PKGFORMAT:^".")}
ooolanguagepack_%{$(PKGFORMAT:^".")} :
- $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f
$(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p
Apache_OpenOffice -u $(OUT) -buildid $(BUILD) -msitemplate
$(MSILANGPACKTEMPLATEDIR) -msilanguage $(MISC)$/win_ulffiles -languagepack
-format $(@:e:s/.//) $(VERBOSESWITCH)
+ $(MAKE_INSTALLER_COMMAND) \
+ -p Apache_OpenOffice \
+ -msitemplate $(MSILANGPACKTEMPLATEDIR) \
+ -languagepack
$(foreach,i,$(alllangiso) ooodevlanguagepack_$i) : $$@{$(PKGFORMAT:^".")}
ooodevlanguagepack_%{$(PKGFORMAT:^".")} :
- $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f
$(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p
Apache_OpenOffice_Dev -u $(OUT) -buildid $(BUILD) -msitemplate
$(MSILANGPACKTEMPLATEDIR) -msilanguage $(MISC)$/win_ulffiles -languagepack
-format $(@:e:s/.//) $(VERBOSESWITCH)
+ $(MAKE_INSTALLER_COMMAND) -p Apache_OpenOffice_Dev -msitemplate
$(MSILANGPACKTEMPLATEDIR) -languagepack
$(foreach,i,$(alllangiso) sdkoo_$i) : $$@{$(PKGFORMAT:^".")}
sdkoo_%{$(PKGFORMAT:^".")} :
- $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f
$(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p
Apache_OpenOffice_SDK -u $(OUT) -buildid $(BUILD) -msitemplate
$(MSISDKOOTEMPLATEDIR) -msilanguage $(MISC)$/win_ulffiles -dontstrip -format
$(@:e:s/.//) $(VERBOSESWITCH)
+ $(MAKE_INSTALLER_COMMAND) -p Apache_OpenOffice_SDK -msitemplate
$(MSISDKOOTEMPLATEDIR) -dontstrip
$(foreach,i,$(alllangiso) sdkoodev_$i) : $$@{$(PKGFORMAT:^".")}
sdkoodev_%{$(PKGFORMAT:^".")} :
- $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f
$(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p
Apache_OpenOffice_Dev_SDK -u $(OUT) -buildid $(BUILD) -msitemplate
$(MSISDKOOTEMPLATEDIR) -msilanguage $(MISC)$/win_ulffiles -dontstrip -format
$(@:e:s/.//) $(VERBOSESWITCH)
+ $(MAKE_INSTALLER_COMMAND) -p Apache_OpenOffice_Dev_SDK -msitemplate
$(MSISDKOOTEMPLATEDIR) -dontstrip
.IF "$(MAKETARGETS)"!=""
.IF "$(MAKETARGETS:e)"=="" && "$(MAKETARGETS:s/_//)"!="$(MAKETARGETS)"
