[Libreoffice-commits] .: instsetoo_native/util Makefile.top

[Stephan Bergmann]

 Makefile.top                      |    8 ++++----
 instsetoo_native/util/makefile.mk |    9 ++++-----
 2 files changed, 8 insertions(+), 9 deletions(-)

New commits:
commit 19990a9c5c5761687f757456015cb26d46d4830b
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Aug 16 14:44:37 2012 +0200

    Fix Windows dev-install for --enable-release-build, --with-lang=... etc.
    
    Introduced special token LIBO_DEV_INSTALL=TRUE to communicate what install set
    to build from Makefile.top's dev-install target to
    instsetoo_native/util/makefile.mk.  Somewhat arbitrarily, always use a "release"
    install set regardless of --enable-release-build (the dev-install set is used
    for "make check," and it is safer to test "release" install sets in
    --disable-release-build builds than the other way around, should those builds
    ever start to deviate significantly).
    
    The "always build a defaul-laguage openoffice product" logic had been obsoleted
    a long time ago already.
    
    Change-Id: I64ec87a0b8dc6fe81cab5531c43e29db3f5128af

diff --git a/Makefile.top b/Makefile.top
index d9ddea4..b23b5be 100644
--- a/Makefile.top
+++ b/Makefile.top
@@ -436,8 +436,8 @@ dev-install: build
 	@rm -rf $(DEVINSTALLDIR)
 	@mkdir $(DEVINSTALLDIR)
 ifeq ($(OS_FOR_BUILD),WNT)
-	cd instsetoo_native && unset MAKEFLAGS && $(SOLARENV)/bin/build.pl PKGFORMAT=archive
-	unzip -q -d "$(DEVINSTALLDIR)" "$(SRCDIR)/instsetoo_native/$(INPATH)/LibreOffice_Dev/archive/install/en-US/LibO*_install-arc_en-US.zip"
+	cd instsetoo_native && unset MAKEFLAGS && $(SOLARENV)/bin/build.pl LIBO_DEV_INSTALL=TRUE
+	unzip -q -d "$(DEVINSTALLDIR)" "$(SRCDIR)/instsetoo_native/$(INPATH)/LibreOffice/archive/install/en-US/LibO*_install-arc_en-US.zip"
 	mv "$(DEVINSTALLDIR)"/LibO*_install-arc_en-US/* "$(DEVINSTALLDIR)"/opt
 else
 ifeq ($(DISABLE_LINKOO),TRUE)
@@ -453,8 +453,8 @@ install-tb:
 	@rm -rf $(DEVINSTALLDIR)
 	@mkdir $(DEVINSTALLDIR)
 ifeq ($(OS_FOR_BUILD),WNT)
-	cd instsetoo_native && unset MAKEFLAGS && $(SOLARENV)/bin/build.pl PKGFORMAT=archive
-	unzip -q -d "$(DEVINSTALLDIR)" "$(SRCDIR)/instsetoo_native/$(INPATH)/LibreOffice_Dev/archive/install/en-US/LibO*_install-arc_en-US.zip"
+	cd instsetoo_native && unset MAKEFLAGS && $(SOLARENV)/bin/build.pl LIBO_DEV_INSTALL=TRUE
+	unzip -q -d "$(DEVINSTALLDIR)" "$(SRCDIR)/instsetoo_native/$(INPATH)/LibreOffice/archive/install/en-US/LibO*_install-arc_en-US.zip"
 	mv "$(DEVINSTALLDIR)"/LibO*_install-arc_en-US/* "$(DEVINSTALLDIR)"/opt
 else
 	@ooinstall $(DEVINSTALLDIR)/opt
diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk
index a4dc1f9..8b3171c 100644
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@ -88,6 +88,9 @@ allhelplangiso:=$(foreach,i,$(alllangiso) $(foreach,j,$(help_exist) $(eq,$i,$j
 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
 
+.IF "$(LIBO_DEV_INSTALL)" == "TRUE"
+ALLTAR: openoffice_$(defaultlangiso).archive
+.ELSE
 .IF "$(GUI)"!="WNT" && "$(EPM)"=="NO"
 ALLTAR  : $(LOCALPYFILES)
     @echo "No EPM: do no packaging at this stage"
@@ -122,16 +125,12 @@ ALLTAR : openofficedev_$(defaultlangiso) ooodevlanguagepack $(eq,$(OS),MACOSX $(
 .ENDIF
 .ENDIF # "$(ENABLE_RELEASE_BUILD)"=="TRUE"
 .ENDIF			# "$(GUI)"!="WNT" && "$(EPM)"=="NO"
+.ENDIF # "$(LIBO_DEV_INSTALL)" == "TRUE"
 
 .IF "$(MAKETARGETS:e)"!=""
 PKGFORMAT+=$(MAKETARGETS:e:s/.//)
 .ENDIF			# "$(MAKETARGETS:e)"!=""
 
-# Independent of PKGFORMAT, always build a default-language openoffice product
-# also in archive format, so that tests that require an OOo installation (like
-# smoketestoo_native) have one available:
-openoffice_$(defaultlangiso) : $$@.archive
-
 .IF "$(VERBOSE)"=="TRUE"
 VERBOSESWITCH=-verbose
 .ENDIF