[Libreoffice-commits] .: solenv/inc
solenv/inc/_tg_shl.mk | 40 solenv/inc/tg_shl.mk |4 2 files changed, 44 deletions(-) New commits: commit e116e22aade07f4931e40bad0fcbdb67c5a93ed5 Author: Tor Lillqvist Date: Thu Jan 17 13:45:43 2013 +0200 Fix fallout from checkdll.sh removal The dmake build mechanism used to rename FOO.so files to check_FOO.so before handling them to checkdll.sh, which then renamed them back once the "check" was complete. The initial rename had accidentally been left in place even if the use of checkdll.sh has been removed. Change-Id: I60a2e110e27a15be906b770e86603d798cd055d1 diff --git a/solenv/inc/_tg_shl.mk b/solenv/inc/_tg_shl.mk index d11330f..2060f2e 100644 --- a/solenv/inc/_tg_shl.mk +++ b/solenv/inc/_tg_shl.mk @@ -438,10 +438,6 @@ $(SHL1TARGETN) : \ @cat $(MISC)/$(TARGET).$(@:b)_1.cmd .ENDIF @+source $(MISC)/$(TARGET).$(@:b)_1.cmd -.IF "$(SHL1NOCHECK)"=="" -$(COMMAND_ECHO)-$(RM) $(SHL1TARGETN:d)check_$(SHL1TARGETN:f) -$(COMMAND_ECHO)$(RENAME) $(SHL1TARGETN) $(SHL1TARGETN:d)check_$(SHL1TARGETN:f) -.ENDIF # "$(SHL1NOCHECK)"!="" .ENDIF # "$(OS)"=="MACOSX" .IF "$(UNIXVERSIONNAMES)"!="" && "$(OS)"!="IOS" && "$(OS)"!="ANDROID" $(COMMAND_ECHO)$(RM) $(LB)/$(SHL1TARGETN:b) @@ -894,10 +890,6 @@ $(SHL2TARGETN) : \ @cat $(MISC)/$(TARGET).$(@:b)_2.cmd .ENDIF @+source $(MISC)/$(TARGET).$(@:b)_2.cmd -.IF "$(SHL2NOCHECK)"=="" -$(COMMAND_ECHO)-$(RM) $(SHL2TARGETN:d)check_$(SHL2TARGETN:f) -$(COMMAND_ECHO)$(RENAME) $(SHL2TARGETN) $(SHL2TARGETN:d)check_$(SHL2TARGETN:f) -.ENDIF # "$(SHL2NOCHECK)"!="" .ENDIF # "$(OS)"=="MACOSX" .IF "$(UNIXVERSIONNAMES)"!="" && "$(OS)"!="IOS" && "$(OS)"!="ANDROID" $(COMMAND_ECHO)$(RM) $(LB)/$(SHL2TARGETN:b) @@ -1350,10 +1342,6 @@ $(SHL3TARGETN) : \ @cat $(MISC)/$(TARGET).$(@:b)_3.cmd .ENDIF @+source $(MISC)/$(TARGET).$(@:b)_3.cmd -.IF "$(SHL3NOCHECK)"=="" -$(COMMAND_ECHO)-$(RM) $(SHL3TARGETN:d)check_$(SHL3TARGETN:f) -$(COMMAND_ECHO)$(RENAME) $(SHL3TARGETN) $(SHL3TARGETN:d)check_$(SHL3TARGETN:f) -.ENDIF # "$(SHL3NOCHECK)"!="" .ENDIF # "$(OS)"=="MACOSX" .IF "$(UNIXVERSIONNAMES)"!="" && "$(OS)"!="IOS" && "$(OS)"!="ANDROID" $(COMMAND_ECHO)$(RM) $(LB)/$(SHL3TARGETN:b) @@ -1806,10 +1794,6 @@ $(SHL4TARGETN) : \ @cat $(MISC)/$(TARGET).$(@:b)_4.cmd .ENDIF @+source $(MISC)/$(TARGET).$(@:b)_4.cmd -.IF "$(SHL4NOCHECK)"=="" -$(COMMAND_ECHO)-$(RM) $(SHL4TARGETN:d)check_$(SHL4TARGETN:f) -$(COMMAND_ECHO)$(RENAME) $(SHL4TARGETN) $(SHL4TARGETN:d)check_$(SHL4TARGETN:f) -.ENDIF # "$(SHL4NOCHECK)"!="" .ENDIF # "$(OS)"=="MACOSX" .IF "$(UNIXVERSIONNAMES)"!="" && "$(OS)"!="IOS" && "$(OS)"!="ANDROID" $(COMMAND_ECHO)$(RM) $(LB)/$(SHL4TARGETN:b) @@ -2262,10 +2246,6 @@ $(SHL5TARGETN) : \ @cat $(MISC)/$(TARGET).$(@:b)_5.cmd .ENDIF @+source $(MISC)/$(TARGET).$(@:b)_5.cmd -.IF "$(SHL5NOCHECK)"=="" -$(COMMAND_ECHO)-$(RM) $(SHL5TARGETN:d)check_$(SHL5TARGETN:f) -$(COMMAND_ECHO)$(RENAME) $(SHL5TARGETN) $(SHL5TARGETN:d)check_$(SHL5TARGETN:f) -.ENDIF # "$(SHL5NOCHECK)"!="" .ENDIF # "$(OS)"=="MACOSX" .IF "$(UNIXVERSIONNAMES)"!="" && "$(OS)"!="IOS" && "$(OS)"!="ANDROID" $(COMMAND_ECHO)$(RM) $(LB)/$(SHL5TARGETN:b) @@ -2718,10 +2698,6 @@ $(SHL6TARGETN) : \ @cat $(MISC)/$(TARGET).$(@:b)_6.cmd .ENDIF @+source $(MISC)/$(TARGET).$(@:b)_6.cmd -.IF "$(SHL6NOCHECK)"=="" -$(COMMAND_ECHO)-$(RM) $(SHL6TARGETN:d)check_$(SHL6TARGETN:f) -$(COMMAND_ECHO)$(RENAME) $(SHL6TARGETN) $(SHL6TARGETN:d)check_$(SHL6TARGETN:f) -.ENDIF # "$(SHL6NOCHECK)"!="" .ENDIF # "$(OS)"=="MACOSX" .IF "$(UNIXVERSIONNAMES)"!="" && "$(OS)"!="IOS" && "$(OS)"!="ANDROID" $(COMMAND_ECHO)$(RM) $(LB)/$(SHL6TARGETN:b) @@ -3174,10 +3150,6 @@ $(SHL7TARGETN) : \ @cat $(MISC)/$(TARGET).$(@:b)_7.cmd .ENDIF @+source $(MISC)/$(TARGET).$(@:b)_7.cmd -.IF "$(SHL7NOCHECK)"=="" -$(COMMAND_ECHO)-$(RM) $(SHL7TARGETN:d)check_$(SHL7TARGETN:f) -$(COMMAND_ECHO)$(RENAME) $(SHL7TARGETN) $(SHL7TARGETN:d)check_$(SHL7TARGETN:f) -.ENDIF # "$(SHL7NOCHECK)"!="" .ENDIF # "$(OS)"=="MACOSX" .IF "$(UNIXVERSIONNAMES)"!="" && "$(OS)"!="IOS" && "$(OS)"!="ANDROID" $(COMMAND_ECHO)$(RM) $(LB)/$(SHL7TARGETN:b) @@ -3630,10 +3602,6 @@ $(SHL8TARGETN) : \ @cat $(MISC)/$(TARGET).$(@:b)_8.cmd .ENDIF @+source $(MISC)/$(TARGET).$(@:b)_8.cmd -.IF "$(SHL8NOCHECK)"=="" -$(COMMAND_ECHO)-$(RM) $(SHL8TARGETN:d)check_$(SHL8TARGETN:f) -$(COMMAND_ECHO)$(RENAME) $(SHL8TARGETN) $(SHL8TARGETN:d)check_$(SHL8TARGETN:f) -.ENDIF # "$(SHL8NOCHECK)"!="" .ENDIF # "$(OS)"=="MACOSX" .IF "$(UNIXVERSIONNAMES)"!="" && "$(OS)"!="I
[Libreoffice-commits] .: solenv/inc
solenv/inc/installationtest.mk |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit 0d957d1c10eeb6e0d15cc2fbc56239c1ec40fb6c Author: Petr Mladek Date: Mon Jan 7 18:51:08 2013 +0100 fix install test to work with "LibreOffice" installer name Change-Id: I0f2850d2e52f47e7e66e51596692f3ed27d19adb diff --git a/solenv/inc/installationtest.mk b/solenv/inc/installationtest.mk index fcfb520..c9ed719 100644 --- a/solenv/inc/installationtest.mk +++ b/solenv/inc/installationtest.mk @@ -97,10 +97,10 @@ my_javaenv = \ .IF "$(OS)" == "WNT" && "$(OOO_TEST_SOFFICE)" == "" && "$(CROSS_COMPILING)" != "YES" OOO_EXTRACT_TO:=$(shell cygpath -m `mktemp -dt ooosmoke.XX`) $(MISC)/$(TARGET)/installation.flag : $(shell \ -ls $(installationtest_instset)/LibO_*_install-arc_$(defaultlangiso).zip) +ls $(installationtest_instset)/LibreOffice_*_install-arc_$(defaultlangiso).zip) $(COMMAND_ECHO)$(MKDIRHIER) $(@:d) -$(COMMAND_ECHO)unzip -q $(installationtest_instset)/LibO_*_install-arc_$(defaultlangiso).zip -d "$(OOO_EXTRACT_TO)" -$(COMMAND_ECHO)mv "$(OOO_EXTRACT_TO)"/LibO_*_install-arc_$(defaultlangiso) "$(OOO_EXTRACT_TO)"/opt +$(COMMAND_ECHO)unzip -q $(installationtest_instset)/LibreOffice_*_install-arc_$(defaultlangiso).zip -d "$(OOO_EXTRACT_TO)" +$(COMMAND_ECHO)mv "$(OOO_EXTRACT_TO)"/LibreOffice_*_install-arc_$(defaultlangiso) "$(OOO_EXTRACT_TO)"/opt $(COMMAND_ECHO)echo "$(OOO_EXTRACT_TO)" > $@ .END ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/inc
solenv/inc/minor.mk |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit 62b9b25da8b182d0bdba99f70d6123dc2666e382 Author: Caolán McNamara Date: Tue Dec 4 16:25:14 2012 + bump minor.mk to 410 otherwise build dies with solenv/inc/settings.mk: line 50 Error: -- Expecting macro or rule defn, found neither with a SOURCEVERSION of OOO400 in minor.mk and a WORK_STAMP of OOO410 in config_host.mk Change-Id: I79cd39285c43e21c791dc5c8565ad58003553ad9 diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk index af25dbc..36f5986 100644 --- a/solenv/inc/minor.mk +++ b/solenv/inc/minor.mk @@ -1,8 +1,8 @@ -RSCVERSION=400 -RSCREVISION=400m1(Build:0) +RSCVERSION=410 +RSCREVISION=410m1(Build:0) BUILD=0 LAST_MINOR=m0 -SOURCEVERSION=OOO400 +SOURCEVERSION=OOO410 VERSIONMAJOR=4 VERSIONMINOR=1 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/inc
solenv/inc/wntmsc.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 814f2072943dfe8befead0bba2f2168c1061ff4e Author: Tor Lillqvist Date: Mon Dec 3 00:32:15 2012 +0200 Add -wd4986 here, too diff --git a/solenv/inc/wntmsc.mk b/solenv/inc/wntmsc.mk index f87822d..9f2941d 100644 --- a/solenv/inc/wntmsc.mk +++ b/solenv/inc/wntmsc.mk @@ -187,7 +187,7 @@ CFLAGSWARNCXX=-Wall -wd4061 -wd4127 -wd4191 -wd4217 -wd4242 -wd4244 -wd4245 -wd4 -wd4290 -wd4294 -wd4355 -wd4511 -wd4512 -wd4514 -wd4555 -wd4611 -wd4625 -wd4626 \ -wd4640 -wd4675 -wd4686 -wd4706 -wd4710 -wd4711 -wd4786 -wd4800 -wd4820 -wd4503 -wd4619 \ -wd4365 -wd4668 -wd4738 -wd4826 -wd4350 -wd4505 -wd4692 -wd4189 -wd4005 \ --wd4180 -wd4265 +-wd4180 -wd4265 -wd4986 CFLAGSWARNCC=$(CFLAGSWARNCXX) -wd4255 CFLAGSWALLCC=$(CFLAGSWARNCC) CFLAGSWALLCXX=$(CFLAGSWARNCXX) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/inc
solenv/inc/premac.h |6 ++ 1 file changed, 6 insertions(+) New commits: commit 6a8694d91e051412108601806cc5325b0641b5f2 Author: Tor Lillqvist Date: Thu Sep 20 08:51:33 2012 +0300 Add typedefs not in the 10.4 SDK Change-Id: I67f6c5392feda674b3d7d53b5dd20ec86e4f9023 diff --git a/solenv/inc/premac.h b/solenv/inc/premac.h index b5fff62..5dc085c 100644 --- a/solenv/inc/premac.h +++ b/solenv/inc/premac.h @@ -56,4 +56,10 @@ typedef int NSColorRenderingIntent; #endif #endif +#if MACOSX_SDK_VERSION < 1050 +typedef float CGFloat; +typedef int NSInteger; +typedef unsigned NSUInteger; +#endif + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/inc
solenv/inc/libs.mk |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 090901874f58997f23dda1cdfac5462788073dfb Author: David Tardon Date: Mon Sep 10 13:27:42 2012 +0200 we don't need exslt for dmake Change-Id: Id8cec9932c9c3bd76f0b1e50038582ae64a6f879 diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk index b9e2a5d..3f386ef 100644 --- a/solenv/inc/libs.mk +++ b/solenv/inc/libs.mk @@ -252,9 +252,9 @@ CPPUNITLIB = $(CPPUNIT_LIBS) CPPUNITLIB = -lcppunit .ENDIF .IF "$(SYSTEM_LIBXSLT)"=="YES" -XSLTLIB=$(LIBEXSLT_LIBS) +XSLTLIB=$(LIBXSLT_LIBS) .ELSE -XSLTLIB=-lexslt -lxslt $(LIBXML2LIB) +XSLTLIB=-lxslt $(LIBXML2LIB) .ENDIF JVMFWKLIB = -ljvmfwk .IF "$(SYSTEM_REDLAND)"=="YES" ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/inc
solenv/inc/wntmsc.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 158a7c73bb0a701b12fc3e2e96eff965c73435cc Author: Michael Stahl Date: Fri Jul 13 16:10:02 2012 +0200 wntmsc.mk: disable warnings-as-errors for binfilter Change-Id: If5ac0aa620d514ca4affe2b20d647a9e9129032e diff --git a/solenv/inc/wntmsc.mk b/solenv/inc/wntmsc.mk index afafe38..ec84e98 100644 --- a/solenv/inc/wntmsc.mk +++ b/solenv/inc/wntmsc.mk @@ -195,7 +195,7 @@ CFLAGSWERRCC=-WX -DLIBO_WERROR # Once all modules on this platform compile without warnings, set # COMPILER_WARN_ERRORS=TRUE here instead of setting MODULES_WITH_WARNINGS (see # settings.mk): -MODULES_WITH_WARNINGS := +MODULES_WITH_WARNINGS := binfilter CDEFS+=-DWIN32 -D_MT -DWINVER=0x0500 -D_WIN32_WINNT=0x0500 -D_WIN32_IE=0x0500 .IF "$(COMEX)" == "11" ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/inc solenv/Module_solenv.mk solenv/Package_minor.mk
solenv/Module_solenv.mk |1 + solenv/Package_minor.mk | 33 + solenv/inc/settings.mk |6 -- 3 files changed, 34 insertions(+), 6 deletions(-) New commits: commit 41cf973f84f42c0605fdd9e8c5f307be888c2f89 Author: David Tardon Date: Tue May 29 15:06:11 2012 +0200 $(OUTDIR)/inc/*minor.mk is created my gbuild now Actually I think it should be removed entirely, because dmake already includes minor.mk directly from solenv, but I do not want to pry into it right now... Change-Id: I51520642f4796d722cb2131e91e9e92a82920531 diff --git a/solenv/Module_solenv.mk b/solenv/Module_solenv.mk index 3fa34ff..d107f9a 100644 --- a/solenv/Module_solenv.mk +++ b/solenv/Module_solenv.mk @@ -30,6 +30,7 @@ $(eval $(call gb_Module_Module,solenv)) $(eval $(call gb_Module_add_targets,solenv,\ CustomTarget_versionlist \ Package_inc \ + Package_minor \ )) ifeq ($(GUI),UNX) diff --git a/solenv/Package_minor.mk b/solenv/Package_minor.mk new file mode 100644 index 000..7ea056a --- /dev/null +++ b/solenv/Package_minor.mk @@ -0,0 +1,33 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# Major Contributor(s): +# Copyright (C) 2012 Red Hat, Inc., David Tardon +# (initial developer) +# +# All Rights Reserved. +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +$(eval $(call gb_Package_Package,solenv_minor_mk,$(SRCDIR)/solenv/inc)) + +$(eval $(call gb_Package_add_file,solenv_minor_mk,inc/$(UPD)minor.mk,minor.mk)) +$(eval $(call gb_Package_add_file,solenv_minor_mk,inc/minormkchanged.flg,minor.mk)) + +# vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk index 1eeba4f..9d01c5e 100644 --- a/solenv/inc/settings.mk +++ b/solenv/inc/settings.mk @@ -50,12 +50,6 @@ EXTNAME*=$(EXTENSIONNAME)_in WRONG_SOURCEVERSION .ENDIF -# Create $(SOLARVERSION)/$(INPATH)/inc/$(UPD)minor.mk if needed -%minor.mk : $(SOLARENV)/inc/minor.mk -@@-$(MKDIRHIER) $(SOLARVERSION)/$(INPATH)/inc -@@$(COPY) $(SOLARENV)/inc/minor.mk $(SOLARVERSION)/$(INPATH)/inc/$(UPD)minor.mk -@@$(TOUCH) $(SOLARVERSION)/$(INPATH)/inc/minormkchanged.flg - # Force creation of $(SOLARVERSION)/$(INPATH)/inc/ # $(UPD)minor.mk could be empty as it's contents were already included from minor.mk .INCLUDE : $(SOLARVERSION)/$(INPATH)/inc/$(UPD)minor.mk ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/inc
solenv/inc/pstrules.mk |8 solenv/inc/rules.mk| 24 2 files changed, 16 insertions(+), 16 deletions(-) New commits: commit 88aa7ed0ee68055d7ea326a7820dbb072641ff5f Author: Michael Stahl Date: Wed May 23 21:03:14 2012 +0200 solenv: adjustvisibility is only for SunStudio diff --git a/solenv/inc/pstrules.mk b/solenv/inc/pstrules.mk index 80f7e99..4b285b1 100644 --- a/solenv/inc/pstrules.mk +++ b/solenv/inc/pstrules.mk @@ -37,7 +37,7 @@ $(OBJ)/$(SECOND_BUILD)_%.obj : %.cxx .IF "$(GUI)"=="UNX" @$(RM) $@ $(@:s/.obj/.o/) $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$(SECOND_BUILD)_$*.o $(CFLAGSINCXX)$(PWD)/$*.cxx -.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" +.IF "$(OS)$(COM)"=="SOLARISC52" && "$(product)"=="full" && "$(debug)"=="" $(COMMAND_ECHO)$(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/) .ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" @$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI) @@ -54,7 +54,7 @@ $(OBJ)/$(SECOND_BUILD)_%.obj : %.c .ELSE @$(RM) $@ $(@:s/.obj/.o/) $(COMMAND_ECHO)$(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$(SECOND_BUILD)_$*.o $*.c -.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" +.IF "$(OS)$(COM)"=="SOLARISC52" && "$(product)"=="full" && "$(debug)"=="" $(COMMAND_ECHO)$(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/) .ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" @$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI) @@ -79,7 +79,7 @@ $(SLO)/$(SECOND_BUILD)_%.obj : %.cxx .IF "$(GUI)"=="UNX" @$(RM) $@ $(@:s/.obj/.o/) $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$(SECOND_BUILD)_$*.o $(CFLAGSINCXX)$(PWD)/$*.cxx -.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" +.IF "$(OS)$(COM)"=="SOLARISC52" && "$(product)"=="full" && "$(debug)"=="" $(COMMAND_ECHO)$(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/) .ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" @$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI) @@ -97,7 +97,7 @@ $(SLO)/$(SECOND_BUILD)_%.obj : %.c .IF "$(GUI)"=="UNX" @$(RM) $@ $(@:s/.obj/.o/) $(COMMAND_ECHO)$(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$(SECOND_BUILD)_$*.o $*.c -.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" +.IF "$(OS)$(COM)"=="SOLARISC52" && "$(product)"=="full" && "$(debug)"=="" $(COMMAND_ECHO)$(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/) .ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" @$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI) diff --git a/solenv/inc/rules.mk b/solenv/inc/rules.mk index 68ae855..93e3b02 100644 --- a/solenv/inc/rules.mk +++ b/solenv/inc/rules.mk @@ -32,7 +32,7 @@ $(OBJ)/%.obj : %.cxx .IF "$(GUI)"=="UNX" @$(RM) $@ $(@:s/.obj/.o/) $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(CFLAGSINCXX)$(PWD)/$*.cxx -.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" +.IF "$(OS)$(COM)"=="SOLARISC52" && "$(product)"=="full" && "$(debug)"=="" .IF "$(noadjust)"=="" $(COMMAND_ECHO)$(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/) .ENDIF # "$(noadjust)"=="" @@ -56,7 +56,7 @@ $(OBJ)/%.obj : %.cpp .IF "$(GUI)"=="UNX" @$(RM) $@ $(@:s/.obj/.o/) $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(CFLAGSINCXX)$(PWD)/$*.cpp -.IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" +.IF "$(OS)$(COM)"=="SOLARISC52" && "$(product)"=="full" && "$(debug)"=="" $(COMMAND_ECHO)$(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/) .ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" @$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI) @@ -78,7 +78,7 @@ $(OBJ)/%.obj : %.cc .IF "$(GUI)"=="UNX" @$(RM) $@ $(@:s/.obj/.o/) $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(
[Libreoffice-commits] .: solenv/inc
solenv/inc/tg_ext.mk | 10 ++ 1 file changed, 10 insertions(+) New commits: commit 904763b1134bdd84a4e64de1e037da5cac192f27 Author: Tomas Chvatal Date: Mon May 14 18:11:11 2012 +0200 Support unpacking xz files. Change-Id: If0b7234ede1d9f8c59e5df692b45539a508d8921 diff --git a/solenv/inc/tg_ext.mk b/solenv/inc/tg_ext.mk index 9a25d7a..453a17b 100644 --- a/solenv/inc/tg_ext.mk +++ b/solenv/inc/tg_ext.mk @@ -113,6 +113,16 @@ $(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.tar.bz2 @$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH) @$(RENAME) $@.$(INPATH) $@ +$(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.tar.xz +@-$(RM) $@ +.IF "$(GUI)"=="UNX" +@noop $(assign UNPACKCMD := sh -c "xz -cd $(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).tar.xz $(TARFILE_FILTER) | $(GNUTAR) --no-same-owner -x$(tar_verbose_switch)f - ") +.ELSE # "$(GUI)"=="UNX" +@noop $(assign UNPACKCMD := xz -cd $(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).tar.xz $(TARFILE_FILTER) | $(GNUTAR) --no-same-owner -x$(tar_verbose_switch)f - ) +.ENDIF # "$(GUI)"=="UNX" +@$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH) +@$(RENAME) $@.$(INPATH) $@ + $(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.tar.Z @-$(RM) $@ .IF "$(GUI)"=="UNX" ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
