[Libreoffice-commits] core.git: 3 commits - config_host/config_udkversion.h.in config_host/.gitignore config_host/udkversion.mk.in configure.ac odk/Module_odk.mk odk/settings registry/inc sal/ZipPackage_sal_generated.mk
Stephan Bergmann
sbergman at redhat.com
Thu Feb 28 04:34:46 PST 2013
config_host/.gitignore | 1 -
config_host/config_udkversion.h.in | 14 --------------
config_host/udkversion.mk.in | 6 ------
configure.ac | 15 +--------------
odk/Module_odk.mk | 3 ---
odk/settings/settings.mk | 12 ------------
registry/inc/registry/regtype.h | 5 -----
sal/ZipPackage_sal_generated.mk | 4 ----
8 files changed, 1 insertion(+), 59 deletions(-)
New commits:
commit bfdcde7c2eb44b7c342ba1d048384eb7776808ae
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Feb 28 09:05:18 2013 +0100
Unused UDK_MAJOR/MINOR/MICRO macros (and udkversion.mk), also removed from SDK
Change-Id: I466424c5b71de4d6bb126499895539813283502a
diff --git a/config_host/.gitignore b/config_host/.gitignore
index e62c650..9becb5b 100644
--- a/config_host/.gitignore
+++ b/config_host/.gitignore
@@ -1,2 +1 @@
config_*.h
-udkversion.mk
diff --git a/config_host/udkversion.mk.in b/config_host/udkversion.mk.in
deleted file mode 100644
index 7bd445f..0000000
--- a/config_host/udkversion.mk.in
+++ /dev/null
@@ -1,6 +0,0 @@
-# UDK version number
-
-UDK_MAJOR=@UDK_MAJOR@
-UDK_MINOR=@UDK_MINOR@
-UDK_MICRO=@UDK_MICRO@
-
diff --git a/configure.ac b/configure.ac
index 047337a..c4c221c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4108,7 +4108,6 @@ if test "$cross_compiling" = "yes"; then
cp config.log ../config.Build.log
mkdir -p ../config_build
cp config_host/*.h ../config_build
- cp config_host/udkversion.mk ../config_build
. ./bin/get_config_variables COM GUI OS PATH CPU CPUNAME CC CXX DISABLE_PYTHON MACOSX_DEPLOYMENT_TARGET INPATH OUTPATH PYTHON SYSTEM_LIBXSLT OUTDIR SOLARINC SOLARLIB WORKDIR
for V in COM GUI OS CPU CPUNAME CC CXX DISABLE_PYTHON MACOSX_DEPLOYMENT_TARGET INPATH OUTPATH \
@@ -4178,14 +4177,6 @@ dnl ===================================================================
dnl Our version is defined by the AC_INIT() at the top of this script.
dnl ===================================================================
-UDK_MAJOR=3
-UDK_MINOR=2
-UDK_MICRO=7
-
-AC_SUBST(UDK_MAJOR)
-AC_SUBST(UDK_MINOR)
-AC_SUBST(UDK_MICRO)
-
set `echo AC_PACKAGE_VERSION | sed "s/\./ /g"`
LIBO_VERSION_MAJOR=$1
@@ -11837,7 +11828,7 @@ if test -f config_host.mk; then
config_md5=`$MD5SUM config_host.mk | sed "s/ .*//"`
fi
-AC_CONFIG_FILES([config_host.mk Makefile lo.xcent solenv/inc/minor.mk config_host/udkversion.mk instsetoo_native/util/openoffice.lst])
+AC_CONFIG_FILES([config_host.mk Makefile lo.xcent solenv/inc/minor.mk instsetoo_native/util/openoffice.lst])
AC_CONFIG_HEADERS([config_host/config_clang.h])
AC_CONFIG_HEADERS([config_host/config_global.h])
AC_CONFIG_HEADERS([config_host/config_graphite.h])
diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk
index be1ec1e..c66e1dd 100644
--- a/odk/Module_odk.mk
+++ b/odk/Module_odk.mk
@@ -9,9 +9,6 @@
$(eval $(call gb_Module_Module,odk))
-# needed in several makefiles here
-include $(BUILDDIR)/config_host/udkversion.mk
-
$(eval $(call gb_Module_add_targets,odk,\
CustomTarget_odkcommon \
$(if $(filter WNT,$(OS)),CustomTarget_cli) \
diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk
index eecde50..58abdd5 100644
--- a/odk/settings/settings.mk
+++ b/odk/settings/settings.mk
@@ -193,9 +193,6 @@ URLPREFIX=file://
COMID=gcc3
CPPU_ENV=gcc3
-# Include UDK version numbers
-include $(PRJ)/include/udkversion.mk
-
#SALLIB=-luno_sal
#CPPULIB=-luno_cppu
#CPPUHELPERLIB=-luno_cppuhelperC52
@@ -326,9 +323,6 @@ DELRECURSIVE=rm -rf
COPY=cp
URLPREFIX=file://
-# Include UDK version numbers
-include $(PRJ)/include/udkversion.mk
-
SALLIB=-luno_sal
CPPULIB=-luno_cppu
CPPUHELPERLIB=-luno_cppuhelper$(COMID)
@@ -438,9 +432,6 @@ DELRECURSIVE=rm -rf
COPY=cp
URLPREFIX=file://
-# Include UDK version numbers
-include $(PRJ)/include/udkversion.mk
-
SALLIB=-luno_sal
CPPULIB=-luno_cppu
CPPUHELPERLIB=-luno_cppuhelper$(COMID)
@@ -561,9 +552,6 @@ DELRECURSIVE=rm -rf
COPY=cp
URLPREFIX=file://
-# Include UDK version numbers
-include $(PRJ)/include/udkversion.mk
-
SALLIB=-luno_sal
CPPULIB=-luno_cppu
CPPUHELPERLIB=-luno_cppuhelper$(COMID)
diff --git a/sal/ZipPackage_sal_generated.mk b/sal/ZipPackage_sal_generated.mk
index c741cbc..0cd7442 100644
--- a/sal/ZipPackage_sal_generated.mk
+++ b/sal/ZipPackage_sal_generated.mk
@@ -27,8 +27,6 @@
$(eval $(call gb_ZipPackage_ZipPackage,sal_generated,$(BUILDDIR)/config_$(gb_Side)))
-$(eval $(call gb_ZipPackage_add_file,sal_generated,inc/udkversion.mk,include/udkversion.mk,udkversion.mk))
-
$(eval $(call gb_ZipPackage_add_file,sal_generated,inc/sal/typesizes.h,include/sal/typesizes.h,config_typesizes.h))
# vim: set noet sw=4 ts=4:
commit 8546e4180d0ea21af2033bf5888e16e3018a764e
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Feb 28 08:52:07 2013 +0100
Unused SAL_UDK_MAJOR/MINOR/MICRO macros (unused sal/udkversion.h)
Change-Id: Iac16e28979e7d6ae7e0502588f6216d9bfa51eda
diff --git a/config_host/config_udkversion.h.in b/config_host/config_udkversion.h.in
deleted file mode 100644
index 00f9bb8..0000000
--- a/config_host/config_udkversion.h.in
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
-
- UDK version.
-
-*/
-
-#ifndef CONFIG_UDKVERSION_H
-#define CONFIG_UDKVERSION_H
-
-#undef SAL_UDK_MAJOR
-#undef SAL_UDK_MINOR
-#undef SAL_UDK_MICRO
-
-#endif
diff --git a/configure.ac b/configure.ac
index 9b77395..047337a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4185,9 +4185,6 @@ UDK_MICRO=7
AC_SUBST(UDK_MAJOR)
AC_SUBST(UDK_MINOR)
AC_SUBST(UDK_MICRO)
-AC_DEFINE_UNQUOTED(SAL_UDK_MAJOR,"$UDK_MAJOR")
-AC_DEFINE_UNQUOTED(SAL_UDK_MINOR,"$UDK_MINOR")
-AC_DEFINE_UNQUOTED(SAL_UDK_MICRO,"$UDK_MICRO")
set `echo AC_PACKAGE_VERSION | sed "s/\./ /g"`
@@ -11846,7 +11843,6 @@ AC_CONFIG_HEADERS([config_host/config_global.h])
AC_CONFIG_HEADERS([config_host/config_graphite.h])
AC_CONFIG_HEADERS([config_host/config_telepathy.h])
AC_CONFIG_HEADERS([config_host/config_typesizes.h])
-AC_CONFIG_HEADERS([config_host/config_udkversion.h])
AC_CONFIG_HEADERS([config_host/config_vclplug.h])
AC_CONFIG_HEADERS([config_host/config_version.h])
AC_OUTPUT
diff --git a/sal/ZipPackage_sal_generated.mk b/sal/ZipPackage_sal_generated.mk
index d6ffde7..c741cbc 100644
--- a/sal/ZipPackage_sal_generated.mk
+++ b/sal/ZipPackage_sal_generated.mk
@@ -29,8 +29,6 @@ $(eval $(call gb_ZipPackage_ZipPackage,sal_generated,$(BUILDDIR)/config_$(gb_Sid
$(eval $(call gb_ZipPackage_add_file,sal_generated,inc/udkversion.mk,include/udkversion.mk,udkversion.mk))
-$(eval $(call gb_ZipPackage_add_file,sal_generated,inc/sal/udkversion.h,include/sal/udkversion.h,config_udkversion.h))
-
$(eval $(call gb_ZipPackage_add_file,sal_generated,inc/sal/typesizes.h,include/sal/typesizes.h,config_typesizes.h))
# vim: set noet sw=4 ts=4:
commit 264a2fdcacd1d2725ece59ba8352857aa0a7f15f
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Feb 28 08:45:21 2013 +0100
Unused LIBRARY_VERSION macro
Change-Id: I4adea5036eaba5186faa8faa3d56bde338e8913a
diff --git a/registry/inc/registry/regtype.h b/registry/inc/registry/regtype.h
index bb22d9f..86ddb29 100644
--- a/registry/inc/registry/regtype.h
+++ b/registry/inc/registry/regtype.h
@@ -21,11 +21,6 @@
#define _REGISTRY_REGTYPE_H_
#include <sal/types.h>
-#include <sal/udkversion.h>
-
-// version number of the library. This number is used for the load on call
-// mechanism and must be modifed when the library will be upgraded to a new version.
-#define LIBRARY_VERSION SAL_UDK_MAJOR
/// defines the type of a registry handle used in the C API.
typedef void* RegHandle;
More information about the Libreoffice-commits
mailing list