mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do run make_installer.pl also for WNTGCC (making an "archive")

Browse Source
This commit is contained in:
Tor Lillqvist
2011-08-31 11:33:48 +03:00
parent c477ad1858
commit dd854e5027
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
instsetoo_native/util/makefile.mk
View File

@@ -42,6 +42,11 @@ PYTHONPATH:=$(PWD)$/$(BIN):$(SOLARLIBDIR):$(SOLARLIBDIR)$/python:$(SOLARLIBDIR)$
.ENDIF # "$(GUI)"=="WNT" .ENDIF # "$(GUI)"=="WNT"
.EXPORT: PYTHONPATH .EXPORT: PYTHONPATH
.IF "$(OS)$(COM)" == "WNTGCC"
# i.e. cross-compiling
FORCE2ARCHIVE=TRUE
.ENDIF
ENABLE_DOWNLOADSETS*=TRUE ENABLE_DOWNLOADSETS*=TRUE
.EXPORT: ENABLE_DOWNLOADSETS .EXPORT: ENABLE_DOWNLOADSETS
@@ -79,13 +84,9 @@ allhelplangiso:=$(foreach,i,$(alllangiso) $(foreach,j,$(help_exist) $(eq,$i,$j
xxxx: xxxx:
echo $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product LibreOffice --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml echo $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product LibreOffice --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml
.IF ( "$(GUI)"!="WNT" && "$(EPM)"=="NO" ) || ( "$(CROSS_COMPILING)"=="YES" && "$(GUI)$(COM)"=="WNTGCC" ) .IF "$(GUI)"!="WNT" && "$(EPM)"=="NO"
ALLTAR : $(LOCALPYFILES) ALLTAR : $(LOCALPYFILES)
.IF "$(GUI)$(COM)"=="WNTGCC"
@echo "MinGW cross-compilation: unable to create installation set yet"
.ELSE
@echo "No EPM: do no packaging at this stage" @echo "No EPM: do no packaging at this stage"
.ENDIF
.ELSE # "$(GUI)"!="WNT" && "$(EPM)"=="NO" .ELSE # "$(GUI)"!="WNT" && "$(EPM)"=="NO"
.IF "$(ENABLE_RELEASE_BUILD)"=="TRUE" .IF "$(ENABLE_RELEASE_BUILD)"=="TRUE"
.IF "$(BUILD_TYPE)"=="$(BUILD_TYPE:s/ODK//)" .IF "$(BUILD_TYPE)"=="$(BUILD_TYPE:s/ODK//)"