Skip to content

C
core
Kaydet (Commit) c56013e9 authored tarafından Michael Stahl's avatar Michael Stahl
Dosyalara gözat
Seçenekler

API CHANGE: odk: remove "store" and "reg" libraries 

These libraries were never part of the stable URE interface, and thus
including their headers and import libs in the SDK was a mistake.

Apparently at least on MacOSX and some Linux distros it was not
possible to link against the libraries anyway.

Change-Id: I3c43c86ff5d7bc316ed7af0be4ef313f7869ac23
üst fb61a9c3
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 37 deletions
odk/CustomTarget_doxygen.mk
Dosyayı görüntüle @ c56013e9
...@@ -14,8 +14,8 @@ odkcommon_ZIPDEPS += $(odk_WORKDIR)/docs/cpp/ref/index.html ...@@ -14,8 +14,8 @@ odkcommon_ZIPDEPS += $(odk_WORKDIR)/docs/cpp/ref/index.html
CPPDOCREFNAME := "$(PRODUCTNAME) $(PRODUCTVERSION) SDK C/C++ API Reference" CPPDOCREFNAME := "$(PRODUCTNAME) $(PRODUCTVERSION) SDK C/C++ API Reference"
odk_INCDIRLIST := sal salhelper rtl osl store typelib uno cppu cppuhelper \ odk_INCDIRLIST := sal salhelper rtl osl typelib uno cppu cppuhelper \
registry $(if $(filter WNT,$(OS)),systools) $(if $(filter WNT,$(OS)),systools)
odk_INCFILELIST := com/sun/star/uno/Any.h \ odk_INCFILELIST := com/sun/star/uno/Any.h \
com/sun/star/uno/Any.hxx \ com/sun/star/uno/Any.hxx \
com/sun/star/uno/genfunc.h \ com/sun/star/uno/genfunc.h \
...@@ -41,8 +41,6 @@ DOXY_DEPS := $(SRCDIR)/odk/pack/gendocu/Doxyfile \ ...@@ -41,8 +41,6 @@ DOXY_DEPS := $(SRCDIR)/odk/pack/gendocu/Doxyfile \
$(call gb_Package_get_target,salhelper_odk_headers) \ $(call gb_Package_get_target,salhelper_odk_headers) \
$(call gb_Package_get_target,cppu_odk_headers) \ $(call gb_Package_get_target,cppu_odk_headers) \
$(call gb_Package_get_target,cppuhelper_odk_headers) \ $(call gb_Package_get_target,cppuhelper_odk_headers) \
$(call gb_Package_get_target,store_odk_headers) \
$(call gb_Package_get_target,registry_odk_headers)
$(eval $(call gb_CustomTarget_register_target,odk/odkcommon/docs/cpp/ref,index.html)) $(eval $(call gb_CustomTarget_register_target,odk/odkcommon/docs/cpp/ref,index.html))
......
odk/CustomTarget_lib.mk
Dosyayı görüntüle @ c56013e9
...@@ -20,8 +20,7 @@ $(odk_WORKDIR)/lib/$(notdir $(1)) : $(1) ...@@ -20,8 +20,7 @@ $(odk_WORKDIR)/lib/$(notdir $(1)) : $(1)
endef endef
ifeq ($(COM),MSC) ifeq ($(COM),MSC)
odk_LIBLIST := store \ odk_LIBLIST := \
reg \
sal \ sal \
salhelper \ salhelper \
cppu \ cppu \
......
odk/settings/settings.mk
Dosyayı görüntüle @ c56013e9
...@@ -88,8 +88,6 @@ CPPULIB=icppu.lib ...@@ -88,8 +88,6 @@ CPPULIB=icppu.lib
CPPUHELPERLIB=icppuhelper.lib CPPUHELPERLIB=icppuhelper.lib
SALHELPERLIB=isalhelper.lib SALHELPERLIB=isalhelper.lib
PURPENVHELPERLIB=ipurpenvhelper.lib PURPENVHELPERLIB=ipurpenvhelper.lib
REGLIB=ireg.lib
STORELIB=istore.lib
BLANK= BLANK=
EMPTYSTRING= EMPTYSTRING=
...@@ -198,15 +196,11 @@ CPPU_ENV=gcc3 ...@@ -198,15 +196,11 @@ CPPU_ENV=gcc3
#CPPULIB=-luno_cppu #CPPULIB=-luno_cppu
#CPPUHELPERLIB=-luno_cppuhelperC52 #CPPUHELPERLIB=-luno_cppuhelperC52
#SALHELPERLIB=-luno_salhelperC52 #SALHELPERLIB=-luno_salhelperC52
#REGLIB=-lreg
#STORELIB=-lstore
SALLIB=-luno_sal SALLIB=-luno_sal
CPPULIB=-luno_cppu CPPULIB=-luno_cppu
CPPUHELPERLIB=-luno_cppuhelper$(COMID) CPPUHELPERLIB=-luno_cppuhelper$(COMID)
SALHELPERLIB=-luno_salhelper$(COMID) SALHELPERLIB=-luno_salhelper$(COMID)
PURPENVHELPERLIB=-luno_purpenvhelper$(COMID) PURPENVHELPERLIB=-luno_purpenvhelper$(COMID)
REGLIB=-lreg
STORELIB=-lstore
EMPTYSTRING= EMPTYSTRING=
PATH_SEPARATOR=: PATH_SEPARATOR=:
...@@ -330,8 +324,6 @@ CPPULIB=-luno_cppu ...@@ -330,8 +324,6 @@ CPPULIB=-luno_cppu
CPPUHELPERLIB=-luno_cppuhelper$(COMID) CPPUHELPERLIB=-luno_cppuhelper$(COMID)
SALHELPERLIB=-luno_salhelper$(COMID) SALHELPERLIB=-luno_salhelper$(COMID)
PURPENVHELPERLIB=-luno_purpenvhelper$(COMID) PURPENVHELPERLIB=-luno_purpenvhelper$(COMID)
REGLIB=-lreg
STORELIB=-lstore
EMPTYSTRING= EMPTYSTRING=
PATH_SEPARATOR=: PATH_SEPARATOR=:
...@@ -437,12 +429,10 @@ CPPULIB=-luno_cppu ...@@ -437,12 +429,10 @@ CPPULIB=-luno_cppu
CPPUHELPERLIB=-luno_cppuhelper$(COMID) CPPUHELPERLIB=-luno_cppuhelper$(COMID)
SALHELPERLIB=-luno_salhelper$(COMID) SALHELPERLIB=-luno_salhelper$(COMID)
PURPENVHELPERLIB=-luno_purpenvhelper$(COMID) PURPENVHELPERLIB=-luno_purpenvhelper$(COMID)
REGLIB=-lreg
STORELIB=-lstore
INSTALL_NAME_URELIBS=$(XCRUN) install_name_tool -change @__________________________________________________URELIB/libuno_sal.dylib.3 @executable_path/urelibs/libuno_sal.dylib.3 -change @__________________________________________________URELIB/libuno_cppu.dylib.3 @executable_path/urelibs/libuno_cppu.dylib.3 -change @__________________________________________________URELIB/libuno_cppuhelper$(COMID).dylib.3 @executable_path/urelibs/libuno_cppuhelper$(COMID).dylib.3 -change @__________________________________________________URELIB/libuno_salhelper$(COMID).dylib.3 @executable_path/urelibs/libuno_salhelper$(COMID).dylib.3 -change @__________________________________________________URELIB/libreg.dylib.3 @executable_path/urelibs/libreg.dylib.3 -change @__________________________________________________URELIB/libstore.dylib.3 @executable_path/urelibs/libstore.dylib.3 INSTALL_NAME_URELIBS=$(XCRUN) install_name_tool -change @__________________________________________________URELIB/libuno_sal.dylib.3 @executable_path/urelibs/libuno_sal.dylib.3 -change @__________________________________________________URELIB/libuno_cppu.dylib.3 @executable_path/urelibs/libuno_cppu.dylib.3 -change @__________________________________________________URELIB/libuno_cppuhelper$(COMID).dylib.3 @executable_path/urelibs/libuno_cppuhelper$(COMID).dylib.3 -change @__________________________________________________URELIB/libuno_salhelper$(COMID).dylib.3 @executable_path/urelibs/libuno_salhelper$(COMID).dylib.3
INSTALL_NAME_URELIBS_BIN=$(XCRUN) install_name_tool -change @__________________________________________________URELIB/libuno_sal.dylib.3 libuno_sal.dylib.3 -change @__________________________________________________URELIB/libuno_cppu.dylib.3 libuno_cppu.dylib.3 -change @__________________________________________________URELIB/libuno_cppuhelper$(COMID).dylib.3 libuno_cppuhelper$(COMID).dylib.3 -change @__________________________________________________URELIB/libuno_salhelper$(COMID).dylib.3 libuno_salhelper$(COMID).dylib.3 -change @__________________________________________________URELIB/libreg.dylib.3 libreg.dylib.3 -change @__________________________________________________URELIB/libstore.dylib.3 libstore.dylib.3 INSTALL_NAME_URELIBS_BIN=$(XCRUN) install_name_tool -change @__________________________________________________URELIB/libuno_sal.dylib.3 libuno_sal.dylib.3 -change @__________________________________________________URELIB/libuno_cppu.dylib.3 libuno_cppu.dylib.3 -change @__________________________________________________URELIB/libuno_cppuhelper$(COMID).dylib.3 libuno_cppuhelper$(COMID).dylib.3 -change @__________________________________________________URELIB/libuno_salhelper$(COMID).dylib.3 libuno_salhelper$(COMID).dylib.3
EMPTYSTRING= EMPTYSTRING=
PATH_SEPARATOR=: PATH_SEPARATOR=:
...@@ -551,8 +541,6 @@ CPPULIB=-luno_cppu ...@@ -551,8 +541,6 @@ CPPULIB=-luno_cppu
CPPUHELPERLIB=-luno_cppuhelper$(COMID) CPPUHELPERLIB=-luno_cppuhelper$(COMID)
SALHELPERLIB=-luno_salhelper$(COMID) SALHELPERLIB=-luno_salhelper$(COMID)
PURPENVHELPERLIB=-luno_purpenvhelper$(COMID) PURPENVHELPERLIB=-luno_purpenvhelper$(COMID)
REGLIB=-lreg
STORELIB=-lstore
EMPTYSTRING= EMPTYSTRING=
PATH_SEPARATOR=: PATH_SEPARATOR=:
......
scp2/source/sdkoo/module_sdkoo.scp
Dosyayı görüntüle @ c56013e9
...@@ -40,7 +40,5 @@ Module gid_Module_Optional_Sdkoo ...@@ -40,7 +40,5 @@ Module gid_Module_Optional_Sdkoo
gid_File_Zip_Odkheaders_sal, gid_File_Zip_Odkheaders_sal,
gid_File_Zip_Odkheaders_salhelper, gid_File_Zip_Odkheaders_salhelper,
gid_File_Zip_Odkheaders_cppu, gid_File_Zip_Odkheaders_cppu,
gid_File_Zip_Odkheaders_cppuhelper, gid_File_Zip_Odkheaders_cppuhelper);
gid_File_Zip_Odkheaders_store,
gid_File_Zip_Odkheaders_registry);
End End
scp2/source/sdkoo/sdkoo.scp
Dosyayı görüntüle @ c56013e9
...@@ -180,20 +180,6 @@ File gid_File_Zip_Odkheaders_cppuhelper ...@@ -180,20 +180,6 @@ File gid_File_Zip_Odkheaders_cppuhelper
Styles = (ARCHIVE,USE_INTERNAL_RIGHTS); Styles = (ARCHIVE,USE_INTERNAL_RIGHTS);
End End
File gid_File_Zip_Odkheaders_store
TXT_FILE_BODY;
Dir = gid_Dir_Basis_Sdk;
Name = "store_odk_headers.zip";
Styles = (ARCHIVE,USE_INTERNAL_RIGHTS);
End
File gid_File_Zip_Odkheaders_registry
TXT_FILE_BODY;
Dir = gid_Dir_Basis_Sdk;
Name = "registry_odk_headers.zip";
Styles = (ARCHIVE,USE_INTERNAL_RIGHTS);
End
#if (!defined(WNT) && !defined( MACOSX) ) #if (!defined(WNT) && !defined( MACOSX) )
Directory gid_Dir_Lib_Sdk Directory gid_Dir_Lib_Sdk
Styles = (CREATE); Styles = (CREATE);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment