You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by da...@apache.org on 2016/08/07 19:24:15 UTC
svn commit: r1755455 [13/18] - in /openoffice/trunk: ./
ext_libraries/apr-util/ ext_libraries/gtest/win/
ext_libraries/ratscan/scan/ ext_libraries/serf/win/ main/
main/UnoControls/prj/ main/accessibility/prj/ main/animations/prj/
main/basctl/source/dlg...
Modified: openoffice/trunk/main/solenv/gbuild/platform/windows.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/platform/windows.mk?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/gbuild/platform/windows.mk (original)
+++ openoffice/trunk/main/solenv/gbuild/platform/windows.mk Sun Aug 7 19:24:03 2016
@@ -57,6 +57,7 @@ gb_COMPILERDEFS := \
-D_CRT_NONSTDC_NO_DEPRECATE \
-D_CRT_SECURE_NO_DEPRECATE \
-D_MT \
+ -D_DLL \
-DBOOST_MEM_FN_ENABLE_CDECL \
-DCPPU_ENV=msci \
-DFULL_DESK \
@@ -76,7 +77,6 @@ gb_CFLAGS := \
-GR \
-Gs \
-GS \
- -Gy \
-nologo \
-Wall \
-wd4005 \
@@ -190,9 +190,12 @@ gb_NoexPrecompiledHeader_NOEXCEPTIONFLAG
gb_LinkTarget_LDFLAGS := \
-MACHINE:IX86 \
-NODEFAULTLIB \
- -SUBSYSTEM:CONSOLE \
$(patsubst %,-LIBPATH:%,$(filter-out .,$(subst ;, ,$(subst \,/,$(ILIB))))) \
+
+
+gb_DEBUG_CFLAGS := -Zi
+# this does not use CFLAGS so it is not overridable
ifneq ($(ENABLE_CRASHDUMP),)
gb_LinkTarget_LDFLAGS += -DEBUG
gb_CFLAGS+=-Zi
@@ -200,10 +203,8 @@ gb_CXXFLAGS+=-Zi
endif
ifeq ($(gb_DEBUGLEVEL),2)
-gb_CXXFLAGS +=-Zi
-gb_CFLAGS +=-Zi
-gb_COMPILEROPTFLAGS :=
gb_LinkTarget_LDFLAGS += -DEBUG
+gb_COMPILEROPTFLAGS :=
else
gb_COMPILEROPTFLAGS := -Ob1 -Oxs -Oy-
endif
@@ -233,11 +234,22 @@ $(patsubst $(SRCDIR)%,$(gb_Helper_SRCDIR
$(1)))))
endef
+# convert parametters filesystem root to native notation
+# does some real work only on windows, make sure not to
+# break the dummy implementations on unx*
+define gb_Helper_convert_native
+$(patsubst -I$(OUTDIR)%,-I$(gb_Helper_OUTDIR_NATIVE)%, \
+$(patsubst $(OUTDIR)%,$(gb_Helper_OUTDIR_NATIVE)%, \
+$(patsubst $(WORKDIR)%,$(gb_Helper_WORKDIR_NATIVE)%, \
+$(patsubst $(SRCDIR)%,$(gb_Helper_SRCDIR_NATIVE)%, \
+$(1)))))
+endef
+
# CObject class
ifeq ($(gb_FULLDEPS),$(true))
-define gb_CObject__command_deponcompile
+define gb_Object__command_deponcompile
$(call gb_Helper_abbreviate_dirs_native,\
$(OUTDIR)/bin/makedepend$(gb_Executable_EXT) \
$(filter-out -DPRECOMPILED_HEADERS,$(4)) $(5) \
@@ -251,64 +263,47 @@ $(call gb_Helper_abbreviate_dirs_native,
-v WORKDIR=$(WORKDIR)/ \
-v SRCDIR=$(SRCDIR)/ \
-v REPODIR=$(REPODIR)/ \
- > $(call gb_CObject_get_dep_target,$(2)))
+ > $(2))
endef
else
-CObject__command_deponcompile =
+gb_Object__command_deponcompile =
endif
define gb_CObject__command
$(call gb_Output_announce,$(2),$(true),C ,3)
$(call gb_Helper_abbreviate_dirs_native,\
- mkdir -p $(dir $(1)) && \
+ mkdir -p $(dir $(1)) $(dir $(4)) && \
unset INCLUDE && \
$(gb_CC) \
- $(DEFS) $(CFLAGS) -Fd$(PDBFILE) \
+ $(DEFS) \
+ $(T_CFLAGS) \
+ -Fd$(PDBFILE) \
$(PCHFLAGS) \
-I$(dir $(3)) \
$(INCLUDE) \
-c $(3) \
-Fo$(1))
-$(call gb_CObject__command_deponcompile,$(1),$(2),$(3),$(DEFS),$(CFLAGS),$(INCLUDE))
+$(call gb_Object__command_deponcompile,$(1),$(4),$(3),$(DEFS),$(T_CFLAGS),$(INCLUDE))
endef
# CxxObject class
-ifeq ($(gb_FULLDEPS),$(true))
-define gb_CxxObject__command_deponcompile
-$(call gb_Helper_abbreviate_dirs_native,\
- $(OUTDIR)/bin/makedepend$(gb_Executable_EXT) \
- $(filter-out -DPRECOMPILED_HEADERS,$(4)) $(5) \
- -I$(dir $(3)) \
- $(filter-out -I$(COMPATH)% %/pch -I$(JAVA_HOME)%,$(6)) \
- $(3) \
- -f - \
- | $(gb_AWK) -f $(GBUILDDIR)/processdeps.awk \
- -v OBJECTFILE=$(1) \
- -v OUTDIR=$(OUTDIR)/ \
- -v WORKDIR=$(WORKDIR)/ \
- -v SRCDIR=$(SRCDIR)/ \
- -v REPODIR=$(REPODIR)/ \
- > $(call gb_CxxObject_get_dep_target,$(2)))
- endef
-else
-gb_CxxObject__command_deponcompile =
-endif
-
define gb_CxxObject__command
$(call gb_Output_announce,$(2),$(true),CXX,3)
$(call gb_Helper_abbreviate_dirs_native,\
- mkdir -p $(dir $(1)) && \
+ mkdir -p $(dir $(1)) $(dir $(4)) && \
unset INCLUDE && \
$(gb_CXX) \
- $(DEFS) $(CXXFLAGS) -Fd$(PDBFILE)\
+ $(DEFS) \
+ $(T_CXXFLAGS) \
+ -Fd$(PDBFILE) \
$(PCHFLAGS) \
-I$(dir $(3)) \
$(INCLUDE_STL) $(INCLUDE) \
-c $(3) \
-Fo$(1))
-$(call gb_CxxObject__command_deponcompile,$(1),$(2),$(3),$(DEFS),$(CFLAGS),$(INCLUDE))
+$(call gb_Object__command_deponcompile,$(1),$(4),$(3),$(DEFS),$(T_CXXFLAGS),$(INCLUDE))
endef
@@ -396,7 +391,7 @@ endef
# LinkTarget class
-gb_LinkTarget_CFLAGS := $(gb_CFLAGS) $(gb_CFLAGS_WERROR) $(gb_COMPILEROPTFLAGS)
+gb_LinkTarget_CFLAGS := $(gb_CFLAGS) $(gb_CFLAGS_WERROR)
gb_LinkTarget_CXXFLAGS := $(gb_CXXFLAGS) $(gb_CXXFLAGS_WERROR)
gb_LinkTarget_INCLUDE :=\
@@ -421,11 +416,13 @@ $(call gb_Helper_abbreviate_dirs_native,
$(if $(filter Library,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
$(if $(filter StaticLibrary,$(TARGETTYPE)),$(gb_StaticLibrary_TARGETTYPEFLAGS)) \
$(if $(filter GoogleTest Executable,$(TARGETTYPE)),$(gb_Executable_TARGETTYPEFLAGS)) \
- $(LDFLAGS) \
+ $(if $(filter YES,$(gb_Executable_TARGETGUI)), -SUBSYSTEM:WINDOWS, -SUBSYSTEM:CONSOLE) \
+ $(T_LDFLAGS) \
@$${RESPONSEFILE} \
$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib))) \
$(patsubst %,%.lib,$(EXTERNAL_LIBS)) \
$(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_filename,$(lib))) \
+ $(LIBS) \
$(if $(DLLTARGET),-out:$(DLLTARGET) -implib:$(1),-out:$(1)); RC=$$?; rm $${RESPONSEFILE} \
$(if $(DLLTARGET),; if [ ! -f $(DLLTARGET) ]; then rm -f $(1) && false; fi) ; exit $$RC)
endef
@@ -433,7 +430,7 @@ endef
# Library class
-gb_Library_DEFS := -D_DLL
+gb_Library_DEFS := -D_DLL_
gb_Library_TARGETTYPEFLAGS := -DLL -OPT:NOREF -SAFESEH -NXCOMPAT -DYNAMICBASE
gb_Library_get_rpath :=
@@ -442,6 +439,9 @@ gb_Library_PLAINEXT := .lib
gb_Library_PLAINLIBS_NONE += \
advapi32 \
+ d3d9 \
+ d3dx \
+ ddraw \
gdi32 \
gdiplus \
gnu_getopt \
@@ -457,8 +457,8 @@ gb_Library_PLAINLIBS_NONE += \
user32 \
uuid \
uwinapi \
- winspool \
- z
+ winmm \
+ winspool
gb_Library_LAYER := \
$(foreach lib,$(gb_Library_OOOLIBS),$(lib):OOO) \
@@ -530,11 +530,11 @@ $(call gb_Library_get_clean_target,$(1))
$(OUTDIR)/bin/$(notdir $(patsubst %.dll,%.pdb,$(3))) \
$(OUTDIR)/bin/$(notdir $(patsubst %.dll,%.ilk,$(3))) \
-$(call gb_Deliver_add_deliverable,$(OUTDIR)/bin/$(notdir $(patsubst %.dll,%.pdb,$(3))),$(patsubst %.dll,%.pdb,$(3)))
-$(call gb_Deliver_add_deliverable,$(OUTDIR)/bin/$(notdir $(patsubst %.dll,%.ilk,$(3))),$(patsubst %.dll,%.ilk,$(3)))
+$(call gb_Deliver_add_deliverable,$(OUTDIR)/bin/$(notdir $(patsubst %.dll,%.pdb,$(3))),$(patsubst %.dll,%.pdb,$(3)),$(1))
+$(call gb_Deliver_add_deliverable,$(OUTDIR)/bin/$(notdir $(patsubst %.dll,%.ilk,$(3))),$(patsubst %.dll,%.ilk,$(3)),$(1))
endif
-$(call gb_Deliver_add_deliverable,$(OUTDIR)/bin/$(notdir $(3)),$(3))
+$(call gb_Deliver_add_deliverable,$(OUTDIR)/bin/$(notdir $(3)),$(3),$(1))
$(call gb_LinkTarget_get_target,$(2)) \
$(call gb_LinkTarget_get_headers_target,$(2)) : PDBFILE = $(call gb_LinkTarget_get_pdbfile,$(2))
@@ -595,6 +595,7 @@ endef
gb_Executable_EXT := .exe
gb_Executable_TARGETTYPEFLAGS := -RELEASE -BASE:0x1b000000 -OPT:NOREF -INCREMENTAL:NO -DEBUG -SAFESEH -NXCOMPAT -DYNAMICBASE
gb_Executable_get_rpath :=
+gb_Executable_TARGETGUI :=
define gb_Executable_Executable_platform
$(call gb_LinkTarget_set_auxtargets,$(2),\
@@ -605,7 +606,7 @@ $(call gb_LinkTarget_set_auxtargets,$(2)
$(call gb_Executable_get_target,$(1)) \
$(call gb_Executable_get_clean_target,$(1)) : AUXTARGETS := $(call gb_Executable_get_target,$(1)).manifest
-$(call gb_Deliver_add_deliverable,$(call gb_Executable_get_target,$(1)).manifest,$(call gb_LinkTarget_get_target,$(2)).manifest)
+$(call gb_Deliver_add_deliverable,$(call gb_Executable_get_target,$(1)).manifest,$(call gb_LinkTarget_get_target,$(2)).manifest,$(1))
$(call gb_LinkTarget_get_target,$(2)) \
$(call gb_LinkTarget_get_headers_target,$(2)) : PDBFILE = $(call gb_LinkTarget_get_pdbfile,$(2))
@@ -744,5 +745,19 @@ gb_XSLTPROCPRECOMMAND := PATH="$${PATH}:
gb_Library_COMPONENTPREFIXES := \
OOO:vnd.sun.star.expand:\dOOO_BASE_DIR/program/ \
URELIB:vnd.sun.star.expand:\dURE_INTERNAL_LIB_DIR/ \
+ NONE:vnd.sun.star.expand:\dOOO_INBUILD_SHAREDLIB_DIR/ \
+
+# UnoApiTarget
+
+gb_UnoApiTarget_IDLCTARGET := $(OUTDIR)/bin/idlc.exe
+gb_UnoApiTarget_IDLCCOMMAND := SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_IDLCTARGET)
+gb_UnoApiTarget_REGMERGETARGET := $(OUTDIR)/bin/regmerge.exe
+gb_UnoApiTarget_REGMERGECOMMAND := SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGMERGETARGET)
+gb_UnoApiTarget_REGCOMPARETARGET := $(OUTDIR)/bin/regcompare.exe
+gb_UnoApiTarget_REGCOMPARECOMMAND := SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGCOMPARETARGET)
+gb_UnoApiTarget_CPPUMAKERTARGET := $(OUTDIR)/bin/cppumaker.exe
+gb_UnoApiTarget_CPPUMAKERCOMMAND := SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_CPPUMAKERTARGET)
+gb_UnoApiTarget_REGVIEWTARGET := $(OUTDIR)/bin/regview.exe
+gb_UnoApiTarget_REGVIEWCOMMAND := SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGVIEWTARGET)
# vim: set noet sw=4 ts=4:
Modified: openoffice/trunk/main/solenv/gbuild/platform/winmingw.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/platform/winmingw.mk?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/gbuild/platform/winmingw.mk (original)
+++ openoffice/trunk/main/solenv/gbuild/platform/winmingw.mk Sun Aug 7 19:24:03 2016
@@ -153,7 +153,6 @@ gb_NoexPrecompiledHeader_NOEXCEPTIONFLAG
gb_LinkTarget_LDFLAGS := \
--export-all-symbols \
--kill-at \
- --subsystem console \
--exclude-libs ALL \
--enable-stdcall-fixup \
--enable-runtime-pseudo-reloc-v2 \
@@ -164,6 +163,8 @@ ifeq ($(MINGW_GCCLIB_EH),YES)
gb_LinkTarget_LDFLAGS += -shared-libgcc
endif
+gb_DEBUG_CFLAGS := -ggdb3 -finline-limit=0 -fno-inline -fno-default-inline
+
ifeq ($(gb_DEBUGLEVEL),2)
gb_COMPILEROPTFLAGS := -O0
else
@@ -207,10 +208,21 @@ $(patsubst $(SRCDIR)%,$(gb_Helper_SRCDIR
$(1)))))
endef
+# convert parametters filesystem root to native notation
+# does some real work only on windows, make sure not to
+# break the dummy implementations on unx*
+define gb_Helper_convert_native
+$(patsubst -I$(OUTDIR)%,-I$(gb_Helper_OUTDIR_NATIVE)%, \
+$(patsubst $(OUTDIR)%,$(gb_Helper_OUTDIR_NATIVE)%, \
+$(patsubst $(WORKDIR)%,$(gb_Helper_WORKDIR_NATIVE)%, \
+$(patsubst $(SRCDIR)%,$(gb_Helper_SRCDIR_NATIVE)%, \
+$(1)))))
+endef
+
# CObject class
ifeq ($(gb_FULLDEPS),$(true))
-define gb_CObject__command_deponcompile
+define gb_Object__command_deponcompile
$(call gb_Helper_abbreviate_dirs_native,\
$(OUTDIR)/bin/makedepend$(gb_Executable_EXT) \
$(filter-out -DPRECOMPILED_HEADERS,$(4)) $(5) \
@@ -224,10 +236,10 @@ $(call gb_Helper_abbreviate_dirs_native,
-v WORKDIR=$(WORKDIR)/ \
-v SRCDIR=$(SRCDIR)/ \
-v REPODIR=$(REPODIR)/ \
- > $(call gb_CObject_get_dep_target,$(2)))
+ > $(2))
endef
else
-CObject__command_deponcompile =
+gb_Object__command_deponcompile =
endif
define gb_CObject__command
@@ -235,50 +247,31 @@ $(call gb_Output_announce,$(2),$(true),C
$(call gb_Helper_abbreviate_dirs_native,\
mkdir -p $(dir $(1)) && \
$(gb_CC) \
- $(DEFS) $(CFLAGS) \
+ $(DEFS) \
+ $(T_CFLAGS) \
-c $(3) \
-o $(1) \
-I$(dir $(3)) \
$(INCLUDE))
-$(call gb_CObject__command_deponcompile,$(1),$(2),$(3),$(DEFS),$(CFLAGS),$(INCLUDE))
+$(call gb_Object__command_deponcompile,$(1),$(4),$(3),$(DEFS),$(T_CFLAGS),$(INCLUDE))
endef
# CxxObject class
-ifeq ($(gb_FULLDEPS),$(true))
-define gb_CxxObject__command_deponcompile
-$(call gb_Helper_abbreviate_dirs_native,\
- $(OUTDIR)/bin/makedepend$(gb_Executable_EXT) \
- $(filter-out -DPRECOMPILED_HEADERS,$(4)) $(5) \
- -I$(dir $(3)) \
- $(filter-out -I$(COMPATH)% %/pch -I$(JAVA_HOME),$(6)) \
- $(3) \
- -f - \
- | $(gb_AWK) -f $(GBUILDDIR)/processdeps.awk \
- -v OBJECTFILE=$(1) \
- -v OUTDIR=$(OUTDIR)/ \
- -v WORKDIR=$(WORKDIR)/ \
- -v SRCDIR=$(SRCDIR)/ \
- -v REPODIR=$(REPODIR)/ \
- > $(call gb_CxxObject_get_dep_target,$(2)))
-endef
-else
-gb_CxxObject__command_deponcompile =
-endif
-
define gb_CxxObject__command
$(call gb_Output_announce,$(2),$(true),CXX,3)
$(call gb_Helper_abbreviate_dirs_native,\
mkdir -p $(dir $(1)) && \
$(gb_CXX) \
- $(DEFS) $(CXXFLAGS) \
+ $(DEFS) \
+ $(T_CXXFLAGS) \
-c $(3) \
-o $(1) \
-I$(dir $(3)) \
$(INCLUDE_STL) $(INCLUDE))
-$(call gb_CxxObject__command_deponcompile,$(1),$(2),$(3),$(DEFS),$(CXXFLAGS),$(INCLUDE_STL) $(INCLUDE))
+$(call gb_Object__command_deponcompile,$(1),$(4),$(3),$(DEFS),$(T_CXXFLAGS),$(INCLUDE_STL) $(INCLUDE))
endef
@@ -372,15 +365,9 @@ endef
# LinkTarget class
-gb_LinkTarget_CFLAGS := $(gb_CFLAGS) $(gb_CFLAGS_WERROR) $(gb_COMPILEROPTFLAGS)
+gb_LinkTarget_CFLAGS := $(gb_CFLAGS) $(gb_CFLAGS_WERROR)
gb_LinkTarget_CXXFLAGS := $(gb_CXXFLAGS) $(gb_CXXFLAGS_WERROR)
-ifeq ($(gb_DEBUGLEVEL),2)
-gb_LinkTarget_CXXFLAGS += -ggdb3 -finline-limit=0 -fno-inline -fno-default-inline
-gb_LinkTarget_CFLAGS += -ggdb3 -finline-limit=0 -fno-inline -fno-default-inline
-
-endif
-
gb_LinkTarget_INCLUDE :=\
$(filter-out %/stl, $(subst -I. , ,$(SOLARINC))) \
$(foreach inc,$(subst ;, ,$(JDKINC)),-I$(inc)) \
@@ -398,13 +385,15 @@ $(call gb_Helper_abbreviate_dirs_native,
$(NATIVERES) " > $${RESPONSEFILE} && \
$(gb_LINK) \
$(gb_Executable_TARGETTYPEFLAGS) \
- $(LDFLAGS) \
+ $(if $(filter YES,$(gb_Executable_TARGETGUI)), --subsystem windows, --subsystem console) \
+ $(T_LDFLAGS) \
$(gb_MINGWLIBDIR)/crt2.o \
$(MINGW_CLIB_DIR)/crtbegin.o \
@$${RESPONSEFILE} \
--start-group $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) --end-group \
--start-group $(patsubst %.dll,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_dllname,$(lib)))) --end-group \
--start-group $(patsubst %,-l%,$(EXTERNAL_LIBS)) --end-group \
+ $(LIBS) \
$(MINGW_CLIB_DIR)/crtend.o \
-Map $(basename $(1)).map \
-o $(1))
@@ -421,7 +410,7 @@ $(call gb_Helper_abbreviate_dirs_native,
$(NATIVERES) " > $${RESPONSEFILE} && \
$(gb_LINK) \
$(gb_Library_TARGETTYPEFLAGS) \
- $(LDFLAGS) \
+ $(T_LDFLAGS) \
--enable-auto-image-base \
-e _DllMainCRTStartup@12 \
$(gb_MINGWLIBDIR)/dllcrt2.o \
@@ -429,6 +418,7 @@ $(call gb_Helper_abbreviate_dirs_native,
@$${RESPONSEFILE} \
--start-group $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) --end-group \
--start-group $(patsubst %.dll,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_dllname,$(lib)))) --end-group \
+ $(LIBS) \
$(MINGW_CLIB_DIR)/crtend.o \
-Map $(basename $(DLLTARGET)).map \
-o $(DLLTARGET) && touch $(1))
@@ -456,7 +446,7 @@ endef
# Library class
-gb_Library_DEFS := -D_DLL
+gb_Library_DEFS := -D_DLL_
gb_Library_TARGETTYPEFLAGS := -shared
gb_Library_get_rpath :=
@@ -470,6 +460,9 @@ gb_Library_PLAINLIBS_NONE += \
$(gb_MINGW_LIBSTDCPP) \
$(gb_MINGW_LIBGCC) \
advapi32 \
+ d3d9 \
+ d3dx \
+ ddraw \
gdi32 \
gdiplus \
gnu_getopt \
@@ -485,8 +478,8 @@ gb_Library_PLAINLIBS_NONE += \
user32 \
uuid \
uwinapi \
- winspool \
- z
+ winmm \
+ winspool
gb_Library_LAYER := \
$(foreach lib,$(gb_Library_OOOLIBS),$(lib):OOO) \
@@ -542,7 +535,7 @@ $(call gb_LinkTarget_set_auxtargets,$(2)
$(call gb_Library_get_target,$(1)) \
$(call gb_Library_get_clean_target,$(1)) : AUXTARGETS := $(OUTDIR)/bin/$(notdir $(3))
-$(call gb_Deliver_add_deliverable,$(OUTDIR)/bin/$(notdir $(3)),$(3))
+$(call gb_Deliver_add_deliverable,$(OUTDIR)/bin/$(notdir $(3)),$(3),$(1))
endef
@@ -592,6 +585,7 @@ gb_Executable_EXT := .exe
gb_Executable_TARGETTYPEFLAGS :=
gb_Executable_get_rpath :=
gb_Executable_Executable_platform =
+gb_Executable_TARGETGUI :=
# GoogleTest class
@@ -683,5 +677,19 @@ gb_XSLTPROCPRECOMMAND := PATH="$${PATH}:
gb_Library_COMPONENTPREFIXES := \
OOO:vnd.sun.star.expand:\dOOO_BASE_DIR/program/ \
URELIB:vnd.sun.star.expand:\dURE_INTERNAL_LIB_DIR/ \
+ NONE:vnd.sun.star.expand:\dOOO_INBUILD_SHAREDLIB_DIR/ \
+
+# UnoApiTarget
+
+gb_UnoApiTarget_IDLCTARGET := $(OUTDIR)/bin/idlc.exe
+gb_UnoApiTarget_IDLCCOMMAND := SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_IDLCTARGET)
+gb_UnoApiTarget_REGMERGETARGET := $(OUTDIR)/bin/regmerge.exe
+gb_UnoApiTarget_REGMERGECOMMAND := SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGMERGETARGET)
+gb_UnoApiTarget_REGCOMPARETARGET := $(OUTDIR)/bin/regcompare.exe
+gb_UnoApiTarget_REGCOMPARECOMMAND := SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGCOMPARETARGET)
+gb_UnoApiTarget_CPPUMAKERTARGET := $(OUTDIR)/bin/cppumaker.exe
+gb_UnoApiTarget_CPPUMAKERCOMMAND := SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_CPPUMAKERTARGET)
+gb_UnoApiTarget_REGVIEWTARGET := $(OUTDIR)/bin/regview.exe
+gb_UnoApiTarget_REGVIEWCOMMAND := SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGVIEWTARGET)
# vim: set noet sw=4 ts=4:
Modified: openoffice/trunk/main/solenv/gbuild/templates/Executable.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/templates/Executable.mk?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/gbuild/templates/Executable.mk (original)
+++ openoffice/trunk/main/solenv/gbuild/templates/Executable.mk Sun Aug 7 19:24:03 2016
@@ -27,9 +27,9 @@ $(eval $(call gb_Executable_set_include,
$$(INCLUDE) \
))
-$(eval $(call gb_Executable_set_cxxflags,EXEC,\
- $$(CXXFLAGS) \
-))
+#$(eval $(call gb_Executable_add_defs,EXEC,\
+# -Dfoo \
+#))
$(eval $(call gb_Executable_add_linked_libs,EXEC,\
$(gb_STDLIBS) \
@@ -38,4 +38,7 @@ $(eval $(call gb_Executable_add_linked_l
$(eval $(call gb_Executable_add_exception_objects,EXEC,\
))
+$(eval $(call gb_Executable_set_targettype_gui,EXEC,\
+))
+
# vim: set noet sw=4 ts=4:
Modified: openoffice/trunk/main/solenv/gbuild/templates/Library.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/templates/Library.mk?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/gbuild/templates/Library.mk (original)
+++ openoffice/trunk/main/solenv/gbuild/templates/Library.mk Sun Aug 7 19:24:03 2016
@@ -45,9 +45,8 @@ $(eval $(call gb_Library_set_include,LIB
# add any additional definitions to be set for compilation here
# (e.g. -DLIB_DLLIMPLEMENTATION)
-$(eval $(call gb_Library_set_defs,LIB,\
- $$(DEFS) \
-))
+#$(eval $(call gb_Library_add_defs,LIB,\
+#))
# add libraries to be linked to LIB; again these names need to be given as
# specified in Repository.mk
Modified: openoffice/trunk/main/solenv/inc/libs.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/inc/libs.mk?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/inc/libs.mk (original)
+++ openoffice/trunk/main/solenv/inc/libs.mk Sun Aug 7 19:24:03 2016
@@ -85,7 +85,7 @@ CPPUHELPERLIB=-luno_cppuhelper$(COMID)
.IF "$(GUI)"=="OS2"
UCBHELPERLIB=-lucbh$(UCBHELPER_MAJOR)
.ELSE
-UCBHELPERLIB=-lucbhelper$(UCBHELPER_MAJOR)$(COMID)
+UCBHELPERLIB=-lucbhelper$(COMID)
.ENDIF
.IF "$(SYSTEM_OPENSSL)" == "YES"
OPENSSLLIB=$(OPENSSL_LIBS)
@@ -381,7 +381,7 @@ OTXLIB=otx_ind.lib
OSXLIB=osx.lib
REGLIB=ireg.lib
EXTLIB=iext.lib
-SOTLIB=sot.lib
+SOTLIB=isot.lib
MOZBASELIBST=nspr4_s.lib xpcombase_s.lib
MOZBASELIB=nspr4.lib xpcom.lib
LDAPSDKLIB=nsldap32v50.lib
Modified: openoffice/trunk/main/solenv/inc/target.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/inc/target.mk?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/inc/target.mk (original)
+++ openoffice/trunk/main/solenv/inc/target.mk Sun Aug 7 19:24:03 2016
@@ -50,7 +50,7 @@ INCEXT*=.
INCPRE*=.
INCPOST*=.
.IF "$(BOOTSTRAP_SERVICE)"!="TRUE" && "$(NO_OFFUH)"==""
-UNOINCLUDES=$(SOLARINCDIR)/offuh
+UNOINCLUDES=$(SOLARINCDIR)/udkapi -I$(SOLARINCDIR)/offapi -I$(SOLARINCDIR)/oovbaapi
.ENDIF # "$(BOOTSTRAP_SERVICE)"!="TRUE" && "$(NO_OFFUH)"==""
SOLARINC+=$(JDKINCS)
# make sure INCLUDE isn't set
Modified: openoffice/trunk/main/sot/JunitTest_sot_complex.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sot/JunitTest_sot_complex.mk?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/sot/JunitTest_sot_complex.mk (original)
+++ openoffice/trunk/main/sot/JunitTest_sot_complex.mk Sun Aug 7 19:24:03 2016
@@ -21,7 +21,7 @@
-$(eval $(call gb_JunitTest_JunitTest,sot_complex))
+$(eval $(call gb_JunitTest_JunitTest,sot_complex,SRCDIR))
$(eval $(call gb_JunitTest_add_sourcefiles,sot_complex,\
sot/qa/complex/olesimplestorage/OLESimpleStorageTest \
Modified: openoffice/trunk/main/sot/Library_sot.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sot/Library_sot.mk?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/sot/Library_sot.mk (original)
+++ openoffice/trunk/main/sot/Library_sot.mk Sun Aug 7 19:24:03 2016
@@ -32,11 +32,14 @@ $(eval $(call gb_Library_set_componentfi
$(eval $(call gb_Library_set_include,sot,\
-I$(SRCDIR)/sot/inc/pch \
$$(INCLUDE) \
- -I$(OUTDIR)/inc/offuh \
))
-$(eval $(call gb_Library_set_defs,sot,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_api,sot,\
+ udkapi \
+ offapi \
+))
+
+$(eval $(call gb_Library_add_defs,sot,\
-DSOT_DLLIMPLEMENTATION \
))
Modified: openoffice/trunk/main/starmath/prj/build.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/starmath/prj/build.lst?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/starmath/prj/build.lst (original)
+++ openoffice/trunk/main/starmath/prj/build.lst Sun Aug 7 19:24:03 2016
@@ -1,9 +1,2 @@
sm starmath : LIBXSLT:libxslt L10N:l10n svx NULL
-sm starmath usr1 - all sm_mkout NULL
-sm starmath\inc nmake - all sm_inc NULL
-sm starmath\prj get - all sm_prj NULL
-sm starmath\res get - all sm_res NULL
-sm starmath\sdi nmake - all sm_sdi NULL
-sm starmath\source nmake - all sm_sorce sm_sdi sm_inc NULL
-sm starmath\util nmake - all sm_util sm_sorce NULL
-sm starmath\qa\unoapi nmake - all sm_qa_unoapi NULL
+sm starmath\prj nmake - all sm_prj NULL
Modified: openoffice/trunk/main/starmath/prj/d.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/starmath/prj/d.lst?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/starmath/prj/d.lst (original)
+++ openoffice/trunk/main/starmath/prj/d.lst Sun Aug 7 19:24:03 2016
@@ -1,23 +0,0 @@
-mkdir: %COMMON_DEST%\bin%_EXT%\hid
-mkdir: %_DEST%\xml%_EXT%\uiconfig
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\smath
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\smath\menubar
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\smath\toolbar
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\smath\statusbar
-
-..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid
-..\%__SRC%\lib\lib*.* %_DEST%\lib%_EXT%\lib*.*
-..\%__SRC%\misc\*.map %_DEST%\bin%_EXT%\*.map
-..\xml\*.xml %_DEST%\xml%_EXT%\*.xml
-..\%__SRC%\bin\sm?????.dll %_DEST%\bin%_EXT%\sm?????.dll
-..\%__SRC%\bin\smd?????.dll %_DEST%\bin%_EXT%\smd?????.dll
-..\%__SRC%\bin\sm*.res %_DEST%\bin%_EXT%\sm*.res
-..\%__SRC%\bin\sm?????.sym %_DEST%\bin%_EXT%\sm?????.sym
-mkdir: %_DEST%\inc%_EXT%\starmath
-
-..\uiconfig\smath\menubar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\smath\menubar\*.xml
-..\uiconfig\smath\toolbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\smath\toolbar\*.xml
-..\uiconfig\smath\statusbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\smath\statusbar\*.xml
-..\%__SRC%\misc\sm.component %_DEST%\xml%_EXT%\sm.component
-..\%__SRC%\misc\smd.component %_DEST%\xml%_EXT%\smd.component
Modified: openoffice/trunk/main/starmath/qa/unoapi/Test.java
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/starmath/qa/unoapi/Test.java?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/starmath/qa/unoapi/Test.java (original)
+++ openoffice/trunk/main/starmath/qa/unoapi/Test.java Sun Aug 7 19:24:03 2016
@@ -25,6 +25,7 @@ package org.openoffice.starmath.qa.unoap
import org.openoffice.Runner;
import org.openoffice.test.OfficeConnection;
+import org.openoffice.test.Argument;
import static org.junit.Assert.*;
public final class Test {
@@ -41,8 +42,8 @@ public final class Test {
@org.junit.Test public void test() {
assertTrue(
Runner.run(
- "-sce", "sm.sce", "-xcl", "knownissues.xcl", "-cs",
- connection.getDescription()));
+ "-sce", Argument.get("sce"), "-xcl", Argument.get("xcl"),
+ "-cs", connection.getDescription()));
}
private final OfficeConnection connection = new OfficeConnection();
Modified: openoffice/trunk/main/starmath/source/detreg.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/starmath/source/detreg.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/starmath/source/detreg.cxx (original)
+++ openoffice/trunk/main/starmath/source/detreg.cxx Sun Aug 7 19:24:03 2016
@@ -37,14 +37,14 @@ using namespace ::com::sun::star::lang;
extern "C" {
-void SAL_CALL component_getImplementationEnvironment(
+SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
const sal_Char** ppEnvironmentTypeName,
uno_Environment** /*ppEnvironment*/ )
{
*ppEnvironmentTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ;
}
-void* SAL_CALL component_getFactory( const sal_Char* pImplementationName,
+SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplementationName,
void* pServiceManager,
void* /*pRegistryKey*/ )
{
Modified: openoffice/trunk/main/starmath/source/eqnolefilehdr.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/starmath/source/eqnolefilehdr.hxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/starmath/source/eqnolefilehdr.hxx (original)
+++ openoffice/trunk/main/starmath/source/eqnolefilehdr.hxx Sun Aug 7 19:24:03 2016
@@ -53,7 +53,7 @@ public:
void Write(SvStorageStream *pS);
};
-sal_Bool GetMathTypeVersion( SotStorage* pStor, sal_uInt8 &nVersion );
+SAL_DLLPUBLIC_EXPORT sal_Bool GetMathTypeVersion( SotStorage* pStor, sal_uInt8 &nVersion );
#endif
Modified: openoffice/trunk/main/starmath/source/register.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/starmath/source/register.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/starmath/source/register.cxx (original)
+++ openoffice/trunk/main/starmath/source/register.cxx Sun Aug 7 19:24:03 2016
@@ -107,14 +107,14 @@ extern Reference< XInterface > SAL_CALL
extern "C" {
-void SAL_CALL component_getImplementationEnvironment(
+SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
const sal_Char** ppEnvironmentTypeName,
uno_Environment** /*ppEnvironment*/ )
{
*ppEnvironmentTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ;
}
-void* SAL_CALL component_getFactory( const sal_Char* pImplementationName,
+SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplementationName,
void* pServiceManager,
void* /*pRegistryKey*/ )
{
Modified: openoffice/trunk/main/starmath/source/smdetect.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/starmath/source/smdetect.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/starmath/source/smdetect.cxx (original)
+++ openoffice/trunk/main/starmath/source/smdetect.cxx Sun Aug 7 19:24:03 2016
@@ -25,17 +25,13 @@
#include "precompiled_starmath.hxx"
#include "smdetect.hxx"
-
-//#include <framework/interaction.hxx>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/frame/XFrame.hpp>
#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/awt/XWindow.hpp>
#include <com/sun/star/lang/XUnoTunnel.hpp>
-#ifndef _UNOTOOLS_PROCESSFACTORY_HXX
#include <comphelper/processfactory.hxx>
-#endif
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/io/XInputStream.hpp>
#include <com/sun/star/task/XInteractionHandler.hpp>
@@ -45,12 +41,8 @@
#include <com/sun/star/ucb/XContent.hpp>
#include <com/sun/star/packages/zip/ZipIOException.hpp>
#include <framework/interaction.hxx>
-
-#ifndef _TOOLKIT_UNOHLP_HXX
#include <toolkit/helper/vclunohelper.hxx>
-#endif
#include <ucbhelper/simpleinteractionrequest.hxx>
-
#include <rtl/ustring.h>
#include <rtl/logfile.hxx>
#include <svl/itemset.hxx>
Modified: openoffice/trunk/main/svgio/Library_svgio.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svgio/Library_svgio.mk?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/svgio/Library_svgio.mk (original)
+++ openoffice/trunk/main/svgio/Library_svgio.mk Sun Aug 7 19:24:03 2016
@@ -32,11 +32,14 @@ $(eval $(call gb_Library_set_include,svg
-I$(SRCDIR)/svgio/inc \
-I$(SRCDIR)/svgio/inc/pch \
-I$(SRCDIR)/solenv/inc \
- -I$(OUTDIR)/inc/offuh \
))
-$(eval $(call gb_Library_set_defs,svgio,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_api,svgio,\
+ udkapi \
+ offapi \
+))
+
+$(eval $(call gb_Library_add_defs,svgio,\
-DSVGIO_DLLIMPLEMENTATION \
))
Modified: openoffice/trunk/main/svl/GoogleTest_svl_urihelper.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svl/GoogleTest_svl_urihelper.mk?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/svl/GoogleTest_svl_urihelper.mk (original)
+++ openoffice/trunk/main/svl/GoogleTest_svl_urihelper.mk Sun Aug 7 19:24:03 2016
@@ -43,11 +43,11 @@ $(eval $(call gb_GoogleTest_set_include,
-I$(SRCDIR)/svl/inc \
-I$(SRCDIR)/svl/inc/svl \
-I$(SRCDIR)/svl/inc/pch \
- -I$(OUTDIR)/inc/offuh \
-))
-
-$(eval $(call gb_GoogleTest_set_ldflags,svl_urihelper,\
- $$(LDFLAGS) \
))
+$(eval $(call gb_GoogleTest_add_api,svl_urihelper,\
+ offapi \
+ udkapi \
+))
+
# vim: set noet sw=4 ts=4:
Modified: openoffice/trunk/main/svl/JunitTest_svl_complex.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svl/JunitTest_svl_complex.mk?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/svl/JunitTest_svl_complex.mk (original)
+++ openoffice/trunk/main/svl/JunitTest_svl_complex.mk Sun Aug 7 19:24:03 2016
@@ -21,7 +21,7 @@
-$(eval $(call gb_JunitTest_JunitTest,svl_complex))
+$(eval $(call gb_JunitTest_JunitTest,svl_complex,SRCDIR))
$(eval $(call gb_JunitTest_set_defs,svl_complex,\
$$(DEFS) \
Modified: openoffice/trunk/main/svl/Library_fsstorage.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svl/Library_fsstorage.mk?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/svl/Library_fsstorage.mk (original)
+++ openoffice/trunk/main/svl/Library_fsstorage.mk Sun Aug 7 19:24:03 2016
@@ -33,10 +33,14 @@ $(eval $(call gb_Library_set_include,fss
-I$(SRCDIR)/svl/inc/svl \
-I$(SRCDIR)/svl/source/inc \
-I$(SRCDIR)/svl/inc/pch \
- -I$(OUTDIR)/inc/offuh \
-I$(OUTDIR)/inc \
))
+$(eval $(call gb_Library_add_api,fsstorage,\
+ udkapi \
+ offapi \
+))
+
$(eval $(call gb_Library_add_linked_libs,fsstorage,\
comphelper \
cppu \
Modified: openoffice/trunk/main/svl/Library_passwordcontainer.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svl/Library_passwordcontainer.mk?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/svl/Library_passwordcontainer.mk (original)
+++ openoffice/trunk/main/svl/Library_passwordcontainer.mk Sun Aug 7 19:24:03 2016
@@ -33,10 +33,14 @@ $(eval $(call gb_Library_set_include,pas
-I$(SRCDIR)/svl/inc/svl \
-I$(SRCDIR)/svl/source/inc \
-I$(SRCDIR)/svl/inc/pch \
- -I$(OUTDIR)/inc/offuh \
-I$(OUTDIR)/inc \
))
+$(eval $(call gb_Library_add_api,passwordcontainer,\
+ udkapi \
+ offapi \
+))
+
$(eval $(call gb_Library_add_linked_libs,passwordcontainer,\
cppu \
cppuhelper \
Modified: openoffice/trunk/main/svl/Library_svl.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svl/Library_svl.mk?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/svl/Library_svl.mk (original)
+++ openoffice/trunk/main/svl/Library_svl.mk Sun Aug 7 19:24:03 2016
@@ -33,11 +33,14 @@ $(eval $(call gb_Library_set_include,svl
$$(SOLARINC) \
-I$(SRCDIR)/svl/source/inc \
-I$(SRCDIR)/svl/inc/pch \
- -I$(OUTDIR)/inc/offuh \
))
-$(eval $(call gb_Library_set_defs,svl,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_api,svl,\
+ udkapi \
+ offapi \
+))
+
+$(eval $(call gb_Library_add_defs,svl,\
-DSVL_DLLIMPLEMENTATION \
))
Modified: openoffice/trunk/main/svl/prj/build.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svl/prj/build.lst?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/svl/prj/build.lst (original)
+++ openoffice/trunk/main/svl/prj/build.lst Sun Aug 7 19:24:03 2016
@@ -1,2 +1,2 @@
-sl svl : L10N:l10n rsc offuh ucbhelper unotools cppu cppuhelper comphelper sal sot LIBXSLT:libxslt NULL
+sl svl : L10N:l10n rsc offapi ucbhelper unotools cppu cppuhelper comphelper sal sot LIBXSLT:libxslt NULL
sl svl\prj nmake - all svl_prj NULL
Modified: openoffice/trunk/main/svtools/Executable_bmp.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svtools/Executable_bmp.mk?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/svtools/Executable_bmp.mk (original)
+++ openoffice/trunk/main/svtools/Executable_bmp.mk Sun Aug 7 19:24:03 2016
@@ -32,7 +32,11 @@ $(eval $(call gb_Executable_set_include,
-I$(SRCDIR)/svtools/inc/svtools \
-I$(SRCDIR)/svtools/source/inc \
-I$(SRCDIR)/svtools/inc/pch \
- -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Executable_add_api,bmp,\
+ udkapi \
+ offapi \
))
$(eval $(call gb_Executable_add_linked_libs,bmp,\
Modified: openoffice/trunk/main/svtools/Executable_bmpsum.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svtools/Executable_bmpsum.mk?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/svtools/Executable_bmpsum.mk (original)
+++ openoffice/trunk/main/svtools/Executable_bmpsum.mk Sun Aug 7 19:24:03 2016
@@ -26,12 +26,16 @@ $(eval $(call gb_Executable_Executable,b
$(eval $(call gb_Executable_set_include,bmpsum,\
$$(INCLUDE) \
-I$(OUTDIR)/inc/ \
- -I$(OUTDIR)/inc/offuh/ \
-I$(SRCDIR)/svtools/inc/ \
-I$(SRCDIR)/svtools/inc/pch/ \
-I$(SRCDIR)/svtools/inc/svtools/ \
))
+$(eval $(call gb_Executable_add_api,bmpsum,\
+ udkapi \
+ offapi \
+))
+
$(eval $(call gb_Executable_add_linked_libs,bmpsum,\
sal \
stl \
Modified: openoffice/trunk/main/svtools/Executable_g2g.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svtools/Executable_g2g.mk?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/svtools/Executable_g2g.mk (original)
+++ openoffice/trunk/main/svtools/Executable_g2g.mk Sun Aug 7 19:24:03 2016
@@ -26,12 +26,16 @@ $(eval $(call gb_Executable_Executable,g
$(eval $(call gb_Executable_set_include,g2g,\
$$(INCLUDE) \
-I$(OUTDIR)/inc/ \
- -I$(OUTDIR)/inc/offuh/ \
-I$(SRCDIR)/svtools/inc/ \
-I$(SRCDIR)/svtools/inc/pch/ \
-I$(SRCDIR)/svtools/inc/svtools/ \
))
+$(eval $(call gb_Executable_add_api,g2g,\
+ udkapi \
+ offapi \
+))
+
$(eval $(call gb_Executable_add_linked_libs,g2g,\
jvmfwk \
sal \
Modified: openoffice/trunk/main/svtools/JunitTest_svtools_unoapi.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svtools/JunitTest_svtools_unoapi.mk?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/svtools/JunitTest_svtools_unoapi.mk (original)
+++ openoffice/trunk/main/svtools/JunitTest_svtools_unoapi.mk Sun Aug 7 19:24:03 2016
@@ -21,7 +21,7 @@
-$(eval $(call gb_JunitTest_JunitTest,svtools_unoapi))
+$(eval $(call gb_JunitTest_JunitTest,svtools_unoapi,SRCDIR))
$(eval $(call gb_JunitTest_set_defs,svtools_unoapi,\
$$(DEFS) \
Modified: openoffice/trunk/main/svtools/Library_hatchwindowfactory.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svtools/Library_hatchwindowfactory.mk?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/svtools/Library_hatchwindowfactory.mk (original)
+++ openoffice/trunk/main/svtools/Library_hatchwindowfactory.mk Sun Aug 7 19:24:03 2016
@@ -32,10 +32,14 @@ $(eval $(call gb_Library_set_include,hat
-I$(SRCDIR)/svtools/inc/pch/ \
-I$(OUTDIR)/inc/ \
-I$(SRCDIR)/svtools/inc \
- -I$(OUTDIR)/inc/offuh \
-I$(OUTDIR)/inc \
))
+$(eval $(call gb_Library_add_api,hatchwindowfactory,\
+ udkapi \
+ offapi \
+))
+
$(eval $(call gb_Library_add_linked_libs,hatchwindowfactory,\
cppu \
cppuhelper \
Modified: openoffice/trunk/main/svtools/Library_svt.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svtools/Library_svt.mk?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/svtools/Library_svt.mk (original)
+++ openoffice/trunk/main/svtools/Library_svt.mk Sun Aug 7 19:24:03 2016
@@ -29,6 +29,11 @@ $(eval $(call gb_Library_add_precompiled
$(eval $(call gb_Library_set_componentfile,svt,svtools/util/svt))
+$(eval $(call gb_Library_add_api,svt,\
+ udkapi \
+ offapi \
+))
+
$(eval $(call gb_Library_set_include,svt,\
-I$(OUTDIR)/inc/external/jpeg \
$$(INCLUDE) \
@@ -39,11 +44,9 @@ $(eval $(call gb_Library_set_include,svt
-I$(SRCDIR)/svtools/inc/svtools \
-I$(SRCDIR)/svtools/source/inc \
-I$(SRCDIR)/svtools/inc/pch \
- -I$(OUTDIR)/inc/offuh \
))
-$(eval $(call gb_Library_set_defs,svt,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,svt,\
-DSVT_DLLIMPLEMENTATION \
))
@@ -54,7 +57,6 @@ $(eval $(call gb_Library_add_linked_libs
cppuhelper \
i18nisolang1 \
i18nutil \
- icuuc \
jvmfwk \
sal \
sot \
@@ -69,32 +71,10 @@ $(eval $(call gb_Library_add_linked_libs
$(gb_STDLIBS) \
))
-ifeq ($(SYSTEM_JPEG),YES)
-$(eval $(call gb_Library_add_linked_libs,svt,\
- jpeg \
-))
-$(eval $(call gb_Library_set_ldflags,svt,\
- $$(filter-out -L/usr/lib/jvm%,$$(LDFLAGS)) \
-))
-ifeq ($(OS),FREEBSD)
-# JDK jpeg library on FreeBSD lives under ${JAVA_HOME}/jre/lib/${ARCH}/
-$(eval $(call gb_Library_set_ldflags,svt,\
- $$(filter-out -L$$(JAVA_HOME)/jre/lib/%,$$(LDFLAGS)) \
-))
-endif
-ifeq ($(GUIBASE),os2)
-# YD FIXME above is not working... needs ldflags hack...
-$(eval $(call gb_Library_set_ldflags,svt,\
- $$(LDFLAGS) \
- -ljpeg \
-))
-endif
-
-else
-$(eval $(call gb_Library_add_linked_static_libs,svt,\
- jpeglib \
-))
-endif
+$(call gb_Library_use_externals,svt,\
+ icuuc \
+ jpeg \
+)
$(eval $(call gb_Library_add_exception_objects,svt,\
svtools/source/brwbox/brwbox1 \
Modified: openoffice/trunk/main/svtools/prj/build.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svtools/prj/build.lst?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/svtools/prj/build.lst (original)
+++ openoffice/trunk/main/svtools/prj/build.lst Sun Aug 7 19:24:03 2016
@@ -1,2 +1,2 @@
-st svtools : L10N:l10n svl offuh toolkit ucbhelper unotools JPEG:jpeg cppu cppuhelper comphelper sal sot jvmfwk LIBXSLT:libxslt NULL
+st svtools : L10N:l10n svl offapi toolkit ucbhelper unotools JPEG:jpeg cppu cppuhelper comphelper sal sot jvmfwk LIBXSLT:libxslt NULL
st svtools\prj nmake - all st_prj NULL
Modified: openoffice/trunk/main/svtools/source/uno/contextmenuhelper.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svtools/source/uno/contextmenuhelper.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/svtools/source/uno/contextmenuhelper.cxx (original)
+++ openoffice/trunk/main/svtools/source/uno/contextmenuhelper.cxx Sun Aug 7 19:24:03 2016
@@ -45,7 +45,7 @@
#include <vos/mutex.hxx>
#include <vcl/svapp.hxx>
#include <vcl/image.hxx>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
#include <toolkit/awt/vclxwindow.hxx>
#include <toolkit/awt/vclxmenu.hxx>
Modified: openoffice/trunk/main/svtools/source/uno/toolboxcontroller.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svtools/source/uno/toolboxcontroller.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/svtools/source/uno/toolboxcontroller.cxx (original)
+++ openoffice/trunk/main/svtools/source/uno/toolboxcontroller.cxx Sun Aug 7 19:24:03 2016
@@ -33,7 +33,7 @@
#include <vcl/svapp.hxx>
#include <svtools/imgdef.hxx>
#include <svtools/miscopt.hxx>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
#include <vcl/toolbox.hxx>
//shizhobo
#include <com/sun/star/beans/PropertyAttribute.hpp>
Modified: openoffice/trunk/main/svx/JunitTest_svx_unoapi.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svx/JunitTest_svx_unoapi.mk?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/svx/JunitTest_svx_unoapi.mk (original)
+++ openoffice/trunk/main/svx/JunitTest_svx_unoapi.mk Sun Aug 7 19:24:03 2016
@@ -21,7 +21,7 @@
-$(eval $(call gb_JunitTest_JunitTest,svx_unoapi))
+$(eval $(call gb_JunitTest_JunitTest,svx_unoapi,SRCDIR))
$(eval $(call gb_JunitTest_set_defs,svx_unoapi,\
$$(DEFS) \
Modified: openoffice/trunk/main/svx/Library_svx.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svx/Library_svx.mk?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/svx/Library_svx.mk (original)
+++ openoffice/trunk/main/svx/Library_svx.mk Sun Aug 7 19:24:03 2016
@@ -30,11 +30,14 @@ $(eval $(call gb_Library_set_include,svx
-I$(SRCDIR)/svx/source/inc \
-I$(SRCDIR)/svx/inc/pch \
$$(SOLARINC) \
- -I$(OUTDIR)/inc/offuh \
))
-$(eval $(call gb_Library_set_defs,svx,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_api,svx,\
+ udkapi \
+ offapi \
+))
+
+$(eval $(call gb_Library_add_defs,svx,\
-DSVX_DLLIMPLEMENTATION \
-DBOOST_SPIRIT_USE_OLD_NAMESPACE \
))
@@ -50,7 +53,6 @@ $(eval $(call gb_Library_add_linked_libs
fwe \
fwk \
i18nisolang1 \
- icuuc \
sal \
sfx \
sot \
@@ -69,6 +71,8 @@ $(eval $(call gb_Library_add_linked_libs
$(gb_STDLIBS) \
))
+$(call gb_Library_use_external,svx,icuuc)
+
$(eval $(call gb_Library_add_exception_objects,svx,\
svx/source/accessibility/AccessibleControlShape \
svx/source/accessibility/AccessibleEmptyEditSource \
Modified: openoffice/trunk/main/svx/Library_svxcore.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svx/Library_svxcore.mk?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/svx/Library_svxcore.mk (original)
+++ openoffice/trunk/main/svx/Library_svxcore.mk Sun Aug 7 19:24:03 2016
@@ -25,19 +25,23 @@ $(eval $(call gb_Library_Library,svxcore
$(eval $(call gb_Library_set_componentfile,svxcore,svx/util/svxcore))
-$(eval $(call gb_Library_add_sdi_headers,svx,svx/sdi/svxslots))
+$(eval $(call gb_Library_add_sdi_headers,svxcore,svx/sdi/svxslots))
$(eval $(call gb_Library_add_package_headers,svxcore,\
svx_inc \
svx_sdi \
))
+$(eval $(call gb_Library_add_api,svxcore,\
+ udkapi \
+ offapi \
+))
+
$(eval $(call gb_Library_set_include,svxcore,\
-I$(SRCDIR)/svx/inc \
-I$(SRCDIR)/svx/inc/pch \
-I$(SRCDIR)/svx/source/inc \
$$(INCLUDE) \
- -I$(OUTDIR)/inc/offuh \
-I$(WORKDIR)/SdiTarget/svx/sdi \
))
@@ -47,8 +51,7 @@ $(eval $(call gb_Library_set_include,svx
#CFLAGS+= -DUNICODE -D_UNICODE
#.ENDIF
-$(eval $(call gb_Library_set_defs,svxcore,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,svxcore,\
-DSVX_DLLIMPLEMENTATION \
-DBOOST_SPIRIT_USE_OLD_NAMESPACE \
))
@@ -64,7 +67,6 @@ $(eval $(call gb_Library_add_linked_libs
editeng \
fwe \
i18nisolang1 \
- icuuc \
lng \
sal \
sfx \
@@ -82,6 +84,8 @@ $(eval $(call gb_Library_add_linked_libs
$(gb_STDLIBS) \
))
+$(call gb_Library_use_external,svxcore,icuuc)
+
$(eval $(call gb_Library_add_exception_objects,svxcore,\
svx/source/core/coreservices \
svx/source/customshapes/EnhancedCustomShape2d \
Modified: openoffice/trunk/main/svx/Library_textconversiondlgs.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svx/Library_textconversiondlgs.mk?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/svx/Library_textconversiondlgs.mk (original)
+++ openoffice/trunk/main/svx/Library_textconversiondlgs.mk Sun Aug 7 19:24:03 2016
@@ -29,11 +29,11 @@ $(eval $(call gb_Library_set_include,tex
-I$(SRCDIR)/svx/inc \
-I$(SRCDIR)/svx/inc/pch \
$$(INCLUDE) \
- -I$(OUTDIR)/inc/offuh \
))
-$(eval $(call gb_Library_set_defs,textconversiondlgs,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_api,textconversiondlgs,\
+ udkapi \
+ offapi \
))
$(eval $(call gb_Library_add_linked_libs,textconversiondlgs,\
Modified: openoffice/trunk/main/svx/source/accessibility/ChildrenManagerImpl.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svx/source/accessibility/ChildrenManagerImpl.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/svx/source/accessibility/ChildrenManagerImpl.cxx (original)
+++ openoffice/trunk/main/svx/source/accessibility/ChildrenManagerImpl.cxx Sun Aug 7 19:24:03 2016
@@ -40,9 +40,7 @@
#ifndef _SVX_ACCESSIBILITY_SVX_SHAPE_TYPES_HXX
#include <svx/SvxShapeTypes.hxx>
#endif
-#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
-#include <toolkit/unohlp.hxx>
-#endif
+#include <toolkit/helper/vclunohelper.hxx>
#ifndef _SV_WINDOW_HXX
#include <vcl/window.hxx>
Modified: openoffice/trunk/main/svx/source/dialog/docrecovery.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svx/source/dialog/docrecovery.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/svx/source/dialog/docrecovery.cxx (original)
+++ openoffice/trunk/main/svx/source/dialog/docrecovery.cxx Sun Aug 7 19:24:03 2016
@@ -41,7 +41,7 @@
#include <vcl/scrbar.hxx>
#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
#endif
//#include "com/sun/star/lang/XMultiServiceFactory.hpp"
Modified: openoffice/trunk/main/svx/source/dialog/srchdlg.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svx/source/dialog/srchdlg.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/svx/source/dialog/srchdlg.cxx (original)
+++ openoffice/trunk/main/svx/source/dialog/srchdlg.cxx Sun Aug 7 19:24:03 2016
@@ -49,7 +49,7 @@
#include <svl/intitem.hxx>
#include <sfx2/app.hxx>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
#define _SVX_SRCHDLG_CXX
#include "svx/srchdlg.hxx"
Modified: openoffice/trunk/main/svx/source/form/fmPropBrw.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svx/source/form/fmPropBrw.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/svx/source/form/fmPropBrw.cxx (original)
+++ openoffice/trunk/main/svx/source/form/fmPropBrw.cxx Sun Aug 7 19:24:03 2016
@@ -64,7 +64,7 @@
#include <sfx2/objitem.hxx>
#include <sfx2/objsh.hxx>
#include <sfx2/viewfrm.hxx>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
#include <tools/debug.hxx>
#include <tools/diagnose_ex.h>
#include <tools/shl.hxx>
Modified: openoffice/trunk/main/svx/source/form/fmtools.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svx/source/form/fmtools.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/svx/source/form/fmtools.cxx (original)
+++ openoffice/trunk/main/svx/source/form/fmtools.cxx Sun Aug 7 19:24:03 2016
@@ -86,7 +86,7 @@
#include <sfx2/bindings.hxx>
#include <svl/eitem.hxx>
#include <svl/stritem.hxx>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
#include <tools/debug.hxx>
#include <tools/string.hxx>
#include <vcl/stdtext.hxx>
Modified: openoffice/trunk/main/svx/source/unodraw/unoshap2.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svx/source/unodraw/unoshap2.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/svx/source/unodraw/unoshap2.cxx (original)
+++ openoffice/trunk/main/svx/source/unodraw/unoshap2.cxx Sun Aug 7 19:24:03 2016
@@ -1627,7 +1627,7 @@ uno::Sequence< OUString > SAL_CALL SvxSh
#include <sfx2/fcontnr.hxx>
#endif
-#include "toolkit/unohlp.hxx"
+#include "toolkit/helper/vclunohelper.hxx"
//----------------------------------------------------------------------
SvxGraphicObject::SvxGraphicObject( SdrObject* pObj ) throw()
Modified: openoffice/trunk/main/svx/source/unodraw/unoshape.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svx/source/unodraw/unoshape.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/svx/source/unodraw/unoshape.cxx (original)
+++ openoffice/trunk/main/svx/source/unodraw/unoshape.cxx Sun Aug 7 19:24:03 2016
@@ -41,7 +41,7 @@
#include <comphelper/extract.hxx>
#include "svx/shapepropertynotifier.hxx"
#include <comphelper/serviceinfohelper.hxx>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
#include <comphelper/serviceinfohelper.hxx>
#include <rtl/uuid.h>
#include <rtl/memory.h>
Modified: openoffice/trunk/main/svx/source/xoutdev/xattrbmp.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svx/source/xoutdev/xattrbmp.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/svx/source/xoutdev/xattrbmp.cxx (original)
+++ openoffice/trunk/main/svx/source/xoutdev/xattrbmp.cxx Sun Aug 7 19:24:03 2016
@@ -28,7 +28,7 @@
#include <vcl/window.hxx>
#include <vcl/virdev.hxx>
#include <vcl/bitmapex.hxx>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
#include <svl/style.hxx>
#include <editeng/memberids.hrc>
#include <svx/dialogs.hrc>
Modified: openoffice/trunk/main/svx/workben/msview/msview.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svx/workben/msview/msview.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/svx/workben/msview/msview.cxx (original)
+++ openoffice/trunk/main/svx/workben/msview/msview.cxx Sun Aug 7 19:24:03 2016
@@ -50,7 +50,7 @@
#include <svtools/svmedit.hxx>
#include <sfx2/filedlghelper.hxx>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
#include <tools/stream.hxx>
#include <tools/resmgr.hxx>
Modified: openoffice/trunk/main/sw/GoogleTest_sw_bigpointerarray.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/GoogleTest_sw_bigpointerarray.mk?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/sw/GoogleTest_sw_bigpointerarray.mk (original)
+++ openoffice/trunk/main/sw/GoogleTest_sw_bigpointerarray.mk Sun Aug 7 19:24:03 2016
@@ -44,8 +44,4 @@ $(eval $(call gb_GoogleTest_set_include,
-I$(OUTDIR)/inc \
))
-$(eval $(call gb_GoogleTest_set_ldflags,sw_bigpointerarray,\
- $$(LDFLAGS) \
-))
-
# vim: set noet sw=4 ts=4:
Modified: openoffice/trunk/main/sw/JunitTest_sw_complex.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/JunitTest_sw_complex.mk?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/sw/JunitTest_sw_complex.mk (original)
+++ openoffice/trunk/main/sw/JunitTest_sw_complex.mk Sun Aug 7 19:24:03 2016
@@ -21,7 +21,7 @@
-$(eval $(call gb_JunitTest_JunitTest,sw_complex))
+$(eval $(call gb_JunitTest_JunitTest,sw_complex,SRCDIR))
$(eval $(call gb_JunitTest_set_defs,sw_complex,\
$$(DEFS) \
Modified: openoffice/trunk/main/sw/JunitTest_sw_unoapi.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/JunitTest_sw_unoapi.mk?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/sw/JunitTest_sw_unoapi.mk (original)
+++ openoffice/trunk/main/sw/JunitTest_sw_unoapi.mk Sun Aug 7 19:24:03 2016
@@ -21,7 +21,7 @@
-$(eval $(call gb_JunitTest_JunitTest,sw_unoapi))
+$(eval $(call gb_JunitTest_JunitTest,sw_unoapi,SRCDIR))
$(eval $(call gb_JunitTest_set_defs,sw_unoapi,\
$$(DEFS) \
Modified: openoffice/trunk/main/sw/Library_msword.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/Library_msword.mk?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/sw/Library_msword.mk (original)
+++ openoffice/trunk/main/sw/Library_msword.mk Sun Aug 7 19:24:03 2016
@@ -34,12 +34,12 @@ $(eval $(call gb_Library_set_include,msw
-I$(WORKDIR)/inc/sw/sdi \
-I$(WORKDIR)/Misc/sw/ \
$$(INCLUDE) \
- -I$(OUTDIR)/inc/offuh \
-I$(OUTDIR)/inc/sw \
))
-$(eval $(call gb_Library_set_defs,msword,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_api,msword,\
+ udkapi \
+ offapi \
))
$(eval $(call gb_Library_add_linked_libs,msword,\
@@ -50,7 +50,6 @@ $(eval $(call gb_Library_add_linked_libs
editeng \
i18nisolang1 \
i18nutil \
- icuuc \
msfilter \
sal \
sfx \
@@ -70,6 +69,8 @@ $(eval $(call gb_Library_add_linked_libs
$(gb_STDLIBS) \
))
+$(call gb_Library_use_external,msword,icuuc)
+
$(eval $(call gb_Library_add_exception_objects,msword,\
sw/source/filter/rtf/rtffld \
sw/source/filter/rtf/rtffly \
Modified: openoffice/trunk/main/sw/Library_sw.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/Library_sw.mk?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/sw/Library_sw.mk (original)
+++ openoffice/trunk/main/sw/Library_sw.mk Sun Aug 7 19:24:03 2016
@@ -38,12 +38,15 @@ $(eval $(call gb_Library_set_include,sw,
-I$(WORKDIR)/SdiTarget/sw/sdi \
-I$(WORKDIR)/Misc/sw/ \
$$(INCLUDE) \
- -I$(OUTDIR)/inc/offuh \
-I$(OUTDIR)/inc \
))
-$(eval $(call gb_Library_set_defs,sw,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_api,sw,\
+ udkapi \
+ offapi \
+))
+
+$(eval $(call gb_Library_add_defs,sw,\
-DSW_DLLIMPLEMENTATION \
))
@@ -57,7 +60,6 @@ $(eval $(call gb_Library_add_linked_libs
editeng \
i18nisolang1 \
i18nutil \
- icuuc \
lng \
sal \
salhelper \
@@ -69,6 +71,7 @@ $(eval $(call gb_Library_add_linked_libs
svt \
svx \
svxcore \
+ swd \
ootk \
tl \
ucbhelper \
@@ -80,6 +83,8 @@ $(eval $(call gb_Library_add_linked_libs
$(gb_STDLIBS) \
))
+$(call gb_Library_use_external,sw,icuuc)
+
$(eval $(call gb_Library_add_exception_objects,sw,\
sw/source/core/SwNumberTree/SwNodeNum \
sw/source/core/SwNumberTree/SwNumberTree \
@@ -472,7 +477,6 @@ $(eval $(call gb_Library_add_exception_o
sw/source/filter/ascii/wrtasc \
sw/source/filter/basflt/docfact \
sw/source/filter/basflt/fltini \
- sw/source/filter/basflt/iodetect \
sw/source/filter/basflt/shellio \
sw/source/filter/html/SwAppletImpl \
sw/source/filter/html/css1atr \
Modified: openoffice/trunk/main/sw/Library_swd.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/Library_swd.mk?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/sw/Library_swd.mk (original)
+++ openoffice/trunk/main/sw/Library_swd.mk Sun Aug 7 19:24:03 2016
@@ -34,11 +34,15 @@ $(eval $(call gb_Library_set_include,swd
-I$(SRCDIR)/sw/source/core/inc \
-I$(SRCDIR)/sw/source/filter/inc \
-I$(SRCDIR)/sw/source/ui/inc \
- -I$(OUTDIR)/inc/offuh \
))
-$(eval $(call gb_Library_set_defs,swd,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_api,swd,\
+ udkapi \
+ offapi \
+))
+
+$(eval $(call gb_Library_add_defs,swd,\
+ -DSWD_DLLIMPLEMENTATION \
))
$(eval $(call gb_Library_add_linked_libs,swd,\
@@ -59,7 +63,6 @@ $(eval $(call gb_Library_add_linked_libs
))
$(eval $(call gb_Library_add_exception_objects,swd,\
- sw/source/core/except/errhdl \
sw/source/filter/basflt/iodetect \
sw/source/ui/uno/detreg \
sw/source/ui/uno/swdet2 \
Modified: openoffice/trunk/main/sw/Library_swui.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/Library_swui.mk?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/sw/Library_swui.mk (original)
+++ openoffice/trunk/main/sw/Library_swui.mk Sun Aug 7 19:24:03 2016
@@ -32,11 +32,11 @@ $(eval $(call gb_Library_set_include,swu
-I$(WORKDIR)/SdiTarget/sw/sdi \
-I$(WORKDIR)/Misc/sw \
$$(INCLUDE) \
- -I$(OUTDIR)/inc/offuh \
))
-$(eval $(call gb_Library_set_defs,swui,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_api,swui,\
+ udkapi \
+ offapi \
))
$(eval $(call gb_Library_add_linked_libs,swui,\
@@ -56,6 +56,7 @@ $(eval $(call gb_Library_add_linked_libs
svx \
svxcore \
sw \
+ swd \
ootk \
tl \
ucbhelper \
Modified: openoffice/trunk/main/sw/Library_vbaswobj.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/Library_vbaswobj.mk?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/sw/Library_vbaswobj.mk (original)
+++ openoffice/trunk/main/sw/Library_vbaswobj.mk Sun Aug 7 19:24:03 2016
@@ -33,10 +33,15 @@ $(eval $(call gb_Library_set_include,vba
-I$(SRCDIR)/sw/inc \
-I$(WORKDIR)/Misc/sw/ \
$$(INCLUDE) \
- -I$(OUTDIR)/inc/offuh \
-I$(OUTDIR)/inc/ \
))
+$(eval $(call gb_Library_add_api,vbaswobj,\
+ udkapi \
+ offapi \
+ oovbaapi \
+))
+
$(eval $(call gb_Library_add_linked_libs,vbaswobj,\
comphelper \
cppu \
@@ -109,12 +114,4 @@ $(eval $(call gb_Library_add_exception_o
sw/source/ui/vba/wordvbahelper \
))
-ifeq ($(OS),LINUX)
-$(eval $(call gb_Library_set_ldflags,vbaswobj,\
- $$(LDFLAGS) \
- -Wl$(COMMA)-O1 \
- -Wl$(COMMA)-z$(COMMA)noexecstack \
-))
-endif
-
# vim: set noet sw=4 ts=4:
Modified: openoffice/trunk/main/sw/inc/iodetect.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/inc/iodetect.hxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/sw/inc/iodetect.hxx (original)
+++ openoffice/trunk/main/sw/inc/iodetect.hxx Sun Aug 7 19:24:03 2016
@@ -30,7 +30,7 @@
#include <osl/endian.h>
#include <errhdl.hxx> // for ASSERT
#include <tools/string.hxx>
-#include <swdllapi.h>
+#include <swddllapi.h>
#define FILTER_RTF "RTF" // RTF-Filter
#define sRtfWH "WH_RTF"
@@ -82,7 +82,7 @@ enum ReaderWriterEnum {
MAXFILTER
};
-extern SwIoDetect aFilterDetect[];
+extern SWD_DLLPUBLIC SwIoDetect aFilterDetect[];
// Die folgende Klasse ist ein Wrappe fuer die Basic-I/O-Funktionen
// des Writer 3.0. Alles ist statisch. Alle u.a. Filternamen sind die
@@ -93,13 +93,15 @@ class SwIoSystem
{
public:
// suche ueber den internen FormatNamen den Filtereintrag
- SW_DLLPUBLIC static const SfxFilter* GetFilterOfFormat( const String& rFormat,
+ SWD_DLLPUBLIC static const SfxFilter*
+ GetFilterOfFormat( const String& rFormat,
const SfxFilterContainer* pCnt = 0 );
// Feststellen des zu verwendenden Filters fuer die uebergebene
// Datei. Der Filtername wird zurueckgeliefert. Konnte kein Filter
// zurueckgeliefert werden, wird der Name des ASCII-Filters geliefert!
- static const SfxFilter* GetFileFilter( const String& rFileName,
+ SWD_DLLPUBLIC static const SfxFilter*
+ GetFileFilter( const String& rFileName,
const String& rPrefFltName,
SfxMedium* pMedium = 0 );
@@ -111,13 +113,15 @@ public:
static sal_Bool IsValidStgFilter( SotStorage& , const SfxFilter& );
static sal_Bool IsValidStgFilter( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& rStg, const SfxFilter& rFilter);
- static bool IsDetectableText( const sal_Char* pBuf, sal_uLong &rLen,
+ SWD_DLLPUBLIC static bool
+ IsDetectableText( const sal_Char* pBuf, sal_uLong &rLen,
CharSet *pCharSet=0, bool *pSwap=0, LineEnd *pLineEnd=0, bool bEncodedFilter = false );
// static bool IsDetectableW4W(const String& rFileName, const String& rUserData);
static const SfxFilter* GetTextFilter( const sal_Char* pBuf, sal_uLong nLen );
- static const String GetSubStorageName( const SfxFilter& rFltr );
+ SWD_DLLPUBLIC static const String
+ GetSubStorageName( const SfxFilter& rFltr );
};
#endif
Modified: openoffice/trunk/main/sw/inc/pch/precompiled_sw.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/inc/pch/precompiled_sw.hxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/sw/inc/pch/precompiled_sw.hxx (original)
+++ openoffice/trunk/main/sw/inc/pch/precompiled_sw.hxx Sun Aug 7 19:24:03 2016
@@ -833,7 +833,6 @@
#include "sys/types.h"
#include "toolkit/helper/vclunohelper.hxx"
-#include "toolkit/unohlp.hxx"
#include "tools/bigint.hxx"
#include "tools/cachestr.hxx"
Modified: openoffice/trunk/main/sw/source/filter/basflt/iodetect.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/filter/basflt/iodetect.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/filter/basflt/iodetect.cxx (original)
+++ openoffice/trunk/main/sw/source/filter/basflt/iodetect.cxx Sun Aug 7 19:24:03 2016
@@ -197,9 +197,9 @@ sal_Bool SwIoSystem::IsValidStgFilter(So
void TerminateBuffer(sal_Char *pBuffer, sal_uLong nBytesRead, sal_uLong nBufferLen)
{
- ASSERT(nBytesRead <= nBufferLen - 2,
+ OSL_ENSURE(nBytesRead <= nBufferLen - 2,
"what you read must be less than the max + null termination");
- ASSERT(!(nBufferLen & 0x00000001), "nMaxReadBuf must be an even number");
+ OSL_ENSURE(!(nBufferLen & 0x00000001),"nMaxReadBuf must be an even number");
if (nBytesRead <= nBufferLen - 2)
{
pBuffer[nBytesRead] = '\0';
Modified: openoffice/trunk/main/sw/source/ui/dbui/dbtablepreviewdialog.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/dbui/dbtablepreviewdialog.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/dbui/dbtablepreviewdialog.cxx (original)
+++ openoffice/trunk/main/sw/source/ui/dbui/dbtablepreviewdialog.cxx Sun Aug 7 19:24:03 2016
@@ -36,7 +36,7 @@
#include <com/sun/star/frame/XDispatchProvider.hpp>
#include <com/sun/star/frame/XFrame.hpp>
#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
#endif
#include <dbui.hrc>
Modified: openoffice/trunk/main/sw/source/ui/envelp/mailmrge.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/envelp/mailmrge.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/envelp/mailmrge.cxx (original)
+++ openoffice/trunk/main/sw/source/ui/envelp/mailmrge.cxx Sun Aug 7 19:24:03 2016
@@ -59,7 +59,7 @@
#include <com/sun/star/sdbcx/XRowLocate.hpp>
#include <com/sun/star/sdb/XResultSetAccess.hpp>
#include <com/sun/star/sdbc/XDataSource.hpp>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
#include <comphelper/processfactory.hxx>
#include <com/sun/star/form/runtime/XFormController.hpp>
#include <cppuhelper/implbase1.hxx>
Modified: openoffice/trunk/main/sw/source/ui/uiview/view.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/uiview/view.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/uiview/view.cxx (original)
+++ openoffice/trunk/main/sw/source/ui/uiview/view.cxx Sun Aug 7 19:24:03 2016
@@ -95,7 +95,7 @@
#include <com/sun/star/frame/FrameSearchFlag.hpp>
#include <com/sun/star/scanner/ScannerContext.hpp>
#include <com/sun/star/scanner/XScannerManager.hpp>
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
#include <rtl/ustrbuf.hxx>
#include <xmloff/xmluconv.hxx>
Modified: openoffice/trunk/main/swext/mediawiki/build.xml
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/swext/mediawiki/build.xml?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/swext/mediawiki/build.xml (original)
+++ openoffice/trunk/main/swext/mediawiki/build.xml Sun Aug 7 19:24:03 2016
@@ -95,7 +95,7 @@
<jar basedir="${classes}" compress="true" jarfile="${dist}/${target}.jar">
<manifest>
<!-- FIXME: Set Class-Path correctly for the system case !-->
- <attribute name="Class-Path" value="commons-codec-1.9.jar commons-lang3-3.3.jar commons-httpclient-3.1.jar commons-logging-1.1.3.jar"/>
+ <attribute name="Class-Path" value="file:///usr/local/share/java/classes/commons-codec.jar file:///usr/local/share/java/classes/commons-lang.jar file:///usr/local/share/java/classes/commons-httpclient.jar file:///usr/local/share/java/classes/commons-logging.jar"/>
<attribute name="RegistrationClassName" value="com.sun.star.wiki.WikiEditorImpl"/>
</manifest>
</jar>
@@ -126,10 +126,6 @@
<zip destfile="${dist}/${name}.${ext}">
<fileset dir="${out}/misc/${target}/package_tmp" casesensitive="yes"/>
<fileset dir="${dist}" includes="${target}.jar" casesensitive="yes"/>
- <file file="${commons-codec-jar}"/>
- <file file="${commons-httpclient-jar}"/>
- <file file="${commons-lang-jar}"/>
- <file file="${commons-logging-jar}"/>
<zipfileset file="src/filter/odt2mediawiki.xsl" casesensitive="yes" fullpath="filter/odt2mediawiki.xsl"/>
<zipfileset file="src/filter/mediawiki.ott" casesensitive="yes" fullpath="templates/MediaWiki/mediawiki.ott"/>
<zipfileset dir="${solar.bin}/xslt/export/xsltml" casesensitive="yes" prefix="filter/math"/>
Modified: openoffice/trunk/main/toolkit/JunitTest_toolkit_complex.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/toolkit/JunitTest_toolkit_complex.mk?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/toolkit/JunitTest_toolkit_complex.mk (original)
+++ openoffice/trunk/main/toolkit/JunitTest_toolkit_complex.mk Sun Aug 7 19:24:03 2016
@@ -21,7 +21,7 @@
-$(eval $(call gb_JunitTest_JunitTest,toolkit_complex))
+$(eval $(call gb_JunitTest_JunitTest,toolkit_complex,SRCDIR))
$(eval $(call gb_JunitTest_add_jars,toolkit_complex,\
$(OUTDIR)/bin/OOoRunner.jar \
Modified: openoffice/trunk/main/toolkit/JunitTest_toolkit_unoapi.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/toolkit/JunitTest_toolkit_unoapi.mk?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/toolkit/JunitTest_toolkit_unoapi.mk (original)
+++ openoffice/trunk/main/toolkit/JunitTest_toolkit_unoapi.mk Sun Aug 7 19:24:03 2016
@@ -21,7 +21,7 @@
-$(eval $(call gb_JunitTest_JunitTest,toolkit_unoapi))
+$(eval $(call gb_JunitTest_JunitTest,toolkit_unoapi,SRCDIR))
$(eval $(call gb_JunitTest_set_defs,toolkit_unoapi,\
$$(DEFS) \
Modified: openoffice/trunk/main/toolkit/Library_tk.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/toolkit/Library_tk.mk?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/toolkit/Library_tk.mk (original)
+++ openoffice/trunk/main/toolkit/Library_tk.mk Sun Aug 7 19:24:03 2016
@@ -34,14 +34,17 @@ $(eval $(call gb_Library_set_include,oot
-I$(SRCDIR)/toolkit/inc \
-I$(SRCDIR)/toolkit/inc/pch \
-I$(SRCDIR)/toolkit/source \
- -I$(OUTDIR)/inc/offuh \
))
-$(eval $(call gb_Library_set_defs,ootk,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,ootk,\
-DTOOLKIT_DLLIMPLEMENTATION \
))
+$(eval $(call gb_Library_add_api,ootk,\
+ udkapi \
+ offapi \
+))
+
$(eval $(call gb_Library_add_linked_libs,ootk,\
comphelper \
cppu \
@@ -152,8 +155,9 @@ $(eval $(call gb_Library_add_exception_o
))
ifeq ($(GUIBASE),aqua)
-$(eval $(call gb_Library_set_cxxflags,ootk,\
- $$(CXXFLAGS) $(gb_OBJCXXFLAGS)))
+$(eval $(call gb_Library_add_cxxflags,ootk,\
+ $(gb_OBJCXXFLAGS) \
+))
endif
ifeq ($(OS),LINUX)
Modified: openoffice/trunk/main/toolkit/Package_inc.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/toolkit/Package_inc.mk?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/toolkit/Package_inc.mk (original)
+++ openoffice/trunk/main/toolkit/Package_inc.mk Sun Aug 7 19:24:03 2016
@@ -60,4 +60,3 @@ $(eval $(call gb_Package_add_file,toolki
$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/unopropertyarrayhelper.hxx,toolkit/helper/unopropertyarrayhelper.hxx))
$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/unowrapper.hxx,toolkit/helper/unowrapper.hxx))
$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/helper/vclunohelper.hxx,toolkit/helper/vclunohelper.hxx))
-$(eval $(call gb_Package_add_file,toolkit_inc,inc/toolkit/unohlp.hxx,toolkit/helper/vclunohelper.hxx))
Modified: openoffice/trunk/main/tools/Executable_mkunroll.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/tools/Executable_mkunroll.mk?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/tools/Executable_mkunroll.mk (original)
+++ openoffice/trunk/main/tools/Executable_mkunroll.mk Sun Aug 7 19:24:03 2016
@@ -30,8 +30,7 @@ $(eval $(call gb_Executable_set_include,
-I$(SRCDIR)/tools/bootstrp/ \
))
-$(eval $(call gb_Executable_set_cxxflags,mkunroll,\
- $$(CXXFLAGS) \
+$(eval $(call gb_Executable_add_defs,mkunroll,\
-D_TOOLS_STRINGLIST \
))
Modified: openoffice/trunk/main/tools/Executable_rscdep.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/tools/Executable_rscdep.mk?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/tools/Executable_rscdep.mk (original)
+++ openoffice/trunk/main/tools/Executable_rscdep.mk Sun Aug 7 19:24:03 2016
@@ -30,8 +30,7 @@ $(eval $(call gb_Executable_set_include,
-I$(SRCDIR)/tools/bootstrp/ \
))
-$(eval $(call gb_Executable_set_cxxflags,rscdep,\
- $$(CXXFLAGS) \
+$(eval $(call gb_Executable_add_defs,rscdep,\
-D_TOOLS_STRINGLIST \
))
Modified: openoffice/trunk/main/tools/Executable_so_checksum.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/tools/Executable_so_checksum.mk?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/tools/Executable_so_checksum.mk (original)
+++ openoffice/trunk/main/tools/Executable_so_checksum.mk Sun Aug 7 19:24:03 2016
@@ -30,8 +30,7 @@ $(eval $(call gb_Executable_set_include,
-I$(SRCDIR)/tools/bootstrp/ \
))
-$(eval $(call gb_Executable_set_cxxflags,so_checksum,\
- $$(CXXFLAGS) \
+$(eval $(call gb_Executable_add_defs,so_checksum,\
-D_TOOLS_STRINGLIST \
$(STLPORT_DEBUGFLAG) \
))
Modified: openoffice/trunk/main/tools/Executable_sspretty.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/tools/Executable_sspretty.mk?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/tools/Executable_sspretty.mk (original)
+++ openoffice/trunk/main/tools/Executable_sspretty.mk Sun Aug 7 19:24:03 2016
@@ -30,8 +30,7 @@ $(eval $(call gb_Executable_set_include,
-I$(SRCDIR)/tools/bootstrp/ \
))
-$(eval $(call gb_Executable_set_cxxflags,sspretty,\
- $$(CXXFLAGS) \
+$(eval $(call gb_Executable_add_defs,sspretty,\
-D_TOOLS_STRINGLIST \
$(STLPORT_DEBUGFLAG) \
))
Modified: openoffice/trunk/main/tools/GoogleTest_tools_fractiontest.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/tools/GoogleTest_tools_fractiontest.mk?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/tools/GoogleTest_tools_fractiontest.mk (original)
+++ openoffice/trunk/main/tools/GoogleTest_tools_fractiontest.mk Sun Aug 7 19:24:03 2016
@@ -40,8 +40,4 @@ $(eval $(call gb_GoogleTest_set_include,
-I$(SRCDIR)/tools/inc/pch \
))
-$(eval $(call gb_GoogleTest_set_ldflags,tools_fractiontest,\
- $$(LDFLAGS) \
-))
-
# vim: set noet sw=4 ts=4:
Modified: openoffice/trunk/main/tools/Library_tl.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/tools/Library_tl.mk?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/tools/Library_tl.mk (original)
+++ openoffice/trunk/main/tools/Library_tl.mk Sun Aug 7 19:24:03 2016
@@ -33,16 +33,19 @@ $(eval $(call gb_Library_set_include,tl,
-I$(SRCDIR)/tools/inc/pch \
-I$(SRCDIR)/solenv/inc \
-I$(SRCDIR)/solenv/inc/Xp31 \
- -I$(OUTDIR)/inc/offuh \
-I$(OUTDIR)/inc/stl \
))
-$(eval $(call gb_Library_set_defs,tl,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,tl,\
-DTOOLS_DLLIMPLEMENTATION \
-DVCL \
))
+$(eval $(call gb_Library_add_api,tl,\
+ udkapi \
+ offapi \
+))
+
$(eval $(call gb_Library_add_linked_libs,tl,\
basegfx \
comphelper \
@@ -128,24 +131,11 @@ $(eval $(call gb_Library_add_exception_o
))
endif
-ifeq ($(SYSTEM_ZLIB),YES)
-$(eval $(call gb_Library_set_cxxflags,tl,\
- $$(CXXFLAGS) \
- -DSYSTEM_ZLIB \
-))
-$(eval $(call gb_Library_add_linked_libs,tl,\
- z \
-))
-else
-$(eval $(call gb_Library_add_linked_static_libs,tl,\
- zlib \
-))
-endif
+$(call gb_Library_use_external,tl,zlib)
ifeq ($(OS),OS2)
# YD FIXME above is not working... needs ldflags hack...
-$(eval $(call gb_Library_set_ldflags,tl,\
- $$(LDFLAGS) \
+$(eval $(call gb_Library_add_libs,tl,\
-lz \
))
endif
Modified: openoffice/trunk/main/tools/StaticLibrary_ooopathutils.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/tools/StaticLibrary_ooopathutils.mk?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/tools/StaticLibrary_ooopathutils.mk (original)
+++ openoffice/trunk/main/tools/StaticLibrary_ooopathutils.mk Sun Aug 7 19:24:03 2016
@@ -44,7 +44,7 @@ $(eval $(call gb_StaticLibrary_add_excep
# Instead of this evil linking of an object from $(OUTDIR)
define StaticLibrary_ooopathutils_hack
$(call gb_StaticLibrary_get_target,ooopathutils) : $(OUTDIR)/lib/$(1)
-$$(eval $$(call gb_Deliver_add_deliverable,$(OUTDIR)/lib/$(1),$(call gb_CxxObject_get_target,tools/source/misc/pathutils)))
+$$(eval $$(call gb_Deliver_add_deliverable,$(OUTDIR)/lib/$(1),$(call gb_CxxObject_get_target,tools/source/misc/pathutils),$(1)))
$(OUTDIR)/lib/$(1) : $(call gb_CxxObject_get_target,tools/source/misc/pathutils)
$$(call gb_Deliver_deliver,$$<,$$@)
Modified: openoffice/trunk/main/tools/prj/build.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/tools/prj/build.lst?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/tools/prj/build.lst (original)
+++ openoffice/trunk/main/tools/prj/build.lst Sun Aug 7 19:24:03 2016
@@ -1,2 +1,2 @@
-tl tools : cppu external offuh vos ZLIB:zlib EXPAT:expat basegfx comphelper i18npool NULL
+tl tools : cppu external offapi vos ZLIB:zlib EXPAT:expat basegfx comphelper i18npool NULL
tl tools\prj nmake - all tl_prj NULL
Modified: openoffice/trunk/main/ucbhelper/prj/build.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/ucbhelper/prj/build.lst?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/ucbhelper/prj/build.lst (original)
+++ openoffice/trunk/main/ucbhelper/prj/build.lst Sun Aug 7 19:24:03 2016
@@ -1,7 +1,2 @@
-uh ucbhelper : offuh sal cppu cppuhelper salhelper NULL
-uh ucbhelper usr1 - all uh_mkout NULL
-uh ucbhelper\inc nmake - all uh_inc NULL
-uh ucbhelper\source\client nmake - all uh_client uh_inc NULL
-uh ucbhelper\source\provider nmake - all uh_provider uh_inc NULL
-uh ucbhelper\util nmake - all uh_util uh_client uh_provider NULL
-uh ucbhelper\workben\myucp nmake - all uh_wb_myucp uh_util NULL
+uh ucbhelper : offapi sal cppu cppuhelper salhelper NULL
+uh ucbhelper\prj nmake - all uh_prj NULL
Modified: openoffice/trunk/main/ucbhelper/prj/d.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/ucbhelper/prj/d.lst?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/ucbhelper/prj/d.lst (original)
+++ openoffice/trunk/main/ucbhelper/prj/d.lst Sun Aug 7 19:24:03 2016
@@ -1,40 +0,0 @@
-..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll
-..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%\lib*.so
-..\%__SRC%\lib\lib*.dylib %_DEST%\lib%_EXT%\lib*.dylib
-..\%__SRC%\lib\*.lib %_DEST%\lib%_EXT%\*.lib
-..\%__SRC%\misc\*.map %_DEST%\bin%_EXT%\*.map
-..\%__SRC%\misc\*.sym %_DEST%\bin%_EXT%\*.sym
-
-..\util\ucbhelper.xml %_DEST%\xml%_EXT%\ucbhelper.xml
-
-mkdir: %_DEST%\inc%_EXT%\ucbhelper
-..\inc\ucbhelper\configurationkeys.hxx %_DEST%\inc%_EXT%\ucbhelper\configurationkeys.hxx
-..\inc\ucbhelper\registerucb.hxx %_DEST%\inc%_EXT%\ucbhelper\registerucb.hxx
-..\inc\ucbhelper\content.hxx %_DEST%\inc%_EXT%\ucbhelper\content.hxx
-..\inc\ucbhelper\contentbroker.hxx %_DEST%\inc%_EXT%\ucbhelper\contentbroker.hxx
-..\inc\ucbhelper\commandenvironment.hxx %_DEST%\inc%_EXT%\ucbhelper\commandenvironment.hxx
-..\inc\ucbhelper\contentidentifier.hxx %_DEST%\inc%_EXT%\ucbhelper\contentidentifier.hxx
-..\inc\ucbhelper\contenthelper.hxx %_DEST%\inc%_EXT%\ucbhelper\contenthelper.hxx
-..\inc\ucbhelper\contentidentifier.hxx %_DEST%\inc%_EXT%\ucbhelper\contentidentifier.hxx
-..\inc\ucbhelper\contentinfo.hxx %_DEST%\inc%_EXT%\ucbhelper\contentinfo.hxx
-..\inc\ucbhelper\fileidentifierconverter.hxx %_DEST%\inc%_EXT%\ucbhelper\fileidentifierconverter.hxx
-..\inc\ucbhelper\macros.hxx %_DEST%\inc%_EXT%\ucbhelper\macros.hxx
-..\inc\ucbhelper\propertyvalueset.hxx %_DEST%\inc%_EXT%\ucbhelper\propertyvalueset.hxx
-..\inc\ucbhelper\providerhelper.hxx %_DEST%\inc%_EXT%\ucbhelper\providerhelper.hxx
-..\inc\ucbhelper\resultset.hxx %_DEST%\inc%_EXT%\ucbhelper\resultset.hxx
-..\inc\ucbhelper\resultsetmetadata.hxx %_DEST%\inc%_EXT%\ucbhelper\resultsetmetadata.hxx
-..\inc\ucbhelper\resultsethelper.hxx %_DEST%\inc%_EXT%\ucbhelper\resultsethelper.hxx
-..\inc\ucbhelper\activedatasink.hxx %_DEST%\inc%_EXT%\ucbhelper\activedatasink.hxx
-..\inc\ucbhelper\commandenvironmentproxy.hxx %_DEST%\inc%_EXT%\ucbhelper\commandenvironmentproxy.hxx
-..\inc\ucbhelper\interactionrequest.hxx %_DEST%\inc%_EXT%\ucbhelper\interactionrequest.hxx
-..\inc\ucbhelper\interceptedinteraction.hxx %_DEST%\inc%_EXT%\ucbhelper\interceptedinteraction.hxx
-..\inc\ucbhelper\simpleinteractionrequest.hxx %_DEST%\inc%_EXT%\ucbhelper\simpleinteractionrequest.hxx
-..\inc\ucbhelper\simpleauthenticationrequest.hxx %_DEST%\inc%_EXT%\ucbhelper\simpleauthenticationrequest.hxx
-..\inc\ucbhelper\simplenameclashresolverequest.hxx %_DEST%\inc%_EXT%\ucbhelper\simplenameclashresolverequest.hxx
-..\inc\ucbhelper\simplecertificatevalidationrequest.hxx %_DEST%\inc%_EXT%\ucbhelper\simplecertificatevalidationrequest.hxx
-..\inc\ucbhelper\simpleioerrorrequest.hxx %_DEST%\inc%_EXT%\ucbhelper\simpleioerrorrequest.hxx
-..\inc\ucbhelper\cancelcommandexecution.hxx %_DEST%\inc%_EXT%\ucbhelper\cancelcommandexecution.hxx
-..\inc\ucbhelper\handleinteractionrequest.hxx %_DEST%\inc%_EXT%\ucbhelper\handleinteractionrequest.hxx
-..\inc\ucbhelper\proxydecider.hxx %_DEST%\inc%_EXT%\ucbhelper\proxydecider.hxx
-..\version.mk %_DEST%\inc%_EXT%\ucbhelper\version.mk
-..\inc\ucbhelper\ucbhelperdllapi.h %_DEST%\inc%_EXT%\ucbhelper\ucbhelperdllapi.h
Modified: openoffice/trunk/main/udkapi/com/sun/star/container/XNamed.idl
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/udkapi/com/sun/star/container/XNamed.idl?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/udkapi/com/sun/star/container/XNamed.idl (original)
+++ openoffice/trunk/main/udkapi/com/sun/star/container/XNamed.idl Sun Aug 7 19:24:03 2016
@@ -56,27 +56,6 @@ published interface XNamed: com::sun::st
//=============================================================================
-/** specifies the display name of the object.
-
- <p>The name is generally unique in the container of the object.</p>
- */
-published interface XNamedEx: XNamed
-{
- //-------------------------------------------------------------------------
-
- /** @returns
- the display name of the object.
- */
- string getDisplayName();
-
- //-------------------------------------------------------------------------
-
- /** sets the display name of the object.
- */
- [oneway] void setDisplayName( [in] string aName );
-
-};
-
}; }; }; };
#endif
Modified: openoffice/trunk/main/udkapi/prj/build.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/udkapi/prj/build.lst?rev=1755455&r1=1755454&r2=1755455&view=diff
==============================================================================
--- openoffice/trunk/main/udkapi/prj/build.lst (original)
+++ openoffice/trunk/main/udkapi/prj/build.lst Sun Aug 7 19:24:03 2016
@@ -1,30 +1,3 @@
-ua udkapi : idlc NULL
+ua udkapi : idlc codemaker NULL
ua udkapi usr1 - all ua_mkout NULL
-ua udkapi\com\sun\star\beans nmake - all ua_bean NULL
-ua udkapi\com\sun\star\bridge nmake - all ua_brid NULL
-ua udkapi\com\sun\star\bridge\oleautomation nmake - all ua_auto ua_brid NULL
-ua udkapi\com\sun\star\connection nmake - all ua_connect NULL
-ua udkapi\com\sun\star\container nmake - all ua_cont NULL
-ua udkapi\com\sun\star\io nmake - all ua_io NULL
-ua udkapi\com\sun\star\java nmake - all ua_java NULL
-ua udkapi\com\sun\star\lang nmake - all ua_lang NULL
-ua udkapi\com\sun\star\loader nmake - all ua_load NULL
-ua udkapi\com\sun\star\reflection nmake - all ua_refl NULL
-ua udkapi\com\sun\star\registry nmake - all ua_regis NULL
-ua udkapi\com\sun\star\script nmake - all ua_scrpt NULL
-ua udkapi\com\sun\star\test nmake - all ua_test NULL
-ua udkapi\com\sun\star\test\performance nmake - all ua_tstperform NULL
-ua udkapi\com\sun\star\test\bridge nmake - all ua_tstbridge NULL
-ua udkapi\com\sun\star\corba\iop nmake - all ua_iop NULL
-ua udkapi\com\sun\star\corba\giop nmake - all ua_giop NULL
-ua udkapi\com\sun\star\corba\iiop nmake - all ua_iiop NULL
-ua udkapi\com\sun\star\corba nmake - all ua_corba NULL
-ua udkapi\com\sun\star\uno nmake - all ua_uno NULL
-ua udkapi\com\sun\star\security nmake - all ua_sec ua_uno NULL
-ua udkapi\com\sun\star\util nmake - all ua_uutil ua_lang ua_uno NULL
-ua udkapi\com\sun\star\util\logging nmake - all ua_log NULL
-ua udkapi\com\sun\star\task nmake - all ua_task ua_uno NULL
-ua udkapi\com\sun\star\uri nmake - all ua_uri ua_uno NULL
-ua udkapi\com\sun\star nmake - all ua_star NULL
-ua udkapi\util nmake - all ua_util ua_bean ua_brid ua_auto ua_connect ua_cont ua_corba ua_giop ua_iiop ua_io ua_iop ua_java ua_lang ua_load ua_refl ua_regis ua_scrpt ua_test ua_tstbridge ua_tstperform ua_sec ua_uno ua_uutil ua_log ua_task ua_uri ua_star NULL
-
+ua udkapi\prj nmake - all ua_prj NULL