[Libreoffice-commits] .: 3 commits - instsetoo_native/util postprocess/rebase

[Jan Holesovsky]

 instsetoo_native/util/makefile.mk |   10 +++++++---
 postprocess/rebase/makefile.mk    |    4 ++--
 2 files changed, 9 insertions(+), 5 deletions(-)

New commits:
commit 82bd284867aed5c7256b787881b3167bb266d831
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Wed Aug 24 09:47:17 2011 +0200

    Do not attempt to create installation set when cross-compiling MinGW.

diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk
index 51125d1..a63e932 100644
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@ -79,9 +79,13 @@ 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 "$(GUI)"!="WNT" && "$(EPM)"=="NO"
+.IF ( "$(GUI)"!="WNT" && "$(EPM)"=="NO" ) || ( "$(CROSS_COMPILING)"=="YES" && "$(GUI)$(COM)"=="WNTGCC" )
 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"
+.ENDIF
 .ELSE			# "$(GUI)"!="WNT" && "$(EPM)"=="NO"
 .IF "$(ENABLE_RELEASE_BUILD)"=="TRUE"
 .IF "$(BUILD_TYPE)"=="$(BUILD_TYPE:s/ODK//)"
commit fb17a057211e33cf52843a33bdb8d81134238975
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Wed Aug 24 09:23:02 2011 +0200

    Fix uno.py delivery.

diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk
index 8132e8c..51125d1 100644
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@ -309,8 +309,8 @@ openoffice:
 $(foreach,i,$(alllangiso) openoffice_$i{$(PKGFORMAT:^".") .archive} openofficewithjre_$i{$(PKGFORMAT:^".")} openofficedev_$i{$(PKGFORMAT:^".")} sdkoo_$i{$(PKGFORMAT:^".")} oxygenoffice_$i{$(PKGFORMAT:^".") .archive} oxygenofficewithjre_$i{$(PKGFORMAT:^".")}) updatepack : $(LOCALPYFILES)
 .ENDIF			# "$(LOCALPYFILES)"!=""
 
-$(BIN)$/%.py : $(SOLARSHAREDBIN)$/pyuno$/%.py
-    @$(COPY) $< $@
+$(BIN)$/%.py : $(OUTDIR)$/bin$/pyuno$/%.py
+    $(COPY) $< $@
 .ENDIF			# "$(DISABLE_PYTHON)" != "TRUE"
 
 $(BIN)$/intro.zip : $(SOLARCOMMONPCKDIR)$/intro.zip
commit 528a6e30428b20371b1be8ffe04d7edfb3750087
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Wed Aug 24 09:22:39 2011 +0200

    Only rebase with MSVC.

diff --git a/postprocess/rebase/makefile.mk b/postprocess/rebase/makefile.mk
index 0ccfa6b..a6a2eb9 100644
--- a/postprocess/rebase/makefile.mk
+++ b/postprocess/rebase/makefile.mk
@@ -44,14 +44,14 @@ IMAGENAMES=$(SOLARBINDIR)$/*.dll $(SOLARBINDIR)$/so$/*.dll
 ALLTAR : REBASE
 
 REBASE .PHONY : $(BASEADDRESSES)
-.IF "$(GUI)$(CPU)"=="WNTI"
+.IF "$(GUI)$(COM)$(CPU)"=="WNTMSCI"
 .IF "$(product)"=="full"
     $(PERL) rebase.pl -C $(BASEADDRESSES) -b $(STARTADDRESS) -d -e 10000 -l $(LOGFILE) -m $(MISC) -v -R $(SOLARBINDIR) -N $(EXCLUDELIST) $(IMAGENAMES)
 .ELSE	# "$(product)"=="full"
     @echo Doing nothing on non product builds ...
 .ENDIF	# "$(product)"=="full"
 .ELSE	# "$(GUI)"=="WNTI"
-    @echo We do rebasing on 32-bit Windows only.
+    @echo We do rebasing on 32-bit Windows only built with MSVC.
 .ENDIF
 
 $(BASEADDRESSES) : coffbase.txt