summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2013-04-10 14:00:44 (GMT)
committerMichael Stahl <mstahl@redhat.com>2013-04-10 14:21:42 (GMT)
commitc56013e97b7b5cf7a09a3ff99e0c172450dcb5a5 (patch)
treec4eaa9994d4672acd3d1129eb06acef020b7aa9e
parentfb61a9c3fc491996cb1e96e579ef72d4d4d0f2a2 (diff)
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
-rw-r--r--odk/CustomTarget_doxygen.mk6
-rw-r--r--odk/CustomTarget_lib.mk3
-rw-r--r--odk/settings/settings.mk16
-rw-r--r--scp2/source/sdkoo/module_sdkoo.scp4
-rw-r--r--scp2/source/sdkoo/sdkoo.scp14
5 files changed, 6 insertions, 37 deletions
diff --git a/odk/CustomTarget_doxygen.mk b/odk/CustomTarget_doxygen.mk
index 8bf2a14..df401f9 100644
--- a/odk/CustomTarget_doxygen.mk
+++ b/odk/CustomTarget_doxygen.mk
@@ -14,8 +14,8 @@ odkcommon_ZIPDEPS += $(odk_WORKDIR)/docs/cpp/ref/index.html
CPPDOCREFNAME := "$(PRODUCTNAME) $(PRODUCTVERSION) SDK C/C++ API Reference"
-odk_INCDIRLIST := sal salhelper rtl osl store typelib uno cppu cppuhelper \
- registry $(if $(filter WNT,$(OS)),systools)
+odk_INCDIRLIST := sal salhelper rtl osl typelib uno cppu cppuhelper \
+ $(if $(filter WNT,$(OS)),systools)
odk_INCFILELIST := com/sun/star/uno/Any.h \
com/sun/star/uno/Any.hxx \
com/sun/star/uno/genfunc.h \
@@ -41,8 +41,6 @@ DOXY_DEPS := $(SRCDIR)/odk/pack/gendocu/Doxyfile \
$(call gb_Package_get_target,salhelper_odk_headers) \
$(call gb_Package_get_target,cppu_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))
diff --git a/odk/CustomTarget_lib.mk b/odk/CustomTarget_lib.mk
index d817835..910211e 100644
--- a/odk/CustomTarget_lib.mk
+++ b/odk/CustomTarget_lib.mk
@@ -20,8 +20,7 @@ $(odk_WORKDIR)/lib/$(notdir $(1)) : $(1)
endef
ifeq ($(COM),MSC)
-odk_LIBLIST := store \
- reg \
+odk_LIBLIST := \
sal \
salhelper \
cppu \
diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk
index ad4697b..acaabbc 100644
--- a/odk/settings/settings.mk
+++ b/odk/settings/settings.mk
@@ -88,8 +88,6 @@ CPPULIB=icppu.lib
CPPUHELPERLIB=icppuhelper.lib
SALHELPERLIB=isalhelper.lib
PURPENVHELPERLIB=ipurpenvhelper.lib
-REGLIB=ireg.lib
-STORELIB=istore.lib
BLANK=
EMPTYSTRING=
@@ -198,15 +196,11 @@ CPPU_ENV=gcc3
#CPPULIB=-luno_cppu
#CPPUHELPERLIB=-luno_cppuhelperC52
#SALHELPERLIB=-luno_salhelperC52
-#REGLIB=-lreg
-#STORELIB=-lstore
SALLIB=-luno_sal
CPPULIB=-luno_cppu
CPPUHELPERLIB=-luno_cppuhelper$(COMID)
SALHELPERLIB=-luno_salhelper$(COMID)
PURPENVHELPERLIB=-luno_purpenvhelper$(COMID)
-REGLIB=-lreg
-STORELIB=-lstore
EMPTYSTRING=
PATH_SEPARATOR=:
@@ -330,8 +324,6 @@ CPPULIB=-luno_cppu
CPPUHELPERLIB=-luno_cppuhelper$(COMID)
SALHELPERLIB=-luno_salhelper$(COMID)
PURPENVHELPERLIB=-luno_purpenvhelper$(COMID)
-REGLIB=-lreg
-STORELIB=-lstore
EMPTYSTRING=
PATH_SEPARATOR=:
@@ -437,12 +429,10 @@ CPPULIB=-luno_cppu
CPPUHELPERLIB=-luno_cppuhelper$(COMID)
SALHELPERLIB=-luno_salhelper$(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=
PATH_SEPARATOR=:
@@ -551,8 +541,6 @@ CPPULIB=-luno_cppu
CPPUHELPERLIB=-luno_cppuhelper$(COMID)
SALHELPERLIB=-luno_salhelper$(COMID)
PURPENVHELPERLIB=-luno_purpenvhelper$(COMID)
-REGLIB=-lreg
-STORELIB=-lstore
EMPTYSTRING=
PATH_SEPARATOR=:
diff --git a/scp2/source/sdkoo/module_sdkoo.scp b/scp2/source/sdkoo/module_sdkoo.scp
index 5adfdf8..d496611 100644
--- a/scp2/source/sdkoo/module_sdkoo.scp
+++ b/scp2/source/sdkoo/module_sdkoo.scp
@@ -40,7 +40,5 @@ Module gid_Module_Optional_Sdkoo
gid_File_Zip_Odkheaders_sal,
gid_File_Zip_Odkheaders_salhelper,
gid_File_Zip_Odkheaders_cppu,
- gid_File_Zip_Odkheaders_cppuhelper,
- gid_File_Zip_Odkheaders_store,
- gid_File_Zip_Odkheaders_registry);
+ gid_File_Zip_Odkheaders_cppuhelper);
End
diff --git a/scp2/source/sdkoo/sdkoo.scp b/scp2/source/sdkoo/sdkoo.scp
index 70ea8fe..ff64264 100644
--- a/scp2/source/sdkoo/sdkoo.scp
+++ b/scp2/source/sdkoo/sdkoo.scp
@@ -180,20 +180,6 @@ File gid_File_Zip_Odkheaders_cppuhelper
Styles = (ARCHIVE,USE_INTERNAL_RIGHTS);
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) )
Directory gid_Dir_Lib_Sdk
Styles = (CREATE);