diff options
35 files changed, 94 insertions, 107 deletions
diff --git a/cli_ure/Package_cli_basetypes_copy.mk b/cli_ure/Package_cli_basetypes_copy.mk index fdb76bef8c06..b0824e3bcb38 100644 --- a/cli_ure/Package_cli_basetypes_copy.mk +++ b/cli_ure/Package_cli_basetypes_copy.mk @@ -13,7 +13,7 @@ $(eval $(call gb_Package_Package,cli_basetypes_copy,$(WORKDIR))) $(eval $(call gb_Package_set_outdir,cli_basetypes_copy,$(INSTDIR))) # duplicate copy to work around CLR DLL finding brain damage -$(eval $(call gb_Package_add_files,cli_basetypes_copy,$(gb_Package_SDKDIRNAME)/bin,\ +$(eval $(call gb_Package_add_files,cli_basetypes_copy,$(SDKDIRNAME)/bin,\ CliLibraryTarget/cli_basetypes.dll \ )) diff --git a/config_host.mk.in b/config_host.mk.in index 567c8b1e1c31..3b58d6625dc5 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -463,6 +463,8 @@ export RTL_OS=@RTL_OS@ export SAC_JAR=@SAC_JAR@ export SAL_ENABLE_FILE_LOCKING=1 export SCPDEFS=@SCPDEFS@ +export SDKDIRNAME=@SDKDIRNAME@ +export SDKDIRNAME_FOR_BUILD=@SDKDIRNAME_FOR_BUILD@ export SERVLETAPI_JAR=@SERVLETAPI_JAR@ export SHOWINCLUDES_PREFIX=@SHOWINCLUDES_PREFIX@ export SOLARENV=@SRC_ROOT@/solenv diff --git a/configure.ac b/configure.ac index 13f4e69b388e..1f3ea9b2f7b2 100644 --- a/configure.ac +++ b/configure.ac @@ -99,6 +99,57 @@ fi AC_MSG_RESULT([$PRODUCTNAME]) AC_SUBST(PRODUCTNAME) +dnl =================================================================== +dnl Our version is defined by the AC_INIT() at the top of this script. +dnl =================================================================== + +set `echo AC_PACKAGE_VERSION | sed "s/\./ /g"` + +LIBO_VERSION_MAJOR=$1 +LIBO_VERSION_MINOR=$2 +LIBO_VERSION_MICRO=$3 +LIBO_VERSION_PATCH=$4 + +LIBO_VERSION_SUFFIX=$5 +# Split out LIBO_VERSION_SUFFIX_SUFFIX... horrible crack. But apparently wanted separately in +# openoffice.lst as ABOUTBOXPRODUCTVERSIONSUFFIX. Note that the double brackets are for m4's sake, +# they get undoubled before actually passed to sed. +LIBO_VERSION_SUFFIX_SUFFIX=`echo "$LIBO_VERSION_SUFFIX" | sed -e 's/.*[[a-zA-Z0-9]]\([[^a-zA-Z0-9]]*\)$/\1/'` +test -n "$LIBO_VERSION_SUFFIX_SUFFIX" && LIBO_VERSION_SUFFIX="${LIBO_VERSION_SUFFIX%${LIBO_VERSION_SUFFIX_SUFFIX}}" +# LIBO_VERSION_SUFFIX, if non-empty, should include the period separator +test -n "$LIBO_VERSION_SUFFIX" && LIBO_VERSION_SUFFIX=".$LIBO_VERSION_SUFFIX" + +AC_SUBST(LIBO_VERSION_MAJOR) +AC_SUBST(LIBO_VERSION_MINOR) +AC_SUBST(LIBO_VERSION_MICRO) +AC_SUBST(LIBO_VERSION_PATCH) +AC_SUBST(LIBO_VERSION_SUFFIX) +AC_SUBST(LIBO_VERSION_SUFFIX_SUFFIX) + +AC_DEFINE_UNQUOTED(LIBO_VERSION_MAJOR,$LIBO_VERSION_MAJOR) +AC_DEFINE_UNQUOTED(LIBO_VERSION_MINOR,$LIBO_VERSION_MINOR) +AC_DEFINE_UNQUOTED(LIBO_VERSION_MICRO,$LIBO_VERSION_MICRO) +AC_DEFINE_UNQUOTED(LIBO_VERSION_PATCH,$LIBO_VERSION_PATCH) + +LIBO_THIS_YEAR=`date +%Y` +AC_DEFINE_UNQUOTED(LIBO_THIS_YEAR,$LIBO_THIS_YEAR) + +# This UPD silly thing must go away soon +UPD="${LIBO_VERSION_MAJOR}${LIBO_VERSION_MINOR}0" +AC_SUBST(UPD) + +# This too should go away +SOURCEVERSION="OOO$UPD" +AC_SUBST(SOURCEVERSION) + +dnl =================================================================== +dnl Product version +dnl =================================================================== +AC_MSG_CHECKING([for product version]) +PRODUCTVERSION="$LIBO_VERSION_MAJOR.$LIBO_VERSION_MINOR" +AC_MSG_RESULT([$PRODUCTVERSION]) +AC_SUBST(PRODUCTVERSION) + AC_PROG_EGREP # AC_PROG_EGREP doesn't set GREP on all systems as well AC_PATH_PROG(GREP, grep) @@ -381,6 +432,7 @@ CPP_LIBRARY="GLIBCXX" AC_SUBST(CPP_LIBRARY) INSTROOTSUFFIX= +SDKDIRNAME=sdk case "$host_os" in @@ -493,6 +545,7 @@ darwin*) # Mac OS X or iOS else _os=Darwin INSTROOTSUFFIX=/$PRODUCTNAME.app/Contents + SDKDIRNAME=AC_PACKAGE_NAME${PRODUCTVERSION}_SDK fi enable_systray=no # See comment above the case "$host_os" @@ -637,6 +690,8 @@ if test "$_os" = "AIX"; then fi fi +AC_SUBST(SDKDIRNAME) + AC_SUBST(WITH_MINGW) AC_SUBST(OSVERSION) AC_SUBST(PTHREAD_CFLAGS) @@ -4483,9 +4538,9 @@ if test "$cross_compiling" = "yes"; then mv config.log ../config.Build.log mkdir -p ../config_build mv config_host/*.h ../config_build - . ./bin/get_config_variables CC CXX INPATH INSTDIR INSTROOT LIBO_BIN_FOLDER LIBO_LIB_FOLDER LIBO_URE_LIB_FOLDER OS OUTDIR PATH SYSTEM_LIBXSLT WORKDIR + . ./bin/get_config_variables CC CXX INPATH INSTDIR INSTROOT LIBO_BIN_FOLDER LIBO_LIB_FOLDER LIBO_URE_LIB_FOLDER OS OUTDIR PATH SDKDIRNAME SYSTEM_LIBXSLT WORKDIR - for V in CC CXX INPATH LIBO_BIN_FOLDER LIBO_LIB_FOLDER LIBO_URE_LIB_FOLDER OS SYSTEM_LIBXSLT; do + for V in CC CXX INPATH LIBO_BIN_FOLDER LIBO_LIB_FOLDER LIBO_URE_LIB_FOLDER OS SDKDIRNAME SYSTEM_LIBXSLT; do VV='$'$V VV=`eval "echo $VV"` if test -n "$VV"; then @@ -4525,6 +4580,7 @@ else LIBO_LIB_FOLDER_FOR_BUILD="$LIBO_LIB_FOLDER" LIBO_URE_LIB_FOLDER_FOR_BUILD="$LIBO_URE_LIB_FOLDER" OUTDIR_FOR_BUILD="$OUTDIR" + SDKDIRNAME_FOR_BUILD="$SDKDIRNAME" WORKDIR_FOR_BUILD="$WORKDIR" fi AC_SUBST(OS_FOR_BUILD) @@ -4535,52 +4591,10 @@ AC_SUBST(LIBO_BIN_FOLDER_FOR_BUILD) AC_SUBST(LIBO_LIB_FOLDER_FOR_BUILD) AC_SUBST(LIBO_URE_LIB_FOLDER_FOR_BUILD) AC_SUBST(OUTDIR_FOR_BUILD) +AC_SUBST(SDKDIRNAME_FOR_BUILD) AC_SUBST(WORKDIR_FOR_BUILD) dnl =================================================================== -dnl Our version is defined by the AC_INIT() at the top of this script. -dnl =================================================================== - -set `echo AC_PACKAGE_VERSION | sed "s/\./ /g"` - -LIBO_VERSION_MAJOR=$1 -LIBO_VERSION_MINOR=$2 -LIBO_VERSION_MICRO=$3 -LIBO_VERSION_PATCH=$4 - -LIBO_VERSION_SUFFIX=$5 -# Split out LIBO_VERSION_SUFFIX_SUFFIX... horrible crack. But apparently wanted separately in -# openoffice.lst as ABOUTBOXPRODUCTVERSIONSUFFIX. Note that the double brackets are for m4's sake, -# they get undoubled before actually passed to sed. -LIBO_VERSION_SUFFIX_SUFFIX=`echo "$LIBO_VERSION_SUFFIX" | sed -e 's/.*[[a-zA-Z0-9]]\([[^a-zA-Z0-9]]*\)$/\1/'` -test -n "$LIBO_VERSION_SUFFIX_SUFFIX" && LIBO_VERSION_SUFFIX="${LIBO_VERSION_SUFFIX%${LIBO_VERSION_SUFFIX_SUFFIX}}" -# LIBO_VERSION_SUFFIX, if non-empty, should include the period separator -test -n "$LIBO_VERSION_SUFFIX" && LIBO_VERSION_SUFFIX=".$LIBO_VERSION_SUFFIX" - -AC_SUBST(LIBO_VERSION_MAJOR) -AC_SUBST(LIBO_VERSION_MINOR) -AC_SUBST(LIBO_VERSION_MICRO) -AC_SUBST(LIBO_VERSION_PATCH) -AC_SUBST(LIBO_VERSION_SUFFIX) -AC_SUBST(LIBO_VERSION_SUFFIX_SUFFIX) - -AC_DEFINE_UNQUOTED(LIBO_VERSION_MAJOR,$LIBO_VERSION_MAJOR) -AC_DEFINE_UNQUOTED(LIBO_VERSION_MINOR,$LIBO_VERSION_MINOR) -AC_DEFINE_UNQUOTED(LIBO_VERSION_MICRO,$LIBO_VERSION_MICRO) -AC_DEFINE_UNQUOTED(LIBO_VERSION_PATCH,$LIBO_VERSION_PATCH) - -LIBO_THIS_YEAR=`date +%Y` -AC_DEFINE_UNQUOTED(LIBO_THIS_YEAR,$LIBO_THIS_YEAR) - -# This UPD silly thing must go away soon -UPD="${LIBO_VERSION_MAJOR}${LIBO_VERSION_MINOR}0" -AC_SUBST(UPD) - -# This too should go away -SOURCEVERSION="OOO$UPD" -AC_SUBST(SOURCEVERSION) - -dnl =================================================================== dnl Check for syslog header dnl =================================================================== AC_CHECK_HEADER(syslog.h, AC_DEFINE(HAVE_SYSLOG_H)) @@ -12009,14 +12023,6 @@ AC_SUBST(CURL) AC_SUBST(MD5SUM) dnl =================================================================== -dnl Product version -dnl =================================================================== -AC_MSG_CHECKING([for product version]) -PRODUCTVERSION="$LIBO_VERSION_MAJOR.$LIBO_VERSION_MINOR" -AC_MSG_RESULT([$PRODUCTVERSION]) -AC_SUBST(PRODUCTVERSION) - -dnl =================================================================== dnl Dealing with l10n options dnl =================================================================== AC_MSG_CHECKING([which languages to be built]) diff --git a/odk/CustomTarget_allheaders.mk b/odk/CustomTarget_allheaders.mk index e44497e65315..66df9c006855 100644 --- a/odk/CustomTarget_allheaders.mk +++ b/odk/CustomTarget_allheaders.mk @@ -24,7 +24,7 @@ $(odk_allheaders_DIR)/allheaders.hxx : \ printf '#endif\n' >> $@ \ $(foreach file,$(shell cat $^),\ $(if $(findstring /win32/,$(file)),&& printf '#ifdef WNT\n' >> $@) \ - && printf '#include <%s>\n' $(subst $(INSTDIR)/$(gb_Package_SDKDIRNAME)/include/,,$(file)) >> $@ \ + && printf '#include <%s>\n' $(subst $(INSTDIR)/$(SDKDIRNAME)/include/,,$(file)) >> $@ \ $(if $(findstring /win32/,$(file)),&& printf '#endif // WNT\n' >> $@) \ ) diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk index 46042a49726c..bba54fbde03a 100644 --- a/odk/CustomTarget_check.mk +++ b/odk/CustomTarget_check.mk @@ -47,7 +47,7 @@ $(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \ $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CHK,1) $(call gb_Helper_print_on_error,\ $(PERL) $< \ - $(INSTDIR)/$(gb_Package_SDKDIRNAME) \ + $(INSTDIR)/$(SDKDIRNAME) \ $(odk_PLATFORM) "$(gb_Executable_EXT)" \ ,$@.log \ ) diff --git a/odk/CustomTarget_doxygen.mk b/odk/CustomTarget_doxygen.mk index 9be0fad72307..6fe5096621f5 100644 --- a/odk/CustomTarget_doxygen.mk +++ b/odk/CustomTarget_doxygen.mk @@ -24,7 +24,7 @@ odk_cpp_INCFILELIST := com/sun/star/uno/Any.h \ # Cygwin Doxygen needs unix paths odk_cygwin_path = $(if $(filter WNT,$(OS)),$(shell cygpath -u $(1)),$(1)) -odk_cpp_PREFIX := $(INSTDIR)/$(gb_Package_SDKDIRNAME)/include/ +odk_cpp_PREFIX := $(INSTDIR)/$(SDKDIRNAME)/include/ odk_cpp_DOXY_INPUT := $(SRCDIR)/odk/docs/cpp/main.dox \ $(SRCDIR)/include/sal/log-areas.dox \ $(addprefix $(odk_cpp_PREFIX),$(odk_cpp_INCDIRLIST) $(odk_cpp_INCFILELIST)) diff --git a/odk/GeneratedPackage_odk_doxygen.mk b/odk/GeneratedPackage_odk_doxygen.mk index 48dfe043338f..869ac7fb9a97 100644 --- a/odk/GeneratedPackage_odk_doxygen.mk +++ b/odk/GeneratedPackage_odk_doxygen.mk @@ -11,7 +11,7 @@ $(eval $(call gb_GeneratedPackage_GeneratedPackage,odk_doxygen,$(call gb_CustomT $(eval $(call gb_GeneratedPackage_use_customtarget,odk_doxygen,odk/docs)) -$(eval $(call gb_GeneratedPackage_add_dir,odk_doxygen,$(INSTDIR)/$(gb_Package_SDKDIRNAME)/docs/cpp/ref,cpp/ref)) -$(eval $(call gb_GeneratedPackage_add_dir,odk_doxygen,$(INSTDIR)/$(gb_Package_SDKDIRNAME)/docs/idl/ref,idl/ref)) +$(eval $(call gb_GeneratedPackage_add_dir,odk_doxygen,$(INSTDIR)/$(SDKDIRNAME)/docs/cpp/ref,cpp/ref)) +$(eval $(call gb_GeneratedPackage_add_dir,odk_doxygen,$(INSTDIR)/$(SDKDIRNAME)/docs/idl/ref,idl/ref)) # vim: set noet sw=4 ts=4: diff --git a/odk/GeneratedPackage_uno_loader_classes.mk b/odk/GeneratedPackage_uno_loader_classes.mk index 3af67c0d4e6b..42b5f5c31de0 100644 --- a/odk/GeneratedPackage_uno_loader_classes.mk +++ b/odk/GeneratedPackage_uno_loader_classes.mk @@ -11,6 +11,6 @@ $(eval $(call gb_GeneratedPackage_GeneratedPackage,odk_uno_loader_classes,$(call $(eval $(call gb_GeneratedPackage_use_customtarget,odk_uno_loader_classes,odk/classes)) -$(eval $(call gb_GeneratedPackage_add_dir,odk_uno_loader_classes,$(INSTDIR)/$(gb_Package_SDKDIRNAME)/classes/com/sun/star/lib/loader,com/sun/star/lib/loader)) +$(eval $(call gb_GeneratedPackage_add_dir,odk_uno_loader_classes,$(INSTDIR)/$(SDKDIRNAME)/classes/com/sun/star/lib/loader,com/sun/star/lib/loader)) # vim: set noet sw=4 ts=4: diff --git a/odk/Package_cli.mk b/odk/Package_cli.mk index 02f3b2082f60..80ec1f931fdc 100644 --- a/odk/Package_cli.mk +++ b/odk/Package_cli.mk @@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,odk_cli,$(OUTDIR)/bin)) $(eval $(call gb_Package_set_outdir,odk_cli,$(INSTDIR))) -$(eval $(call gb_Package_add_files,odk_cli,$(gb_Package_SDKDIRNAME)/cli,\ +$(eval $(call gb_Package_add_files,odk_cli,$(SDKDIRNAME)/cli,\ cli_basetypes.dll \ cli_oootypes.dll \ cli_ure.dll \ diff --git a/odk/Package_config.mk b/odk/Package_config.mk index a58620eb05be..6efe33b1d4f8 100644 --- a/odk/Package_config.mk +++ b/odk/Package_config.mk @@ -12,13 +12,13 @@ $(eval $(call gb_Package_Package,odk_config,$(SRCDIR)/odk/config)) $(eval $(call gb_Package_set_outdir,odk_config,$(INSTDIR))) ifeq ($(OS),WNT) -$(eval $(call gb_Package_add_files,odk_config,$(gb_Package_SDKDIRNAME),\ +$(eval $(call gb_Package_add_files,odk_config,$(SDKDIRNAME),\ cfgWin.js \ setsdkenv_windows.template \ setsdkname.bat \ )) else -$(eval $(call gb_Package_add_files,odk_config,$(gb_Package_SDKDIRNAME),\ +$(eval $(call gb_Package_add_files,odk_config,$(SDKDIRNAME),\ configure.pl \ setsdkenv_unix \ setsdkenv_unix.sh.in \ diff --git a/odk/Package_config_notwin.mk b/odk/Package_config_notwin.mk index 37c1b2beed43..8bd2d513f668 100644 --- a/odk/Package_config_notwin.mk +++ b/odk/Package_config_notwin.mk @@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,odk_config_notwin,$(SRCDIR))) $(eval $(call gb_Package_set_outdir,odk_config_notwin,$(INSTDIR))) -$(eval $(call gb_Package_add_files,odk_config_notwin,$(gb_Package_SDKDIRNAME),\ +$(eval $(call gb_Package_add_files,odk_config_notwin,$(SDKDIRNAME),\ config.guess \ config.sub \ )) diff --git a/odk/Package_config_win.mk b/odk/Package_config_win.mk index c2dadad6f3ca..8c7a007fdce5 100644 --- a/odk/Package_config_win.mk +++ b/odk/Package_config_win.mk @@ -11,6 +11,6 @@ $(eval $(call gb_Package_Package,odk_config_win,$(call gb_CustomTarget_get_workd $(eval $(call gb_Package_set_outdir,odk_config_win,$(INSTDIR))) -$(eval $(call gb_Package_add_file,odk_config_win,$(gb_Package_SDKDIRNAME)/setsdkenv_windows.bat,setsdkenv_windows.bat)) +$(eval $(call gb_Package_add_file,odk_config_win,$(SDKDIRNAME)/setsdkenv_windows.bat,setsdkenv_windows.bat)) # vim: set noet sw=4 ts=4: diff --git a/odk/Package_docs.mk b/odk/Package_docs.mk index 515c682b1d2e..8d0c8dbb7619 100644 --- a/odk/Package_docs.mk +++ b/odk/Package_docs.mk @@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,odk_docs,$(SRCDIR)/odk)) $(eval $(call gb_Package_set_outdir,odk_docs,$(INSTDIR))) -$(eval $(call gb_Package_add_files_with_dir,odk_docs,$(gb_Package_SDKDIRNAME),\ +$(eval $(call gb_Package_add_files_with_dir,odk_docs,$(SDKDIRNAME),\ docs/images/arrow-1.gif \ docs/images/arrow-2.gif \ docs/images/arrow-3.gif \ diff --git a/odk/Package_examples.mk b/odk/Package_examples.mk index 0c8a70540711..b6aaae77d075 100644 --- a/odk/Package_examples.mk +++ b/odk/Package_examples.mk @@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,odk_examples,$(SRCDIR)/odk/examples)) $(eval $(call gb_Package_set_outdir,odk_examples,$(INSTDIR))) -$(eval $(call gb_Package_add_files_with_dir,odk_examples,$(gb_Package_SDKDIRNAME)/examples,\ +$(eval $(call gb_Package_add_files_with_dir,odk_examples,$(SDKDIRNAME)/examples,\ CLI/CSharp/Spreadsheet/GeneralTableSample.cs \ CLI/CSharp/Spreadsheet/Makefile \ CLI/CSharp/Spreadsheet/SpreadsheetDocHelper.cs \ diff --git a/odk/Package_html.mk b/odk/Package_html.mk index fd18426d9d91..fdac50654e44 100644 --- a/odk/Package_html.mk +++ b/odk/Package_html.mk @@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,odk_html,$(call gb_CustomTarget_get_workdir,odk $(eval $(call gb_Package_set_outdir,odk_html,$(INSTDIR))) -$(eval $(call gb_Package_add_files_with_dir,odk_html,$(gb_Package_SDKDIRNAME),\ +$(eval $(call gb_Package_add_files_with_dir,odk_html,$(SDKDIRNAME),\ docs/install.html \ docs/tools.html \ examples/DevelopersGuide/examples.html \ diff --git a/odk/Package_javadoc.mk b/odk/Package_javadoc.mk index 15b0691501a8..5f0ea44a4c36 100644 --- a/odk/Package_javadoc.mk +++ b/odk/Package_javadoc.mk @@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,odk_javadoc,$(call gb_CustomTarget_get_workdir, $(eval $(call gb_Package_set_outdir,odk_javadoc,$(INSTDIR))) -$(eval $(call gb_Package_add_files_with_dir,odk_javadoc,$(gb_Package_SDKDIRNAME)/docs/java/ref,\ +$(eval $(call gb_Package_add_files_with_dir,odk_javadoc,$(SDKDIRNAME)/docs/java/ref,\ allclasses-frame.html \ allclasses-noframe.html \ com/sun/star/comp/helper/Bootstrap.html \ diff --git a/odk/Package_lib.mk b/odk/Package_lib.mk index c9758f8ca44a..05465c03812f 100644 --- a/odk/Package_lib.mk +++ b/odk/Package_lib.mk @@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,odk_lib,$(WORKDIR)/LinkTarget/StaticLibrary)) $(eval $(call gb_Package_set_outdir,odk_lib,$(INSTDIR))) -$(eval $(call gb_Package_add_files,odk_lib,$(gb_Package_SDKDIRNAME)/lib,\ +$(eval $(call gb_Package_add_files,odk_lib,$(SDKDIRNAME)/lib,\ $(if $(filter LINUX,$(OS)),$(notdir $(call gb_StaticLibrary_get_target,salcpprt))) \ )) diff --git a/odk/Package_odk_headers.mk b/odk/Package_odk_headers.mk index fca30c43046e..3a05a01b9a40 100644 --- a/odk/Package_odk_headers.mk +++ b/odk/Package_odk_headers.mk @@ -12,7 +12,7 @@ $(eval $(call gb_Package_Package,odk_headers,$(SRCDIR)/include)) $(eval $(call gb_Package_set_outdir,odk_headers,$(INSTDIR))) -$(eval $(call gb_Package_add_files_with_dir,odk_headers,$(gb_Package_SDKDIRNAME)/include,\ +$(eval $(call gb_Package_add_files_with_dir,odk_headers,$(SDKDIRNAME)/include,\ com/sun/star/uno/Any.h \ com/sun/star/uno/Any.hxx \ com/sun/star/uno/Reference.h \ diff --git a/odk/Package_odk_headers_generated.mk b/odk/Package_odk_headers_generated.mk index fff5c6b85750..819edcdb1dcc 100644 --- a/odk/Package_odk_headers_generated.mk +++ b/odk/Package_odk_headers_generated.mk @@ -12,6 +12,6 @@ $(eval $(call gb_Package_Package,odk_headers_generated,$(BUILDDIR)/config_$(gb_S $(eval $(call gb_Package_set_outdir,odk_headers_generated,$(INSTDIR))) -$(eval $(call gb_Package_add_file,odk_headers_generated,$(gb_Package_SDKDIRNAME)/include/sal/typesizes.h,config_typesizes.h)) +$(eval $(call gb_Package_add_file,odk_headers_generated,$(SDKDIRNAME)/include/sal/typesizes.h,config_typesizes.h)) # vim: set noet sw=4 ts=4: diff --git a/odk/Package_settings.mk b/odk/Package_settings.mk index 2490717f672f..74fc071b1d2b 100644 --- a/odk/Package_settings.mk +++ b/odk/Package_settings.mk @@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,odk_settings,$(SRCDIR)/odk/settings)) $(eval $(call gb_Package_set_outdir,odk_settings,$(INSTDIR))) -$(eval $(call gb_Package_add_files,odk_settings,$(gb_Package_SDKDIRNAME)/settings,\ +$(eval $(call gb_Package_add_files,odk_settings,$(SDKDIRNAME)/settings,\ $(if $(filter WNT,$(OS)),component.uno.def) \ platform.mk \ settings.mk \ diff --git a/odk/Package_settings_generated.mk b/odk/Package_settings_generated.mk index 1b3f6379bd57..6264a564b4ab 100644 --- a/odk/Package_settings_generated.mk +++ b/odk/Package_settings_generated.mk @@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,odk_settings_generated,$(call gb_CustomTarget_g $(eval $(call gb_Package_set_outdir,odk_settings_generated,$(INSTDIR))) -$(eval $(call gb_Package_add_files,odk_settings_generated,$(gb_Package_SDKDIRNAME)/settings,\ +$(eval $(call gb_Package_add_files,odk_settings_generated,$(SDKDIRNAME)/settings,\ dk.mk \ )) diff --git a/odk/Package_share_readme.mk b/odk/Package_share_readme.mk index 5128d6ba6409..79d8e17259c6 100644 --- a/odk/Package_share_readme.mk +++ b/odk/Package_share_readme.mk @@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,odk_share_readme,$(OUTDIR)/bin)) $(eval $(call gb_Package_set_outdir,odk_share_readme,$(INSTDIR))) -$(eval $(call gb_Package_add_files,odk_share_readme,$(gb_Package_SDKDIRNAME)/share/readme,\ +$(eval $(call gb_Package_add_files,odk_share_readme,$(SDKDIRNAME)/share/readme,\ LICENSE.html \ osl/$(gb_LICENSE) \ osl/$(call gb_README,en-US) \ diff --git a/odk/Package_unowinreg.mk b/odk/Package_unowinreg.mk index f253547b7035..a62ddadebd04 100644 --- a/odk/Package_unowinreg.mk +++ b/odk/Package_unowinreg.mk @@ -23,6 +23,6 @@ $(eval $(call gb_Package_Package,odk_unowinreg,$(odk_unowinreg_DIR))) $(eval $(call gb_Package_set_outdir,odk_unowinreg,$(INSTDIR))) -$(eval $(call gb_Package_add_file,odk_unowinreg,$(gb_Package_SDKDIRNAME)/classes/win/unowinreg.dll,$(odk_unowinreg_FILE))) +$(eval $(call gb_Package_add_file,odk_unowinreg,$(SDKDIRNAME)/classes/win/unowinreg.dll,$(odk_unowinreg_FILE))) # vim: set noet sw=4 ts=4: diff --git a/solenv/gbuild/Executable.mk b/solenv/gbuild/Executable.mk index 2fd5c1d7444a..328b6398801d 100644 --- a/solenv/gbuild/Executable.mk +++ b/solenv/gbuild/Executable.mk @@ -25,13 +25,13 @@ gb_Executable_LAYER_DIRS := \ UREBIN:$(INSTROOT)/$(LIBO_URE_BIN_FOLDER) \ OOO:$(INSTROOT)/$(LIBO_BIN_FOLDER) \ - SDKBIN:$(INSTDIR)/$(gb_Package_SDKDIRNAME)/bin \ + SDKBIN:$(INSTDIR)/$(SDKDIRNAME)/bin \ NONE:$(gb_Executable_BINDIR) \ gb_Executable_LAYER_DIRS_FOR_BUILD := \ UREBIN:$(INSTROOT_FOR_BUILD)/$(LIBO_URE_BIN_FOLDER_FOR_BUILD) \ OOO:$(INSTROOT_FOR_BUILD)/$(LIBO_BIN_FOLDER_FOR_BUILD) \ - SDKBIN:$(INSTDIR_FOR_BUILD)/$(gb_Package_SDKDIRNAME)/bin \ + SDKBIN:$(INSTDIR_FOR_BUILD)/$(SDKDIRNAME_FOR_BUILD)/bin \ NONE:$(gb_Executable_BINDIR_FOR_BUILD) \ $(dir $(call gb_Executable_get_runtime_target,%)).dir : diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk index e0ad137a1cfd..5eb7c2adb824 100644 --- a/solenv/gbuild/Library.mk +++ b/solenv/gbuild/Library.mk @@ -50,7 +50,7 @@ gb_Library__get_dir_for_layer = $(patsubst $(1):%,%,$(filter $(1):%,$(gb_Library gb_Library_get_instdir = $(call gb_Library__get_dir_for_layer,$(call gb_Library_get_layer,$(1))) gb_Library_get_install_target = $(call gb_Library_get_instdir,$(1))/$(call gb_Library_get_runtime_filename,$(1)) -gb_Library_get_ilib_target = $(if $(filter $(1),$(gb_Library_RTVERLIBS) $(gb_Library_UNOVERLIBS)),$(INSTDIR)/$(gb_Package_SDKDIRNAME)/lib/$(call gb_Library_get_ilibfilename,$(1)),$(gb_Library_DLLDIR)/$(call gb_Library_get_ilibfilename,$(1))) +gb_Library_get_ilib_target = $(if $(filter $(1),$(gb_Library_RTVERLIBS) $(gb_Library_UNOVERLIBS)),$(INSTDIR)/$(SDKDIRNAME)/lib/$(call gb_Library_get_ilibfilename,$(1)),$(gb_Library_DLLDIR)/$(call gb_Library_get_ilibfilename,$(1))) define gb_Library_Library $(call gb_Postprocess_register_target,AllLibraries,Library,$(1)) diff --git a/solenv/gbuild/Package.mk b/solenv/gbuild/Package.mk index 606bca3501df..595ad859aabd 100644 --- a/solenv/gbuild/Package.mk +++ b/solenv/gbuild/Package.mk @@ -65,9 +65,6 @@ endef gb_Package_PROGRAMDIRNAME := $(LIBO_BIN_FOLDER) -# defined by platform -# gb_Package_SDKDIRNAME - $(dir $(call gb_Package_get_target,%)).dir : $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@)) diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk index 6cf9434177b6..747c50b5a20a 100644 --- a/solenv/gbuild/TargetLocations.mk +++ b/solenv/gbuild/TargetLocations.mk @@ -231,7 +231,7 @@ $(WORKDIR)/LinkTarget/$(call gb_Library__get_workdir_linktargetname,$(1)).export endef define gb_Library_get_versionlink_target -$(INSTDIR)/$(gb_Package_SDKDIRNAME)/lib/$(basename $(call gb_Library_get_filename,$(1))) +$(INSTDIR)/$(SDKDIRNAME)/lib/$(basename $(call gb_Library_get_filename,$(1))) endef gb_Library__get_final_target = $(WORKDIR)/Dummy/$(1) diff --git a/solenv/gbuild/UnoApi.mk b/solenv/gbuild/UnoApi.mk index 455cbec814a6..1b6494116f3c 100644 --- a/solenv/gbuild/UnoApi.mk +++ b/solenv/gbuild/UnoApi.mk @@ -55,7 +55,7 @@ $(call gb_UnoApi_get_clean_target,$(1)) : $(call gb_Package_get_clean_target,$(1 endef define gb_UnoApi__add_idlfile -$(call gb_Package_add_file,$(1)_idl,$(patsubst $(1)/%,$(gb_Package_SDKDIRNAME)/idl/%,$(2).idl),$(2).idl) +$(call gb_Package_add_file,$(1)_idl,$(patsubst $(1)/%,$(SDKDIRNAME)/idl/%,$(2).idl),$(2).idl) endef diff --git a/solenv/gbuild/platform/IOS_ARM_GCC.mk b/solenv/gbuild/platform/IOS_ARM_GCC.mk index 8d4f7ebd3835..a5f241f2925f 100644 --- a/solenv/gbuild/platform/IOS_ARM_GCC.mk +++ b/solenv/gbuild/platform/IOS_ARM_GCC.mk @@ -196,10 +196,10 @@ gb_Executable_EXT := gb_Executable_TARGETTYPEFLAGS := gb_Executable_LAYER := \ - $(foreach exe,$(gb_Executable_UREBIN),$(exe):OOO) \ - $(foreach exe,$(gb_Executable_SDK),$(exe):OOO) \ + $(foreach exe,$(gb_Executable_UREBIN),$(exe):UREBIN) \ + $(foreach exe,$(gb_Executable_SDK),$(exe):SDKBIN) \ $(foreach exe,$(gb_Executable_OOO),$(exe):OOO) \ - $(foreach exe,$(gb_Executable_NONE),$(exe):OOO) \ + $(foreach exe,$(gb_Executable_NONE),$(exe):NONE) \ define gb_Executable_Executable_platform @@ -257,9 +257,6 @@ else gb_UnoApiHeadersTarget_select_variant = $(2) endif -# Package class -gb_Package_SDKDIRNAME := sdk - # UIMenubarTarget class define gb_UIMenubarTarget__command diff --git a/solenv/gbuild/platform/com_GCC_class.mk b/solenv/gbuild/platform/com_GCC_class.mk index 6fef56eb0a65..7fd6c50e118d 100644 --- a/solenv/gbuild/platform/com_GCC_class.mk +++ b/solenv/gbuild/platform/com_GCC_class.mk @@ -221,7 +221,7 @@ gb_StaticLibrary_StaticLibrary_platform := gb_LinkTarget_get_linksearchpath_for_layer = \ -L$(WORKDIR)/LinkTarget/StaticLibrary \ - -L$(INSTDIR)/$(gb_Package_SDKDIRNAME)/lib \ + -L$(INSTDIR)/$(SDKDIRNAME)/lib \ $(foreach layer,\ $(subst +, ,$(patsubst $(1):%.,%,\ $(filter $(1):%.,$(gb_LinkTarget_LAYER_LINKPATHS)))),\ diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk index 61e452737e84..421a02029386 100644 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -144,7 +144,7 @@ gb_LinkTarget_get_manifestfile = \ gb_LinkTarget_get_linksearchpath_for_layer = \ -LIBPATH:$(WORKDIR)/LinkTarget/StaticLibrary \ - -LIBPATH:$(INSTDIR)/$(gb_Package_SDKDIRNAME)/lib \ + -LIBPATH:$(INSTDIR)/$(SDKDIRNAME)/lib \ $(if $(filter OXT,$(1)),\ -LIBPATH:$(WORKDIR)/LinkTarget/ExtensionLibrary, \ -LIBPATH:$(WORKDIR)/LinkTarget/Library) @@ -559,9 +559,6 @@ else gb_UnoApiHeadersTarget_select_variant = $(2) endif -# Package class -gb_Package_SDKDIRNAME := sdk - # UIMenubarTarget class define gb_UIMenubarTarget__command diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index be5a01980e23..fbef9ba13750 100644 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -368,9 +368,6 @@ else gb_UnoApiHeadersTarget_select_variant = $(2) endif -# Package class -gb_Package_SDKDIRNAME := LibreOffice$(PRODUCTVERSION)_SDK - # UIMenubarTarget class define gb_UIMenubarTarget__command diff --git a/solenv/gbuild/platform/mingw.mk b/solenv/gbuild/platform/mingw.mk index 5b13981737ea..acdf23c5e7e8 100644 --- a/solenv/gbuild/platform/mingw.mk +++ b/solenv/gbuild/platform/mingw.mk @@ -370,9 +370,6 @@ else gb_UnoApiHeadersTarget_select_variant = $(2) endif -# Package class -gb_Package_SDKDIRNAME := sdk - # UIMenubarTarget class define gb_UIMenubarTarget__command diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk index b9ad99d9d768..4877af41e008 100644 --- a/solenv/gbuild/platform/solaris.mk +++ b/solenv/gbuild/platform/solaris.mk @@ -393,9 +393,6 @@ else gb_UnoApiHeadersTarget_select_variant = $(2) endif -# Package class -gb_Package_SDKDIRNAME := sdk - # UIMenubarTarget class define gb_UIMenubarTarget__command diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk index bda7cfa702f9..f77fd993b1f2 100644 --- a/solenv/gbuild/platform/unxgcc.mk +++ b/solenv/gbuild/platform/unxgcc.mk @@ -390,9 +390,6 @@ else gb_UnoApiHeadersTarget_select_variant = $(2) endif -# Package class -gb_Package_SDKDIRNAME := sdk - # UIMenubarTarget class define gb_UIMenubarTarget__command |