You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by or...@apache.org on 2013/06/12 17:03:55 UTC
svn commit: r1492233 - in /openoffice/trunk/main: extensions/source/ole/
sal/systools/win32/kill/
setup_native/source/win32/customactions/indexingfilter/
setup_native/source/win32/customactions/javafilter/
setup_native/source/win32/customactions/langua...
Author: orw
Date: Wed Jun 12 15:03:54 2013
New Revision: 1492233
URL: http://svn.apache.org/r1492233
Log:
122500,122378: fix build breaker in non-pro builds with and without stlport
Modified:
openoffice/trunk/main/extensions/source/ole/makefile.mk
openoffice/trunk/main/sal/systools/win32/kill/makefile.mk
openoffice/trunk/main/setup_native/source/win32/customactions/indexingfilter/makefile.mk
openoffice/trunk/main/setup_native/source/win32/customactions/javafilter/makefile.mk
openoffice/trunk/main/setup_native/source/win32/customactions/languagepacks/makefile.mk
openoffice/trunk/main/setup_native/source/win32/customactions/patch/makefile.mk
openoffice/trunk/main/setup_native/source/win32/customactions/quickstarter/makefile.mk
openoffice/trunk/main/setup_native/source/win32/customactions/rebase/makefile.mk
openoffice/trunk/main/setup_native/source/win32/customactions/reg4allmsdoc/makefile.mk
openoffice/trunk/main/setup_native/source/win32/customactions/regactivex/makefile.mk
openoffice/trunk/main/setup_native/source/win32/customactions/relnotes/makefile.mk
openoffice/trunk/main/setup_native/source/win32/customactions/shellextensions/makefile.mk
openoffice/trunk/main/setup_native/source/win32/customactions/tools/makefile.mk
openoffice/trunk/main/svtools/Executable_bmp.mk
openoffice/trunk/main/svtools/Executable_bmpsum.mk
openoffice/trunk/main/svtools/Executable_g2g.mk
openoffice/trunk/main/tools/Executable_mkunroll.mk
openoffice/trunk/main/tools/Executable_rscdep.mk
openoffice/trunk/main/tools/Executable_so_checksum.mk
openoffice/trunk/main/tools/Executable_sspretty.mk
openoffice/trunk/main/tools/StaticLibrary_ooopathutils.mk
Modified: openoffice/trunk/main/extensions/source/ole/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/extensions/source/ole/makefile.mk?rev=1492233&r1=1492232&r2=1492233&view=diff
==============================================================================
--- openoffice/trunk/main/extensions/source/ole/makefile.mk (original)
+++ openoffice/trunk/main/extensions/source/ole/makefile.mk Wed Jun 12 15:03:54 2013
@@ -43,10 +43,6 @@ INCPRE+= $(foreach,i,$(ATL_INCLUDE) -I$(
.IF "$(GUI)" == "WNT" && "$(DISABLE_ATL)"==""
-.IF "$(USE_STLP_DEBUG)"!=""
-CDEFS+=-D_DEBUG
-.ENDIF # "$(USE_STLP_DEBUG)"!=""
-
SLOFILES= \
$(SLO)$/servreg.obj \
$(SLO)$/servprov.obj \
@@ -77,11 +73,7 @@ SHL1STDLIBS=\
.IF "$(COM)"=="MSC"
.IF "$(WINDOWS_VISTA_PSDK)"!="" || "$(CCNUMVER)"<="001399999999"
-.IF "$(USE_STLP_DEBUG)" != ""
- SHL1STDLIBS+= $(ATL_LIB)$/atlsd.lib
-.ELSE
SHL1STDLIBS+= $(ATL_LIB)$/atls.lib
-.ENDIF
.ENDIF # "$(WINDOWS_VISTA_PSDK)"!="" || "$(CCNUMVER)"<="001399999999"
.ENDIF # "$(COM)"=="MSC"
@@ -105,11 +97,7 @@ SHL2STDLIBS=\
.IF "$(COM)"=="MSC"
.IF "$(WINDOWS_VISTA_PSDK)"!="" || "$(CCNUMVER)"<="001399999999"
-.IF "$(USE_STLP_DEBUG)" != ""
- SHL2STDLIBS+= $(ATL_LIB)$/atlsd.lib
-.ELSE
SHL2STDLIBS+= $(ATL_LIB)$/atls.lib
-.ENDIF
.ENDIF # "$(WINDOWS_VISTA_PSDK)"!="" || "$(CCNUMVER)"<="001399999999"
.ENDIF # "$(COM)"=="MSC"
Modified: openoffice/trunk/main/sal/systools/win32/kill/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sal/systools/win32/kill/makefile.mk?rev=1492233&r1=1492232&r2=1492233&view=diff
==============================================================================
--- openoffice/trunk/main/sal/systools/win32/kill/makefile.mk (original)
+++ openoffice/trunk/main/sal/systools/win32/kill/makefile.mk Wed Jun 12 15:03:54 2013
@@ -38,6 +38,10 @@ TARGETTYPE=CUI
CDEFS=-D_WIN32_WINNT=0x0501
.ENDIF
+.IF "$(USE_SYSTEM_STL)" != "YES" && "$(PRODUCT)" = ""
+CDEFS+=-D_DEBUG
+.ENDIF
+
CFLAGS+= $(LFS_CFLAGS)
CXXFLAGS+= $(LFS_CFLAGS)
Modified: openoffice/trunk/main/setup_native/source/win32/customactions/indexingfilter/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/setup_native/source/win32/customactions/indexingfilter/makefile.mk?rev=1492233&r1=1492232&r2=1492233&view=diff
==============================================================================
--- openoffice/trunk/main/setup_native/source/win32/customactions/indexingfilter/makefile.mk (original)
+++ openoffice/trunk/main/setup_native/source/win32/customactions/indexingfilter/makefile.mk Wed Jun 12 15:03:54 2013
@@ -38,6 +38,10 @@ USE_DEFFILE=TRUE
.IF "$(GUI)"=="WNT"
+.IF "$(USE_SYSTEM_STL)" != "YES" && "$(PRODUCT)" = ""
+CDEFS+=-D_DEBUG
+.ENDIF
+
UWINAPILIB=
SLOFILES = $(SLO)$/restartindexingservice.obj
Modified: openoffice/trunk/main/setup_native/source/win32/customactions/javafilter/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/setup_native/source/win32/customactions/javafilter/makefile.mk?rev=1492233&r1=1492232&r2=1492233&view=diff
==============================================================================
--- openoffice/trunk/main/setup_native/source/win32/customactions/javafilter/makefile.mk (original)
+++ openoffice/trunk/main/setup_native/source/win32/customactions/javafilter/makefile.mk Wed Jun 12 15:03:54 2013
@@ -38,6 +38,10 @@ DYNAMIC_CRT=
.IF "$(GUI)"=="WNT"
+.IF "$(USE_SYSTEM_STL)" != "YES" && "$(PRODUCT)" = ""
+CDEFS+=-D_DEBUG
+.ENDIF
+
UWINAPILIB=
SLOFILES = $(SLO)$/jfregca.obj
Modified: openoffice/trunk/main/setup_native/source/win32/customactions/languagepacks/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/setup_native/source/win32/customactions/languagepacks/makefile.mk?rev=1492233&r1=1492232&r2=1492233&view=diff
==============================================================================
--- openoffice/trunk/main/setup_native/source/win32/customactions/languagepacks/makefile.mk (original)
+++ openoffice/trunk/main/setup_native/source/win32/customactions/languagepacks/makefile.mk Wed Jun 12 15:03:54 2013
@@ -46,6 +46,10 @@ CDEFS+=-Dnot_used_define_to_disable_pch
.IF "$(GUI)"=="WNT"
+.IF "$(USE_SYSTEM_STL)" != "YES" && "$(PRODUCT)" = ""
+CDEFS+=-D_DEBUG
+.ENDIF
+
UWINAPILIB=
SLOFILES = $(SLO)$/lngpckinsthelper.obj \
Modified: openoffice/trunk/main/setup_native/source/win32/customactions/patch/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/setup_native/source/win32/customactions/patch/makefile.mk?rev=1492233&r1=1492232&r2=1492233&view=diff
==============================================================================
--- openoffice/trunk/main/setup_native/source/win32/customactions/patch/makefile.mk (original)
+++ openoffice/trunk/main/setup_native/source/win32/customactions/patch/makefile.mk Wed Jun 12 15:03:54 2013
@@ -45,6 +45,10 @@ CDEFS+=-Dnot_used_define_to_disable_pch
.IF "$(GUI)"=="WNT"
+.IF "$(USE_SYSTEM_STL)" != "YES" && "$(PRODUCT)" = ""
+CDEFS+=-D_DEBUG
+.ENDIF
+
UWINAPILIB=
SLOFILES = \
Modified: openoffice/trunk/main/setup_native/source/win32/customactions/quickstarter/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/setup_native/source/win32/customactions/quickstarter/makefile.mk?rev=1492233&r1=1492232&r2=1492233&view=diff
==============================================================================
--- openoffice/trunk/main/setup_native/source/win32/customactions/quickstarter/makefile.mk (original)
+++ openoffice/trunk/main/setup_native/source/win32/customactions/quickstarter/makefile.mk Wed Jun 12 15:03:54 2013
@@ -47,6 +47,10 @@ UWINAPILIB=
.IF "$(GUI)"=="WNT"
+.IF "$(USE_SYSTEM_STL)" != "YES" && "$(PRODUCT)" = ""
+CDEFS+=-D_DEBUG
+.ENDIF
+
STDSHL += \
$(ADVAPI32LIB)\
$(SHELL32LIB)\
Modified: openoffice/trunk/main/setup_native/source/win32/customactions/rebase/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/setup_native/source/win32/customactions/rebase/makefile.mk?rev=1492233&r1=1492232&r2=1492233&view=diff
==============================================================================
--- openoffice/trunk/main/setup_native/source/win32/customactions/rebase/makefile.mk (original)
+++ openoffice/trunk/main/setup_native/source/win32/customactions/rebase/makefile.mk Wed Jun 12 15:03:54 2013
@@ -46,6 +46,10 @@ UWINAPILIB=
.IF "$(GUI)"=="WNT"
+.IF "$(USE_SYSTEM_STL)" != "YES" && "$(PRODUCT)" = ""
+CDEFS+=-D_DEBUG
+.ENDIF
+
STDSHL += \
$(ADVAPI32LIB)\
$(SHELL32LIB)\
Modified: openoffice/trunk/main/setup_native/source/win32/customactions/reg4allmsdoc/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/setup_native/source/win32/customactions/reg4allmsdoc/makefile.mk?rev=1492233&r1=1492232&r2=1492233&view=diff
==============================================================================
--- openoffice/trunk/main/setup_native/source/win32/customactions/reg4allmsdoc/makefile.mk (original)
+++ openoffice/trunk/main/setup_native/source/win32/customactions/reg4allmsdoc/makefile.mk Wed Jun 12 15:03:54 2013
@@ -43,6 +43,10 @@ CFLAGS+=-D_STLP_USE_STATIC_LIB
.IF "$(GUI)"=="WNT"
+.IF "$(USE_SYSTEM_STL)" != "YES" && "$(PRODUCT)" = ""
+CDEFS+=-D_DEBUG
+.ENDIF
+
UWINAPILIB=
SLOFILES = $(SLO)$/reg4allmsi.obj
Modified: openoffice/trunk/main/setup_native/source/win32/customactions/regactivex/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/setup_native/source/win32/customactions/regactivex/makefile.mk?rev=1492233&r1=1492232&r2=1492233&view=diff
==============================================================================
--- openoffice/trunk/main/setup_native/source/win32/customactions/regactivex/makefile.mk (original)
+++ openoffice/trunk/main/setup_native/source/win32/customactions/regactivex/makefile.mk Wed Jun 12 15:03:54 2013
@@ -38,6 +38,11 @@ USE_DEFFILE=TRUE
.IF "$(GUI)"=="WNT"
+.IF "$(USE_SYSTEM_STL)" != "YES" && "$(PRODUCT)" = ""
+CDEFS+=-D_DEBUG
+.ENDIF
+
+
UWINAPILIB=
SLOFILES = $(SLO)$/regactivex.obj
Modified: openoffice/trunk/main/setup_native/source/win32/customactions/relnotes/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/setup_native/source/win32/customactions/relnotes/makefile.mk?rev=1492233&r1=1492232&r2=1492233&view=diff
==============================================================================
--- openoffice/trunk/main/setup_native/source/win32/customactions/relnotes/makefile.mk (original)
+++ openoffice/trunk/main/setup_native/source/win32/customactions/relnotes/makefile.mk Wed Jun 12 15:03:54 2013
@@ -46,6 +46,10 @@ UWINAPILIB=
.IF "$(GUI)"=="WNT"
+.IF "$(USE_SYSTEM_STL)" != "YES" && "$(PRODUCT)" = ""
+CDEFS+=-D_DEBUG
+.ENDIF
+
SLOFILES = $(SLO)$/relnotes.obj
STDSHL+= \
Modified: openoffice/trunk/main/setup_native/source/win32/customactions/shellextensions/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/setup_native/source/win32/customactions/shellextensions/makefile.mk?rev=1492233&r1=1492232&r2=1492233&view=diff
==============================================================================
--- openoffice/trunk/main/setup_native/source/win32/customactions/shellextensions/makefile.mk (original)
+++ openoffice/trunk/main/setup_native/source/win32/customactions/shellextensions/makefile.mk Wed Jun 12 15:03:54 2013
@@ -45,6 +45,10 @@ CDEFS+=-Dnot_used_define_to_disable_pch
.IF "$(GUI)"=="WNT"
+.IF "$(USE_SYSTEM_STL)" != "YES" && "$(PRODUCT)" = ""
+CDEFS+=-D_DEBUG
+.ENDIF
+
UWINAPILIB=
SLOFILES = \
Modified: openoffice/trunk/main/setup_native/source/win32/customactions/tools/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/setup_native/source/win32/customactions/tools/makefile.mk?rev=1492233&r1=1492232&r2=1492233&view=diff
==============================================================================
--- openoffice/trunk/main/setup_native/source/win32/customactions/tools/makefile.mk (original)
+++ openoffice/trunk/main/setup_native/source/win32/customactions/tools/makefile.mk Wed Jun 12 15:03:54 2013
@@ -43,6 +43,10 @@ CFLAGS+=-D_STLP_USE_STATIC_LIB
.IF "$(GUI)"=="WNT"
+.IF "$(USE_SYSTEM_STL)" != "YES" && "$(PRODUCT)" = ""
+CDEFS+=-D_DEBUG
+.ENDIF
+
UWINAPILIB=
SLOFILES = $(SLO)$/seterror.obj \
Modified: openoffice/trunk/main/svtools/Executable_bmp.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svtools/Executable_bmp.mk?rev=1492233&r1=1492232&r2=1492233&view=diff
==============================================================================
--- openoffice/trunk/main/svtools/Executable_bmp.mk (original)
+++ openoffice/trunk/main/svtools/Executable_bmp.mk Wed Jun 12 15:03:54 2013
@@ -44,6 +44,15 @@ $(eval $(call gb_Executable_add_linked_l
$(gb_STDLIBS) \
))
+ifneq ($(USE_SYSTEM_STL),YES)
+ifeq ($(PRODUCT),)
+ $(eval $(call gb_Executable_set_cxxflags,bmp,\
+ $$(CXXFLAGS) \
+ -D_DEBUG \
+))
+endif
+endif
+
$(eval $(call gb_Executable_add_exception_objects,bmp,\
svtools/bmpmaker/bmp \
svtools/bmpmaker/bmpcore \
Modified: openoffice/trunk/main/svtools/Executable_bmpsum.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svtools/Executable_bmpsum.mk?rev=1492233&r1=1492232&r2=1492233&view=diff
==============================================================================
--- openoffice/trunk/main/svtools/Executable_bmpsum.mk (original)
+++ openoffice/trunk/main/svtools/Executable_bmpsum.mk Wed Jun 12 15:03:54 2013
@@ -41,6 +41,15 @@ $(eval $(call gb_Executable_add_linked_l
$(gb_STDLIBS) \
))
+ifneq ($(USE_SYSTEM_STL),YES)
+ifeq ($(PRODUCT),)
+ $(eval $(call gb_Executable_set_cxxflags,bmpsum,\
+ $$(CXXFLAGS) \
+ -D_DEBUG \
+))
+endif
+endif
+
$(eval $(call gb_Executable_add_exception_objects,bmpsum,\
svtools/bmpmaker/bmpsum \
))
Modified: openoffice/trunk/main/svtools/Executable_g2g.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svtools/Executable_g2g.mk?rev=1492233&r1=1492232&r2=1492233&view=diff
==============================================================================
--- openoffice/trunk/main/svtools/Executable_g2g.mk (original)
+++ openoffice/trunk/main/svtools/Executable_g2g.mk Wed Jun 12 15:03:54 2013
@@ -43,6 +43,15 @@ $(eval $(call gb_Executable_add_linked_l
$(gb_STDLIBS) \
))
+ifneq ($(USE_SYSTEM_STL),YES)
+ifeq ($(PRODUCT),)
+ $(eval $(call gb_Executable_set_cxxflags,g2g,\
+ $$(CXXFLAGS) \
+ -D_DEBUG \
+))
+endif
+endif
+
$(eval $(call gb_Executable_add_exception_objects,g2g,\
svtools/bmpmaker/g2g \
))
Modified: openoffice/trunk/main/tools/Executable_mkunroll.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/tools/Executable_mkunroll.mk?rev=1492233&r1=1492232&r2=1492233&view=diff
==============================================================================
--- openoffice/trunk/main/tools/Executable_mkunroll.mk (original)
+++ openoffice/trunk/main/tools/Executable_mkunroll.mk Wed Jun 12 15:03:54 2013
@@ -30,9 +30,17 @@ $(eval $(call gb_Executable_set_include,
-I$(SRCDIR)/tools/bootstrp/ \
))
+STLPORT_DEBUGFLAG =
+ifneq ($(USE_SYSTEM_STL),YES)
+ifeq ($(PRODUCT),)
+STLPORT_DEBUGFLAG = -D_DEBUG
+endif
+endif
+
$(eval $(call gb_Executable_set_cxxflags,mkunroll,\
$$(CXXFLAGS) \
-D_TOOLS_STRINGLIST \
+ $(STLPORT_DEBUGFLAG) \
))
$(eval $(call gb_Executable_add_linked_libs,mkunroll,\
Modified: openoffice/trunk/main/tools/Executable_rscdep.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/tools/Executable_rscdep.mk?rev=1492233&r1=1492232&r2=1492233&view=diff
==============================================================================
--- openoffice/trunk/main/tools/Executable_rscdep.mk (original)
+++ openoffice/trunk/main/tools/Executable_rscdep.mk Wed Jun 12 15:03:54 2013
@@ -30,9 +30,17 @@ $(eval $(call gb_Executable_set_include,
-I$(SRCDIR)/tools/bootstrp/ \
))
+STLPORT_DEBUGFLAG =
+ifneq ($(USE_SYSTEM_STL),YES)
+ifeq ($(PRODUCT),)
+STLPORT_DEBUGFLAG = -D_DEBUG
+endif
+endif
+
$(eval $(call gb_Executable_set_cxxflags,rscdep,\
$$(CXXFLAGS) \
-D_TOOLS_STRINGLIST \
+ $(STLPORT_DEBUGFLAG) \
))
$(eval $(call gb_Executable_add_linked_libs,rscdep,\
Modified: openoffice/trunk/main/tools/Executable_so_checksum.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/tools/Executable_so_checksum.mk?rev=1492233&r1=1492232&r2=1492233&view=diff
==============================================================================
--- openoffice/trunk/main/tools/Executable_so_checksum.mk (original)
+++ openoffice/trunk/main/tools/Executable_so_checksum.mk Wed Jun 12 15:03:54 2013
@@ -30,9 +30,17 @@ $(eval $(call gb_Executable_set_include,
-I$(SRCDIR)/tools/bootstrp/ \
))
+STLPORT_DEBUGFLAG =
+ifneq ($(USE_SYSTEM_STL),YES)
+ifeq ($(PRODUCT),)
+STLPORT_DEBUGFLAG = -D_DEBUG
+endif
+endif
+
$(eval $(call gb_Executable_set_cxxflags,so_checksum,\
$$(CXXFLAGS) \
-D_TOOLS_STRINGLIST \
+ $(STLPORT_DEBUGFLAG) \
))
$(eval $(call gb_Executable_add_linked_libs,so_checksum,\
Modified: openoffice/trunk/main/tools/Executable_sspretty.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/tools/Executable_sspretty.mk?rev=1492233&r1=1492232&r2=1492233&view=diff
==============================================================================
--- openoffice/trunk/main/tools/Executable_sspretty.mk (original)
+++ openoffice/trunk/main/tools/Executable_sspretty.mk Wed Jun 12 15:03:54 2013
@@ -30,9 +30,17 @@ $(eval $(call gb_Executable_set_include,
-I$(SRCDIR)/tools/bootstrp/ \
))
+STLPORT_DEBUGFLAG =
+ifneq ($(USE_SYSTEM_STL),YES)
+ifeq ($(PRODUCT),)
+STLPORT_DEBUGFLAG = -D_DEBUG
+endif
+endif
+
$(eval $(call gb_Executable_set_cxxflags,sspretty,\
$$(CXXFLAGS) \
-D_TOOLS_STRINGLIST \
+ $(STLPORT_DEBUGFLAG) \
))
$(eval $(call gb_Executable_add_linked_libs,sspretty,\
Modified: openoffice/trunk/main/tools/StaticLibrary_ooopathutils.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/tools/StaticLibrary_ooopathutils.mk?rev=1492233&r1=1492232&r2=1492233&view=diff
==============================================================================
--- openoffice/trunk/main/tools/StaticLibrary_ooopathutils.mk (original)
+++ openoffice/trunk/main/tools/StaticLibrary_ooopathutils.mk Wed Jun 12 15:03:54 2013
@@ -25,6 +25,15 @@ $(eval $(call gb_StaticLibrary_StaticLib
$(eval $(call gb_StaticLibrary_add_package_headers,ooopathutils,tools_inc))
+ifneq ($(USE_SYSTEM_STL),YES)
+ifeq ($(PRODUCT),)
+$(eval $(call gb_StaticLibrary_set_defs,ooopathutils,\
+ $$(DEFS) \
+ -D_DEBUG \
+))
+endif
+endif
+
$(eval $(call gb_StaticLibrary_add_exception_objects,ooopathutils,\
tools/source/misc/pathutils \
))