You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by js...@apache.org on 2013/07/16 13:12:09 UTC
svn commit: r1503659 -
/openoffice/trunk/main/instsetoo_native/util/makefile.mk
Author: jsc
Date: Tue Jul 16 11:12:09 2013
New Revision: 1503659
URL: http://svn.apache.org/r1503659
Log:
merge fix from branch aoo400 to ensure correct installer image on windows
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=1503659&r1=1503658&r2=1503659&view=diff
==============================================================================
--- openoffice/trunk/main/instsetoo_native/util/makefile.mk (original)
+++ openoffice/trunk/main/instsetoo_native/util/makefile.mk Tue Jul 16 11:12:09 2013
@@ -143,20 +143,17 @@ sdkoodev: $(foreach,i,$(alllangiso) sdko
MSIOFFICETEMPLATESOURCE=$(PRJ)$/inc_openoffice$/windows$/msi_templates
MSILANGPACKTEMPLATESOURCE=$(PRJ)$/inc_ooolangpack$/windows$/msi_templates
-#MSIURETEMPLATESOURCE=$(PRJ)$/inc_ure$/windows$/msi_templates
MSISDKOOTEMPLATESOURCE=$(PRJ)$/inc_sdkoo$/windows$/msi_templates
.IF "$(BUILD_SPECIAL)"!=""
MSIOFFICETEMPLATEDIR=$(MSIOFFICETEMPLATESOURCE)
MSILANGPACKTEMPLATEDIR=$(MSILANGPACKTEMPLATESOURCE)
-#MSIURETEMPLATEDIR=$(MSIURETEMPLATESOURCE)
MSISDKOOTEMPLATEDIR=$(MSISDKOOTEMPLATESOURCE)
.ELSE # "$(BUILD_SPECIAL)"!=""
NOLOGOSPLASH:=$(BIN)$/intro.zip
DEVNOLOGOSPLASH:=$(BIN)$/dev$/intro.zip
MSIOFFICETEMPLATEDIR=$(MISC)$/openoffice$/msi_templates
MSILANGPACKTEMPLATEDIR=$(MISC)$/ooolangpack$/msi_templates
-#MSIURETEMPLATEDIR=$(MISC)$/ure$/msi_templates
MSISDKOOTEMPLATEDIR=$(MISC)$/sdkoo$/msi_templates
ADDDEPS=$(NOLOGOSPLASH) $(DEVNOLOGOSPLASH)
@@ -267,27 +264,15 @@ $(BIN)$/dev$/intro.zip : $(SOLARCOMMONPC
hack_msitemplates .PHONY:
-$(MKDIRHIER) $(MSIOFFICETEMPLATEDIR)
-$(MKDIRHIER) $(MSILANGPACKTEMPLATEDIR)
-# -$(MKDIRHIER) $(MSIURETEMPLATEDIR)
-$(MKDIRHIER) $(MSISDKOOTEMPLATEDIR)
-$(MKDIRHIER) $(MSIOFFICETEMPLATEDIR)$/Binary
-$(MKDIRHIER) $(MSILANGPACKTEMPLATEDIR)$/Binary
-# -$(MKDIRHIER) $(MSIURETEMPLATEDIR)$/Binary
-$(MKDIRHIER) $(MSISDKOOTEMPLATEDIR)$/Binary
$(GNUCOPY) $(MSIOFFICETEMPLATESOURCE)$/*.* $(MSIOFFICETEMPLATEDIR)
$(GNUCOPY) $(MSILANGPACKTEMPLATESOURCE)$/*.* $(MSILANGPACKTEMPLATEDIR)
-# $(GNUCOPY) $(MSIURETEMPLATESOURCE)$/*.* $(MSIURETEMPLATEDIR)
$(GNUCOPY) $(MSISDKOOTEMPLATESOURCE)$/*.* $(MSISDKOOTEMPLATEDIR)
$(GNUCOPY) $(MSIOFFICETEMPLATESOURCE)$/Binary$/*.* $(MSIOFFICETEMPLATEDIR)$/Binary
$(GNUCOPY) $(MSILANGPACKTEMPLATESOURCE)$/Binary$/*.* $(MSILANGPACKTEMPLATEDIR)$/Binary
-# $(GNUCOPY) $(MSIURETEMPLATESOURCE)$/Binary$/*.* $(MSIURETEMPLATEDIR)$/Binary
$(GNUCOPY) $(MSISDKOOTEMPLATESOURCE)$/Binary$/*.* $(MSISDKOOTEMPLATEDIR)$/Binary
- $(RM) $(MSIOFFICETEMPLATEDIR)$/Binary$/Image.bmp
- $(RM) $(MSILANGPACKTEMPLATEDIR)$/Binary$/Image.bmp
-# $(RM) $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp
- $(RM) $(MSISDKOOTEMPLATEDIR)$/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