diff options
| author | Kurt Zenker <kz@openoffice.org> | 2009-05-28 16:03:55 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2009-05-28 16:03:55 +0000 |
| commit | f94f92deabd2428ea260ccc021f99726e40f33b3 (patch) | |
| tree | f39212ad4e7e6ce49422671fe549b70be2f5692b | |
| parent | 21cb18ebebd079f49a0fadc47250f996669fcf99 (diff) | |
CWS-TOOLING: integrate CWS ause101
2009-05-11 14:39:16 +0200 hjs r271770 : #i101204# more selective copy
2009-05-07 19:16:08 +0200 hjs r271693 : #i101651# embed windows manifest
2009-05-07 18:43:17 +0200 hjs r271692 : #i101650# fix CHECKZIPRESULT for bash
2009-05-07 18:25:43 +0200 hjs r271690 : #i101649# workaround warnings in generated code
| -rw-r--r-- | instsetoo_native/util/makefile.mk | 21 | ||||
| -rw-r--r-- | solenv/inc/unitools.mk | 2 |
2 files changed, 13 insertions, 10 deletions
diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk index d7cee0a59..d819d6045 100644 --- a/instsetoo_native/util/makefile.mk +++ b/instsetoo_native/util/makefile.mk @@ -169,7 +169,6 @@ MSIOFFICETEMPLATEDIR=$(MSIOFFICETEMPLATESOURCE) MSILANGPACKTEMPLATEDIR=$(MSILANGPACKTEMPLATESOURCE) MSIURETEMPLATEDIR=$(MSIURETEMPLATESOURCE) MSISDKOOTEMPLATEDIR=$(MSISDKOOTEMPLATESOURCE) -#MSIURETEMPLATEDIR=$(MSIURETEMPLATESOURCE) .ELSE # "$(BUILD_SPECIAL)"!="" NOLOGOSPLASH:=$(BIN)$/intro.zip DEVNOLOGOSPLASH:=$(BIN)$/dev$/intro.zip @@ -381,21 +380,25 @@ hack_msitemplates .PHONY: -$(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) + -$(MKDIRHIER) $(MSIOFFICETEMPLATEDIR)$/Binary + -$(MKDIRHIER) $(MSILANGPACKTEMPLATEDIR)$/Binary + -$(MKDIRHIER) $(MSIURETEMPLATEDIR)$/Binary + -$(MKDIRHIER) $(MSISDKOOTEMPLATEDIR)$/Binary + $(GNUCOPY) -u $(MSIOFFICETEMPLATESOURCE)$/*.* $(MSIOFFICETEMPLATEDIR) + $(GNUCOPY) -u $(MSILANGPACKTEMPLATESOURCE)$/*.* $(MSILANGPACKTEMPLATEDIR) + $(GNUCOPY) -u $(MSIURETEMPLATESOURCE)$/*.* $(MSIURETEMPLATEDIR) + $(GNUCOPY) -u $(MSISDKOOTEMPLATESOURCE)$/*.* $(MSISDKOOTEMPLATEDIR) + $(GNUCOPY) -u $(MSIOFFICETEMPLATESOURCE)$/Binary$/*.* $(MSIOFFICETEMPLATEDIR)$/Binary + $(GNUCOPY) -u $(MSILANGPACKTEMPLATESOURCE)$/Binary$/*.* $(MSILANGPACKTEMPLATEDIR)$/Binary + $(GNUCOPY) -u $(MSIURETEMPLATESOURCE)$/Binary$/*.* $(MSIURETEMPLATEDIR)$/Binary + $(GNUCOPY) -u $(MSISDKOOTEMPLATESOURCE)$/Binary$/*.* $(MSISDKOOTEMPLATEDIR)$/Binary $(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 diff --git a/solenv/inc/unitools.mk b/solenv/inc/unitools.mk index 7b92cf2e3..f62357808 100644 --- a/solenv/inc/unitools.mk +++ b/solenv/inc/unitools.mk @@ -73,7 +73,7 @@ PIPEERROR=|& # iz31658 .IF "$(USE_SHELL)"=="bash" -CHECKZIPRESULT:=|| if test "$$?" != "12" && "$$?" != "1" ; then exit $$? ; fi && echo "Nothing to update for zip" +CHECKZIPRESULT:=|| ret=$$?; if [[ "$$ret" != "12" && "$$ret" != "1" ]] ; then exit $$ret ; fi && echo "Nothing to update for zip" .ELSE CHECKZIPRESULT:=|| if ("$$status" != "12" && "$$status" != "1") exit $$status && echo "Nothing to update for zip" .ENDIF |