[Libreoffice-commits] core.git: 22 commits - cli_ure/CustomTarget_cli_ure_assemblies.mk cli_ure/Library_cli_cppuhelper_native.mk cli_ure/source configure.ac extensions/WinResTarget_activex.mk external/curl external/libabw external/libfreehand external/libvisio external/nss external/openssl external/python3 Makefile.in odk/CustomTarget_check.mk odk/CustomTarget_javadoc.mk postprocess/CustomTarget_registry.mk RepositoryExternal.mk sd/inc sd/Library_sd.mk sd/source solenv/bin solenv/gbuild svx/Module_svx.mk svx/source sw/inc sw/Library_sw.mk sw/source toolkit/Library_tk.mk toolkit/source vcl/CustomTarget_afm_hash.mk vcl/inc vcl/Library_vcl.mk vcl/source vcl/unx
Michael Stahl
mstahl at redhat.com
Mon Jun 9 08:17:25 PDT 2014
Makefile.in | 2
RepositoryExternal.mk | 2
cli_ure/CustomTarget_cli_ure_assemblies.mk | 12 +-
cli_ure/Library_cli_cppuhelper_native.mk | 2
cli_ure/source/basetypes/assembly.cs | 1
cli_ure/source/native/assembly.cxx | 1
cli_ure/source/ure/assembly.cs | 1
configure.ac | 3
extensions/WinResTarget_activex.mk | 2
external/curl/ExternalPackage_curl.mk | 2
external/libabw/UnpackedTarball_libabw.mk | 4
external/libabw/libabw_quote.patch.1 | 11 ++
external/libfreehand/UnpackedTarball_libfreehand.mk | 4
external/libfreehand/libfreehand_quote.patch.1 | 11 ++
external/libvisio/UnpackedTarball_libvisio.mk | 4
external/libvisio/libvisio_quote.patch.1 | 11 ++
external/nss/UnpackedTarball_nss.mk | 1
external/nss/nss-win32-make.patch.1 | 20 ++++
external/openssl/UnpackedTarball_openssl.mk | 87 ++------------------
external/python3/ExternalPackage_python3.mk | 34 +++----
external/python3/ExternalProject_python3.mk | 2
odk/CustomTarget_check.mk | 2
odk/CustomTarget_javadoc.mk | 5 -
postprocess/CustomTarget_registry.mk | 7 -
sd/Library_sd.mk | 1
sd/inc/pch/precompiled_sd.hxx | 1
sd/source/ui/dlg/sdabstdlg.cxx | 3
solenv/bin/concat-deps.c | 4
solenv/gbuild/AutoInstall.mk | 9 +-
solenv/gbuild/CliAssembly.mk | 2
solenv/gbuild/CliLibrary.mk | 12 +-
solenv/gbuild/Gallery.mk | 4
solenv/gbuild/Helper.mk | 9 --
solenv/gbuild/Rdb.mk | 14 +--
solenv/gbuild/Tempfile.mk | 5 -
solenv/gbuild/UIConfig.mk | 4
solenv/gbuild/UnpackedTarball.mk | 7 -
solenv/gbuild/gbuild.mk | 2
solenv/gbuild/partial_build.mk | 2
solenv/gbuild/platform/com_GCC_class.mk | 10 ++
solenv/gbuild/platform/com_MSC_class.mk | 13 ++
svx/Module_svx.mk | 2
svx/source/gengal/gengal.cxx | 67 +++++++++++++++
sw/Library_sw.mk | 1
sw/inc/pch/precompiled_sw.hxx | 1
sw/source/uibase/dialog/swabstdlg.cxx | 3
toolkit/Library_tk.mk | 1
toolkit/source/awt/vclxtoolkit.cxx | 4
vcl/CustomTarget_afm_hash.mk | 2
vcl/Library_vcl.mk | 3
vcl/inc/pch/precompiled_vcl.hxx | 1
vcl/source/app/svapp.cxx | 3
vcl/source/window/abstdlg.cxx | 8 +
vcl/unx/generic/plugadapt/salplug.cxx | 4
54 files changed, 260 insertions(+), 173 deletions(-)
New commits:
commit 0584e7233ebf663bbcdc3fe929c0172d895b94ea
Author: Michael Stahl <mstahl at redhat.com>
Date: Fri Jun 6 12:36:56 2014 +0200
gbuild: UnpackedTarball: use Win32 paths for make targets
Change-Id: I78f56bb28d4b9b6c0696f83f3e06d836fd3427cd
diff --git a/configure.ac b/configure.ac
index 9cc1583..3ef3ce2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4816,7 +4816,8 @@ if test -z "$TARFILE_LOCATION"; then
TARFILE_LOCATION="$SRC_ROOT/external/tarballs"
else
AbsolutePath "$TARFILE_LOCATION"
- TARFILE_LOCATION="${absolute_path}"
+ PathFormat "${absolute_path}"
+ TARFILE_LOCATION="${formatted_path}"
fi
AC_SUBST(TARFILE_LOCATION)
diff --git a/solenv/gbuild/UnpackedTarball.mk b/solenv/gbuild/UnpackedTarball.mk
index 6021acb..c7d707c 100644
--- a/solenv/gbuild/UnpackedTarball.mk
+++ b/solenv/gbuild/UnpackedTarball.mk
@@ -13,6 +13,7 @@
# platform
# gb_UnpackedTarget_TARFILE_LOCATION
+# NOTE: only for commands; targets should use TARFILE_LOCATION directly
gb_UnpackedTarget_STRIP_COMPONENTS_TAR_DEFAULT := 1
gb_UnpackedTarget_STRIP_COMPONENTS_ZIP_DEFAULT := 0
@@ -89,7 +90,7 @@ $(call gb_UnpackedTarget_get_target,$(1)) : UNPACKED_DIR := $(2)
$(call gb_UnpackedTarget_get_target,$(1)) : UNPACKED_TARBALL := $(gb_UnpackedTarget_TARFILE_LOCATION)/$(1)
$(call gb_UnpackedTarget_get_target,$(1)) : UNPACKED_STRIP_COMPONENTS := $(call gb_UnpackedTarget__get_strip_components,$(1),$(3))
-$(call gb_UnpackedTarget_get_target,$(1)) : $(gb_UnpackedTarget_TARFILE_LOCATION)/$(1)
+$(call gb_UnpackedTarget_get_target,$(1)) : $(TARFILE_LOCATION)/$(1)
$(call gb_UnpackedTarget_get_target,$(1)) :| $(dir $(call gb_UnpackedTarget_get_target,$(1))).dir
endef
@@ -242,8 +243,8 @@ $(call gb_UnpackedTarget_get_target,$(2)) : $(call gb_UnpackedTarball_get_prepar
$(if $(findstring in,$(5)),
$(call gb_UnpackedTarball_get_target,$(1)) : UNPACKED_IS_BIN_TARBALL := YES
$(call gb_ExternalProject_get_state_target,$(1),%) : UNPACKED_IS_BIN_TARBALL := YES)
-$(if $(findstring out,$(5)),$(call gb_Module_get_target,$(4)) : $(gb_UnpackedTarget_TARFILE_LOCATION)/$(6)
-$(gb_UnpackedTarget_TARFILE_LOCATION)/$(6) : $(call gb_Module_get_nonl10n_target,$(4))
+$(if $(findstring out,$(5)),$(call gb_Module_get_target,$(4)) : $(TARFILE_LOCATION)/$(6)
+$(TARFILE_LOCATION)/$(6) : $(call gb_Module_get_nonl10n_target,$(4))
$$(call gb_Output_announce,$(6),$(true),PKB,3)
if test ! -f "$$@" ; then cd $(call gb_UnpackedTarball_get_dir,) && $(GNUTAR) -czf "$$@" $(1)/ || $(GNUTAR) -czf "$$@" $(1)/ ; else touch "$$@" ; fi)
commit ba1a503feeda6704a1337b9ccc6c0f2288a574de
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Jun 4 22:04:30 2014 +0200
postprocess: command line limit work around for Win32 make
Use var2file to write registry input files.
Change-Id: I0edfd94440a47a0c4b21bf2b354d6467016f5f68
diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk
index b147251..878be8d 100644
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@@ -621,8 +621,9 @@ $(call gb_CustomTarget_get_workdir,postprocess/registry)/registry_%.list :
$(call gb_CustomTarget_get_workdir,postprocess/registry)/%.list :
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,2)
- echo '<list>' $(foreach i,$(postprocess_DEPS_$*), '<dependency file="$i"/>') \
- $(foreach i,$(postprocess_OPTDEPS_$*), '<dependency file="$i" optional="true"/>') \
- $(foreach i,$(postprocess_FILES_$*), '<filename>$(i)</filename>') '</list>' > $@
+ mv $(call var2file,$@.tmp,70,<list> $(foreach i,$(postprocess_DEPS_$*), <dependency file='$i'/>) \
+ $(foreach i,$(postprocess_OPTDEPS_$*), <dependency file='$i' optional='true'/>) \
+ $(foreach i,$(postprocess_FILES_$*), <filename>$(i)</filename>) </list>) \
+ $@
# vim: set noet sw=4 ts=4:
commit 9a8c82c66eca101c87d01627522cb5f691d4ad74
Author: Michael Stahl <mstahl at redhat.com>
Date: Mon Jun 2 01:18:46 2014 +0200
gbuild, gengal: Win32 make command line limit strikes again ...
... so add a response file parameter --filename.
Change-Id: Idc71de7508b571b0e0608a65b92cd45e6800f7c3
diff --git a/solenv/gbuild/Gallery.mk b/solenv/gbuild/Gallery.mk
index 82c5e78..2ce708d 100644
--- a/solenv/gbuild/Gallery.mk
+++ b/solenv/gbuild/Gallery.mk
@@ -31,6 +31,7 @@ define gb_Gallery__command
$(call gb_Output_announce,$(2),$(true),GAL,1)
$(call gb_Helper_abbreviate_dirs,\
rm -f $(call gb_Gallery_get_workdir,$(2))/* && \
+ RESPONSEFILE=$(call var2file,$(shell $(call gb_MKTEMP)),100,$(GALLERY_FILES)) && \
$(call gb_Helper_print_on_error,\
$(if $(filter-out MACOSX WNT,$(OS_FOR_BUILD)),$(if $(ENABLE_HEADLESS),, \
SAL_USE_VCLPLUGIN=svp \
@@ -41,9 +42,10 @@ $(call gb_Helper_abbreviate_dirs,\
--destdir $(GALLERY_BASEDIR) \
--name "$(GALLERY_NAME)" \
--path $(call gb_Gallery_get_workdir,$(2)) \
- $(GALLERY_FILES),\
+ --filenames $(call gb_Helper_make_url,$$RESPONSEFILE),\
$@.log \
) && \
+ rm $$RESPONSEFILE && \
touch $@ \
)
endef
diff --git a/svx/source/gengal/gengal.cxx b/svx/source/gengal/gengal.cxx
index 547fb4f..ca045cf 100644
--- a/svx/source/gengal/gengal.cxx
+++ b/svx/source/gengal/gengal.cxx
@@ -208,6 +208,71 @@ void GalApp::Init()
}
}
+std::vector<OUString> ReadResponseFile_Impl(OUString const& rInput)
+{
+ osl::File file(rInput);
+ osl::FileBase::RC rc = file.open(osl_File_OpenFlag_Read);
+ OString const uInput(rtl::OUStringToOString(rInput, RTL_TEXTENCODING_UTF8));
+ if (osl::FileBase::E_None != rc)
+ {
+ fprintf(stderr, "error while opening response file: %s (%d)\n",
+ uInput.getStr(), rc);
+ exit(1);
+ }
+
+ std::vector<OUString> ret;
+ OUStringBuffer b;
+ char buf[1<<16];
+ while (true)
+ {
+ sal_uInt64 size(0);
+ rc = file.read(buf, sizeof(buf), size);
+ if (osl::FileBase::E_None != rc)
+ {
+ fprintf(stderr, "error while reading response file: %s (%d)\n",
+ uInput.getStr(), rc);
+ exit(1);
+ }
+ if (!size)
+ break;
+ for (sal_uInt64 i = 0; i < size; ++i)
+ {
+ if (static_cast<unsigned char>(buf[i]) >= 128)
+ {
+ fprintf(stderr, "non-ASCII character in response file: %s\n",
+ uInput.getStr());
+ exit(1);
+ }
+ switch (buf[i])
+ {
+ case ' ' :
+ case '\t':
+ case '\r':
+ case '\n':
+ if (!b.isEmpty())
+ ret.push_back(b.makeStringAndClear());
+ break;
+ default:
+ b.append(buf[i]);
+ break;
+ }
+ }
+ }
+ if (!b.isEmpty())
+ ret.push_back(b.makeStringAndClear());
+ return ret;
+}
+
+void
+ReadResponseFile(std::vector<INetURLObject> & rFiles, OUString const& rInput)
+{
+ std::vector<OUString> files(ReadResponseFile_Impl(rInput));
+ for (size_t i = 0; i < files.size(); ++i)
+ {
+ rFiles.push_back(Smartify(files[i]));
+ }
+}
+
int GalApp::Main()
{
OUString aPath, aDestDir;
@@ -239,6 +304,8 @@ int GalApp::Main()
else if ( aParam == "--number-from" )
fprintf ( stderr, "--number-from is deprecated, themes now "
"have filenames based on their names\n" );
+ else if ( aParam == "--filenames" )
+ ReadResponseFile(aFiles, GetCommandLineParam(++i));
else
aFiles.push_back( Smartify( aParam ) );
}
commit f517362fb6df839e9d1f828b286e1709cbbbe235
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Jun 4 22:11:23 2014 +0200
gbuild: Rdb: another workaround for Win32 make command line limit
This breaks in postprocess (services.rdb).
Change-Id: I573279e510b5f3dedd7e32059688d21c4c844c47
diff --git a/solenv/gbuild/Rdb.mk b/solenv/gbuild/Rdb.mk
index 1bbc873..e935191 100644
--- a/solenv/gbuild/Rdb.mk
+++ b/solenv/gbuild/Rdb.mk
@@ -11,15 +11,15 @@ gb_Rdb__get_install_target = $(INSTROOT)/$(LIBO_ETC_FOLDER)/services/$(1).rdb
define gb_Rdb__command
$(call gb_Helper_abbreviate_dirs,\
+ RESPONSEFILE=$(call var2file,$(shell $(call gb_MKTEMP)),70,\
+ <list> \
+ $(foreach component,$(COMPONENTS),\
+ <filename>$(call gb_ComponentTarget_get_target,$(component))</filename>) \
+ </list>) && \
mkdir -p $(dir $@) && \
- (\
- echo '<list>' && \
- $(foreach component,$(COMPONENTS),echo "<filename>$(call gb_ComponentTarget_get_target,$(component))</filename>" &&) \
- echo '</list>' \
- ) > $(1).input && \
$(call gb_ExternalExecutable_get_command,xsltproc) --nonet -o $(1) \
- $(SRCDIR)/solenv/bin/packcomponents.xslt $(1).input && \
- rm $(1).input)
+ $(SRCDIR)/solenv/bin/packcomponents.xslt $$RESPONSEFILE && \
+ rm $$RESPONSEFILE)
endef
$(call gb_Rdb_get_target,%) :| $(call gb_ExternalExecutable_get_dependencies,xsltproc)
commit e85ddc17698168046d452df35cacfeac3932eedb
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Jun 4 22:30:05 2014 +0200
gbuild: UIConfig: response file to work around Win32 command line limit
Change-Id: I74d7ed5dd35e51168cc788a8336cf932b92102ca
diff --git a/solenv/gbuild/UIConfig.mk b/solenv/gbuild/UIConfig.mk
index 5588234..7fdb7e1 100644
--- a/solenv/gbuild/UIConfig.mk
+++ b/solenv/gbuild/UIConfig.mk
@@ -184,9 +184,7 @@ $(call gb_UIConfig_get_target,%) : $(call gb_UIConfig_get_imagelist_target,%)
)
$(call gb_UIConfig_get_imagelist_target,%) :
- $(call gb_Helper_abbreviate_dirs,\
- sort -u $(UI_IMAGELISTS) /dev/null > $@ \
- )
+ $(call gb_UIConfig__command)
.PHONY : $(call gb_UIConfig_get_clean_target,%)
$(call gb_UIConfig_get_clean_target,%) :
diff --git a/solenv/gbuild/platform/com_GCC_class.mk b/solenv/gbuild/platform/com_GCC_class.mk
index 3c109fe..6c8c574 100644
--- a/solenv/gbuild/platform/com_GCC_class.mk
+++ b/solenv/gbuild/platform/com_GCC_class.mk
@@ -207,4 +207,14 @@ gb_LinkTarget_get_linksearchpath_for_layer = \
gb_ICU_PRECOMMAND := $(call gb_Helper_extend_ld_path,$(WORKDIR_FOR_BUILD)/UnpackedTarball/icu/source/lib)
+# UIConfig class
+
+# Mac OS X sort(1) cannot read a response file
+define gb_UIConfig__command
+$(call gb_Helper_abbreviate_dirs,\
+ sort -u $(UI_IMAGELISTS) /dev/null > $@ \
+)
+
+endef
+
# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk
index 60fb59e..7840223 100755
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -537,6 +537,19 @@ else
gb_UnoApiHeadersTarget_select_variant = $(2)
endif
+# UIConfig class
+
+# use responsefile because cui has too many files for command line
+define gb_UIConfig__command
+$(call gb_Helper_abbreviate_dirs,\
+ RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),100,$(if $(UI_IMAGELISTS),$(strip $(UI_IMAGELISTS)),/dev/null)) \
+ && tr " " "\000" < $$RESPONSEFILE | tr -d "\r\n" > $$RESPONSEFILE.0 \
+ && sort -u --files0-from=$$RESPONSEFILE.0 > $@ \
+ && rm $$RESPONSEFILE $$RESPONSEFILE.0 \
+)
+
+endef
+
# UIMenubarTarget class
define gb_UIMenubarTarget__command
commit 59801c706d440d15b0baf0aec4aad30a9c55bd8f
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Jun 4 16:59:26 2014 +0200
gbuild: AutoInstall: work around command line limit with Win32 make
Change-Id: Ice87781147d62d2ba5f7fe3e7cede89a0404c186
diff --git a/solenv/gbuild/AutoInstall.mk b/solenv/gbuild/AutoInstall.mk
index 5701b7f..c6b33f9 100644
--- a/solenv/gbuild/AutoInstall.mk
+++ b/solenv/gbuild/AutoInstall.mk
@@ -30,8 +30,13 @@ $(call gb_AutoInstall_get_target,%) : $(GBUILDDIR)/AutoInstall.mk \
$(foreach exe,$(gb_Executable_MODULE_$*),auto_$*_exe_$(exe)) \
$(foreach jar,$(gb_Jar_MODULE_$*),auto_$*_jar_$(jar)) \
$(foreach pkg,$(gb_Package_MODULE_$*),auto_$*_pkg_$(pkg)))
- $(foreach lib,$(gb_Library_MODULE_$*),\
- echo '$(SCP2LIBTEMPLATE)(auto_$*_lib_$(lib),$(call gb_Library_get_runtime_filename,$(lib))$(if $(SCP2COMPONENTCONDITION),$(COMMA)$(SCP2COMPONENTCONDITION)))' >> $@;)
+ # ugly hack for Win32 8k command line length limit
+ $(foreach lib,$(wordlist 1,70,$(gb_Library_MODULE_$*)),\
+ echo '$(SCP2LIBTEMPLATE)(auto_$*_lib_$(lib),$(call gb_Library_get_runtime_filename,$(lib))$(if $(SCP2COMPONENTCONDITION),$(COMMA)$(SCP2COMPONENTCONDITION)))' >> $@ &&) true
+ $(foreach lib,$(wordlist 71,140,$(gb_Library_MODULE_$*)),\
+ echo '$(SCP2LIBTEMPLATE)(auto_$*_lib_$(lib),$(call gb_Library_get_runtime_filename,$(lib))$(if $(SCP2COMPONENTCONDITION),$(COMMA)$(SCP2COMPONENTCONDITION)))' >> $@ &&) true
+ $(foreach lib,$(wordlist 141,9999,$(gb_Library_MODULE_$*)),\
+ echo '$(SCP2LIBTEMPLATE)(auto_$*_lib_$(lib),$(call gb_Library_get_runtime_filename,$(lib))$(if $(SCP2COMPONENTCONDITION),$(COMMA)$(SCP2COMPONENTCONDITION)))' >> $@ &&) true
$(foreach lib,$(gb_SdkLinkLibrary_MODULE_$*),\
echo 'SDK_LIBRARY_LINK(auto_$*_link_$(lib),$(notdir $(call gb_Library_get_sdk_link_lib,$(lib))),../../ure-link/lib/$(call gb_Library_get_runtime_filename,$(lib)))' >> $@;)
$(foreach exe,$(gb_Executable_MODULE_$*),\
commit 50b10febf3d8fa76d928581b93c4dbd07a086ad5
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Jun 4 22:13:13 2014 +0200
gbuild: tweak var2file so it handles some shell metacharacters
Always quote the passed string; this cannot handle arbitrary strings
like $(file) can, but everything that is needed currently.
Also, try to ensure that output does not start with a space.
Note: there needs to be a newline at the end, otherwise helpex
ignores the last item on the line.
Change-Id: I51a4058591cc4f12dd878c2d113bd5cfc8c22d61
diff --git a/solenv/gbuild/Tempfile.mk b/solenv/gbuild/Tempfile.mk
index d10e1d2..3fede2a 100644
--- a/solenv/gbuild/Tempfile.mk
+++ b/solenv/gbuild/Tempfile.mk
@@ -29,13 +29,14 @@ else
define var2file
$(strip $(1)
$(eval gb_var2file_helpervar := $$(shell printf "%s" "" > $(1) ))\
-$(foreach item,$(3),$(eval gb_var2file_curblock += $(item)
+$(eval gb_var2file_curblock := $(firstword $(3)))\
+$(foreach item,$(wordlist 2,99999,$(3)),$(eval gb_var2file_curblock += $(item)
ifeq ($$(words $$(gb_var2file_curblock)),$(2))
gb_var2file_helpervar := $$(shell printf "%s" "$$(gb_var2file_curblock)" >> $(1) )
gb_var2file_curblock :=
endif
))\
- $(eval gb_var2file_helpervar := $(shell echo " "$(gb_var2file_curblock) >> $(1) )
+ $(eval gb_var2file_helpervar := $(shell printf "%s\n" "$(gb_var2file_curblock)" >> $(1) )
gb_var2file_curblock :=
))
endef
commit 0d2542d67ab77134e91317d45ea62e548a692067
Author: Michael Stahl <mstahl at redhat.com>
Date: Mon Jun 2 00:44:38 2014 +0200
gbuild, cli_ure: Win32 make issues with back and forward slashes
It looks like what works is to give the source file names with
backslashes but everything else with forward slashes?
Change-Id: Iaf910ab5fc41984d1315a30b164a334d28344c16
diff --git a/cli_ure/Library_cli_cppuhelper_native.mk b/cli_ure/Library_cli_cppuhelper_native.mk
index fa55e42..952bba8 100644
--- a/cli_ure/Library_cli_cppuhelper_native.mk
+++ b/cli_ure/Library_cli_cppuhelper_native.mk
@@ -21,7 +21,7 @@ $(eval $(call gb_Library_add_cxxflags,cli_cppuhelper,\
$(eval $(call gb_Library_add_ldflags,cli_cppuhelper,\
-ignore:4248 \
- -keyfile:$(call gb_Helper_windows_path,$(SRCDIR)/cli_ure/source/cliuno.snk) \
+ -keyfile:$(SRCDIR)/cli_ure/source/cliuno.snk \
))
$(eval $(call gb_Library_add_ldflags,cli_cppuhelper,\
diff --git a/solenv/gbuild/CliAssembly.mk b/solenv/gbuild/CliAssembly.mk
index 5683ae7..a745e8e 100644
--- a/solenv/gbuild/CliAssembly.mk
+++ b/solenv/gbuild/CliAssembly.mk
@@ -59,7 +59,7 @@ $(call gb_Helper_abbreviate_dirs,\
-nologo \
-out:$(CLI_ASSEMBLY_OUTFILE) \
-version:$(CLI_ASSEMBLY_VERSION) \
- -keyfile:$(call gb_Helper_windows_path,$(CLI_ASSEMBLY_KEYFILE)) \
+ -keyfile:$(CLI_ASSEMBLY_KEYFILE) \
-link:$(CLI_ASSEMBLY_CONFIGFILE) \
$(if $(CLI_ASSEMBLY_PLATFORM),-platform:$(CLI_ASSEMBLY_PLATFORM)) && \
touch $(1) \
diff --git a/solenv/gbuild/CliLibrary.mk b/solenv/gbuild/CliLibrary.mk
index 3883e7f..8c863a7 100644
--- a/solenv/gbuild/CliLibrary.mk
+++ b/solenv/gbuild/CliLibrary.mk
@@ -33,20 +33,20 @@ endif
gb_CliLibrary__get_source = $(SRCDIR)/$(1).cs
gb_CliLibrary__get_generated_source = $(WORKDIR)/$(1).cs
+# csc has silly problems handling files passed on command line
define gb_CliLibrary__command
$(call gb_Output_announce,$(2),$(true),CSC,3)
-$(call gb_Helper_abbreviate_dirs,\
- csc $(call gb_Helper_windows_path, \
+ csc \
$(call gb_CliLibrary__get_csflags) \
$(CLI_CSCFLAGS) \
-target:library \
-out:$(1) \
- -keyfile:$(call gb_Helper_windows_path,$(CLI_KEYFILE)) \
+ -keyfile:$(CLI_KEYFILE) \
-reference:System.dll \
$(foreach assembly,$(CLI_ASSEMBLIES),-reference:$(assembly)) \
- $(CLI_SOURCES) \
- ) \
-)
+ $(subst /,\,$(CLI_SOURCES)) \
+
+
endef
.PHONY : $(call gb_CliLibrary_get_clean_target,%)
commit fbbce4cb2b55576248e5770efe0ce562d729c09a
Author: Michael Stahl <mstahl at redhat.com>
Date: Tue Jun 3 23:52:01 2014 +0200
nss: build fails with Win32 make due to backslashes
Change-Id: I9621b3ae12072634a707123ea375f6eb546d9cf9
diff --git a/external/nss/UnpackedTarball_nss.mk b/external/nss/UnpackedTarball_nss.mk
index 9ac8241..56f9430 100644
--- a/external/nss/UnpackedTarball_nss.mk
+++ b/external/nss/UnpackedTarball_nss.mk
@@ -17,6 +17,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\
external/nss/nss-3.13.5-zlib-werror.patch \
external/nss/nss_macosx.patch \
external/nss/nss-linux-x86.patch.0 \
+ external/nss/nss-win32-make.patch.1 \
$(if $(filter WNTMSC,$(OS)$(COM)),external/nss/nss.windows.patch) \
$(if $(filter WNTGCC,$(OS)$(COM)),external/nss/nspr-4.9-build.patch.3 \
external/nss/nss-3.13.3-build.patch.3 \
diff --git a/external/nss/nss-win32-make.patch.1 b/external/nss/nss-win32-make.patch.1
new file mode 100644
index 0000000..bc5a759
--- /dev/null
+++ b/external/nss/nss-win32-make.patch.1
@@ -0,0 +1,20 @@
+--- nss/nss/coreconf/rules.mk.orig2 2014-06-03 15:30:01.667200000 +0200
++++ nss/nss/coreconf/rules.mk 2014-06-03 15:30:14.537200000 +0200
+@@ -259,7 +259,7 @@
+ @$(MAKE_OBJDIR)
+ rm -f $@
+ ifeq (,$(filter-out _WIN%,$(NS_USE_GCC)_$(OS_TARGET)))
+- $(AR) $(subst /,\\,$(OBJS))
++ $(AR) $(OBJS)
+ else
+ $(AR) cr $@ $(OBJS)
+ endif
+@@ -297,7 +297,7 @@
+ ifdef NS_USE_GCC
+ $(LINK_DLL) $(OBJS) $(SUB_SHLOBJS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS) $(LD_LIBS) $(RES)
+ else
+- $(LINK_DLL) -MAP $(DLLBASE) $(subst /,\\,$(OBJS) $(SUB_SHLOBJS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS) $(LD_LIBS) $(RES))
++ $(LINK_DLL) -MAP $(DLLBASE) $(OBJS) $(SUB_SHLOBJS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS) $(LD_LIBS) $(RES)
+ ifdef MT
+ if test -f $@.manifest; then \
+ $(MT) -NOLOGO -MANIFEST $@.manifest -OUTPUTRESOURCE:$@\;2; \
commit c55af68ac2b6f1695b305e75be7155834b028f19
Author: Michael Stahl <mstahl at redhat.com>
Date: Mon Jun 2 00:01:48 2014 +0200
extensions: tweak quoting for Win32 make
Change-Id: I6e3524ab98ec6ffdea24be808a718b2798e44f95
diff --git a/extensions/WinResTarget_activex.mk b/extensions/WinResTarget_activex.mk
index 626723b..67980b8 100644
--- a/extensions/WinResTarget_activex.mk
+++ b/extensions/WinResTarget_activex.mk
@@ -25,7 +25,7 @@ $(eval $(call gb_WinResTarget_set_rcfile,so_activex,extensions/source/activex/so
$(eval $(call gb_WinResTarget_add_defs,so_activex,\
$$(DEFS) \
- -DSO_ACTIVEX_TLB=\"$(subst /,\\\\,$(WORKDIR)/CustomTarget/extensions/source/activex/idl/so_activex.tlb\") \
+ -DSO_ACTIVEX_TLB=\"$(subst /,"\\\\",$(WORKDIR)/CustomTarget/extensions/source/activex/idl/so_activex.tlb\") \
))
# vim:set noet sw=4 ts=4:
commit 0a41a59a98f9f6866a9797a54e6d9efd38a6d4a4
Author: Michael Stahl <mstahl at redhat.com>
Date: Tue Jun 3 23:46:58 2014 +0200
odk: run javadoc in shell
Change-Id: Ifb4a21f6145b303f5c636a61a0fd35b9ccaa9800
diff --git a/odk/CustomTarget_javadoc.mk b/odk/CustomTarget_javadoc.mk
index c5e3e67..a8f83dc 100644
--- a/odk/CustomTarget_javadoc.mk
+++ b/odk/CustomTarget_javadoc.mk
@@ -31,7 +31,8 @@ $(call gb_CustomTarget_get_workdir,odk/docs/java/ref)/%.html : \
$(call gb_CustomTarget_get_workdir,odk/docs/java/ref)/javadoc_log.txt : \
$(call gb_Jar_get_target,ridl)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JDC,1)
- $(JAVADOC) -J-Xmx120m -use -splitindex \
+ $(call gb_Helper_abbreviate_dirs,\
+ $(JAVADOC) -J-Xmx120m -use -splitindex \
-windowtitle "Java UNO Runtime Reference" \
-header "$(PRODUCTNAME) $(PRODUCTVERSION) SDK Java API Reference"\
-tag attention:a:"Attention:" \
@@ -42,6 +43,6 @@ $(call gb_CustomTarget_get_workdir,odk/docs/java/ref)/javadoc_log.txt : \
-linkoffline http://java.sun.com/j2se/1.5/docs/api $(SRCDIR)/odk/docs/java \
$(odk_JAVAPACKAGES) \
$(if $(JAVADOCISGJDOC),,-notimestamp) \
- > $@
+ > $@)
# vim: set noet sw=4 ts=4:
commit 1cf83a52e9cf75c84b7bdc5dc948b9e5c6e56300
Author: Michael Stahl <mstahl at redhat.com>
Date: Tue Jun 3 23:48:49 2014 +0200
odk: use single quotes for Win32 make
Change-Id: Ie6f3404ef034bae2550ca451909fcf120a70a78b
diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk
index a9b542d..59e4d60 100644
--- a/odk/CustomTarget_check.mk
+++ b/odk/CustomTarget_check.mk
@@ -44,7 +44,7 @@ $(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \
$(call gb_Helper_print_on_error,\
$(PERL) $< \
$(INSTDIR)/$(SDKDIRNAME) \
- $(odk_PLATFORM) "$(gb_Executable_EXT)" \
+ $(odk_PLATFORM) '$(gb_Executable_EXT)' \
,$@.log \
)
commit 637b0ef1b5ecc63c28656df4feac47fb0d009027
Author: Michael Stahl <mstahl at redhat.com>
Date: Mon Jun 2 01:27:53 2014 +0200
cli_ure: Win32 make quoting problem, use sed to work around
Change-Id: Ide8a3c574a1904e08921684453256d1d3c98fd78
diff --git a/cli_ure/CustomTarget_cli_ure_assemblies.mk b/cli_ure/CustomTarget_cli_ure_assemblies.mk
index 63bbe1f..260a52b 100644
--- a/cli_ure/CustomTarget_cli_ure_assemblies.mk
+++ b/cli_ure/CustomTarget_cli_ure_assemblies.mk
@@ -37,19 +37,19 @@ $(call gb_CustomTarget_get_workdir,cli_ure/source)/ure/assembly.cs : \
| $(call gb_CustomTarget_get_workdir,cli_ure/source)/ure/.dir
$(call gb_CustomTarget_get_workdir,cli_ure/source)/basetypes/assembly.cs :
- $(GNUCOPY) $< $@.tmp && \
- echo '[assembly:System.Reflection.AssemblyVersion( "$(CLI_BASETYPES_NEW_VERSION)" )]' >> $@.tmp && \
+ sed -e "s/@CLI_BASETYPES_NEW_VERSION@/$(CLI_BASETYPES_NEW_VERSION)/g" \
+ < $< > $@.tmp && \
mv $@.tmp $@
# TODO use macros for this
$(call gb_CustomTarget_get_workdir,cli_ure/source)/native/assembly.cxx :
- $(GNUCOPY) $< $@.tmp && \
- echo '[assembly:System::Reflection::AssemblyVersion( "$(CLI_CPPUHELPER_NEW_VERSION)" )];' >> $@.tmp && \
+ sed -e "s/@CLI_CPPUHELPER_NEW_VERSION@/$(CLI_CPPUHELPER_NEW_VERSION)/g" \
+ < $< > $@.tmp && \
mv $@.tmp $@
$(call gb_CustomTarget_get_workdir,cli_ure/source)/ure/assembly.cs :
- $(GNUCOPY) $< $@.tmp && \
- echo '[assembly:System.Reflection.AssemblyVersion( "$(CLI_URE_NEW_VERSION)" )]' >> $@.tmp && \
+ sed -e "s/@CLI_URE_NEW_VERSION@/$(CLI_URE_NEW_VERSION)/g" \
+ < $< > $@.tmp && \
mv $@.tmp $@
# vim: set noet sw=4 ts=4:
diff --git a/cli_ure/source/basetypes/assembly.cs b/cli_ure/source/basetypes/assembly.cs
index 7cba65d..ac99fff 100644
--- a/cli_ure/source/basetypes/assembly.cs
+++ b/cli_ure/source/basetypes/assembly.cs
@@ -18,3 +18,4 @@
[assembly:System.Reflection.AssemblyDescription( "CLI-UNO: Language Binding specific types" )]
[assembly:System.Reflection.AssemblyCompany( "OpenOffice.org" )]
+[assembly:System.Reflection.AssemblyVersion( "@CLI_BASETYPES_NEW_VERSION@" )]
diff --git a/cli_ure/source/native/assembly.cxx b/cli_ure/source/native/assembly.cxx
index 73345b9..521f5a4 100644
--- a/cli_ure/source/native/assembly.cxx
+++ b/cli_ure/source/native/assembly.cxx
@@ -21,5 +21,6 @@
[assembly:System::Reflection::AssemblyDescription( "CLI-UNO Helper Library" )];
[assembly:System::Reflection::AssemblyDelaySign(true)];
[assembly:System::Reflection::AssemblyCompany( "OpenOffice.org" )];
+[assembly:System::Reflection::AssemblyVersion( "@CLI_CPPUHELPER_NEW_VERSION@" )];
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cli_ure/source/ure/assembly.cs b/cli_ure/source/ure/assembly.cs
index 3216958..1b94618 100644
--- a/cli_ure/source/ure/assembly.cs
+++ b/cli_ure/source/ure/assembly.cs
@@ -18,3 +18,4 @@
[assembly:System.Reflection.AssemblyDescription( "CLI-UNO Runtime Library" )]
[assembly:System.Reflection.AssemblyCompany( "OpenOffice.org" )]
+[assembly:System.Reflection.AssemblyVersion( "@CLI_URE_NEW_VERSION@" )]
commit f5111df1f440bdd822f19ed26cd5cc983a57c2d1
Author: Michael Stahl <mstahl at redhat.com>
Date: Mon Jun 2 00:12:34 2014 +0200
libabw,libfreehand,libvisio: avoid some quoting issues
With Win32 make there are problems with the sed expression.
Change-Id: I6d7fe52a233ef88a43ee1b6e3378fcb7b0792d07
diff --git a/external/libabw/UnpackedTarball_libabw.mk b/external/libabw/UnpackedTarball_libabw.mk
index 6288b0e..70ac11f 100644
--- a/external/libabw/UnpackedTarball_libabw.mk
+++ b/external/libabw/UnpackedTarball_libabw.mk
@@ -11,4 +11,8 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libabw))
$(eval $(call gb_UnpackedTarball_set_tarball,libabw,$(ABW_TARBALL)))
+$(eval $(call gb_UnpackedTarball_add_patches,libabw,\
+ external/libabw/libabw_quote.patch.1 \
+))
+
# vim: set noet sw=4 ts=4:
diff --git a/external/libabw/libabw_quote.patch.1 b/external/libabw/libabw_quote.patch.1
new file mode 100644
index 0000000..619351f
--- /dev/null
+++ b/external/libabw/libabw_quote.patch.1
@@ -0,0 +1,11 @@
+--- libabw/src/lib/Makefile.in.orig 2014-06-01 21:15:14.647200000 +0200
++++ libabw/src/lib/Makefile.in 2014-06-01 21:15:24.865200000 +0200
+@@ -716,7 +716,7 @@
+
+ $(top_builddir)/src/lib/tokenhash.h : $(top_builddir)/src/lib/tokens.gperf
+ $(GPERF) --compare-strncmp -C -m 20 $(top_builddir)/src/lib/tokens.gperf \
+- | $(SED) -e "s/(char\*)0/(char\*)0, 0/g" > $(top_builddir)/src/lib/tokenhash.h
++ | $(SED) -e 's/(char\*)0/(char\*)0, 0/g' > $(top_builddir)/src/lib/tokenhash.h
+
+ $(top_builddir)/src/lib/tokens.gperf : $(top_srcdir)/src/lib/tokens.txt gentoken.pl
+ perl $(top_srcdir)/src/lib/gentoken.pl $(top_srcdir)/src/lib/tokens.txt \
diff --git a/external/libfreehand/UnpackedTarball_libfreehand.mk b/external/libfreehand/UnpackedTarball_libfreehand.mk
index a6cf1c7..c79b5ef 100644
--- a/external/libfreehand/UnpackedTarball_libfreehand.mk
+++ b/external/libfreehand/UnpackedTarball_libfreehand.mk
@@ -11,4 +11,8 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libfreehand))
$(eval $(call gb_UnpackedTarball_set_tarball,libfreehand,$(FREEHAND_TARBALL)))
+$(eval $(call gb_UnpackedTarball_add_patches,libfreehand,\
+ external/libfreehand/libfreehand_quote.patch.1 \
+))
+
# vim: set noet sw=4 ts=4:
diff --git a/external/libfreehand/libfreehand_quote.patch.1 b/external/libfreehand/libfreehand_quote.patch.1
new file mode 100644
index 0000000..08328bc
--- /dev/null
+++ b/external/libfreehand/libfreehand_quote.patch.1
@@ -0,0 +1,11 @@
+--- libfreehand/src/lib/Makefile.in.orig 2014-06-01 22:07:48.468000000 +0200
++++ libfreehand/src/lib/Makefile.in 2014-06-01 22:08:06.642000000 +0200
+@@ -709,7 +709,7 @@
+
+ $(top_builddir)/src/lib/tokenhash.h : $(top_builddir)/src/lib/tokens.gperf
+ $(GPERF) --compare-strncmp -C -m 20 $(top_builddir)/src/lib/tokens.gperf \
+- | $(SED) -e "s/(char\*)0/(char\*)0, 0/g" > $(top_builddir)/src/lib/tokenhash.h
++ | $(SED) -e 's/(char\*)0/(char\*)0, 0/g' > $(top_builddir)/src/lib/tokenhash.h
+
+ $(top_builddir)/src/lib/tokens.gperf : $(top_srcdir)/src/lib/tokens.txt gentoken.pl
+ perl $(top_srcdir)/src/lib/gentoken.pl $(top_srcdir)/src/lib/tokens.txt \
diff --git a/external/libvisio/UnpackedTarball_libvisio.mk b/external/libvisio/UnpackedTarball_libvisio.mk
index e4c0561..1626dbb 100644
--- a/external/libvisio/UnpackedTarball_libvisio.mk
+++ b/external/libvisio/UnpackedTarball_libvisio.mk
@@ -11,4 +11,8 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libvisio))
$(eval $(call gb_UnpackedTarball_set_tarball,libvisio,$(VISIO_TARBALL)))
+$(eval $(call gb_UnpackedTarball_add_patches,libvisio,\
+ external/libvisio/libvisio_quote.patch.1 \
+))
+
# vim: set noet sw=4 ts=4:
diff --git a/external/libvisio/libvisio_quote.patch.1 b/external/libvisio/libvisio_quote.patch.1
new file mode 100644
index 0000000..ec3cc1e
--- /dev/null
+++ b/external/libvisio/libvisio_quote.patch.1
@@ -0,0 +1,11 @@
+--- libvisio/src/lib/Makefile.in.orig 2014-06-01 22:54:30.212400000 +0200
++++ libvisio/src/lib/Makefile.in 2014-06-01 22:54:34.112400000 +0200
+@@ -776,7 +776,7 @@
+
+ $(top_builddir)/src/lib/tokenhash.h : $(top_builddir)/src/lib/tokens.gperf
+ $(GPERF) --compare-strncmp -C -m 20 $(top_builddir)/src/lib/tokens.gperf \
+- | $(SED) -e "s/(char\*)0/(char\*)0, 0/g" > $(top_builddir)/src/lib/tokenhash.h
++ | $(SED) -e 's/(char\*)0/(char\*)0, 0/g' > $(top_builddir)/src/lib/tokenhash.h
+
+ $(top_builddir)/src/lib/tokens.gperf : $(top_srcdir)/src/lib/tokens.txt gentoken.pl
+ perl $(top_srcdir)/src/lib/gentoken.pl $(top_srcdir)/src/lib/tokens.txt \
diff --git a/vcl/CustomTarget_afm_hash.mk b/vcl/CustomTarget_afm_hash.mk
index 18ea9c1..44b2073 100644
--- a/vcl/CustomTarget_afm_hash.mk
+++ b/vcl/CustomTarget_afm_hash.mk
@@ -15,6 +15,6 @@ $(call gb_CustomTarget_get_workdir,vcl/generic/fontmanager)/afm_hash.hpp : \
$(SRCDIR)/vcl/generic/fontmanager/afm_keyword_list \
| $(call gb_CustomTarget_get_workdir,vcl/generic/fontmanager)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),GPF,1)
- $(GPERF) -C -t -l -L C++ -m 20 -Z AfmKeywordHash -k '1,4,6,$$' $< | sed -e "s/(char\*)0/(char\*)0, NOPE/g" | grep -v "^#line" > $@
+ $(GPERF) -C -t -l -L C++ -m 20 -Z AfmKeywordHash -k '1,4,6,$$' $< | sed -e 's/(char\*)0/(char\*)0, NOPE/g' | grep -v '^#line' > $@
# vim: set noet sw=4:
commit 548da05c53f007624d31e6ba46b4769dae9c4035
Author: Michael Stahl <mstahl at redhat.com>
Date: Mon Jun 2 01:35:41 2014 +0200
curl: work around mysterious xcopy failure
When building with Win32 make, the xcopy at the end of the build fails
with "Invalid arguments" error, which is clearly wrong, since the
arguments are exactly the same as before, and furthermore curl is not
built with GNU make at all, but with nmake! W-T-F?
Change-Id: Idc0b362202e1d14722573662bebeda0bc7070660
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 443ea6f..fc8c8f7 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2449,7 +2449,7 @@ $(call gb_LinkTarget_set_include,$(1),\
ifeq ($(COM),MSC)
$(call gb_LinkTarget_add_libs,$(1),\
- $(call gb_UnpackedTarball_get_dir,curl)/lib/libcurl$(if $(MSVC_USE_DEBUG_RUNTIME),d)_imp.lib \
+ $(call gb_UnpackedTarball_get_dir,curl)/lib/$(if $(MSVC_USE_DEBUG_RUNTIME),debug-dll,release-dll)/libcurl$(if $(MSVC_USE_DEBUG_RUNTIME),d)_imp.lib \
)
else
$(call gb_LinkTarget_add_libs,$(1),\
diff --git a/external/curl/ExternalPackage_curl.mk b/external/curl/ExternalPackage_curl.mk
index 6266912..ed55892 100644
--- a/external/curl/ExternalPackage_curl.mk
+++ b/external/curl/ExternalPackage_curl.mk
@@ -16,7 +16,7 @@ ifneq ($(DISABLE_DYNLOADING),TRUE)
ifeq ($(OS)$(COM),WNTGCC)
$(eval $(call gb_ExternalPackage_add_file,curl,$(LIBO_LIB_FOLDER)/libcurl.dll,lib/.libs/libcurl.dll))
else ifeq ($(COM),MSC)
-$(eval $(call gb_ExternalPackage_add_file,curl,$(LIBO_LIB_FOLDER)/libcurl$(if $(MSVC_USE_DEBUG_RUNTIME),d).dll,lib/libcurl$(if $(MSVC_USE_DEBUG_RUNTIME),d).dll))
+$(eval $(call gb_ExternalPackage_add_file,curl,$(LIBO_LIB_FOLDER)/libcurl$(if $(MSVC_USE_DEBUG_RUNTIME),d).dll,lib/$(if $(MSVC_USE_DEBUG_RUNTIME),debug-dll,release-dll)/libcurl$(if $(MSVC_USE_DEBUG_RUNTIME),d).dll))
else ifeq ($(OS),MACOSX)
$(eval $(call gb_ExternalPackage_add_file,curl,$(LIBO_LIB_FOLDER)/libcurl.4.dylib,lib/.libs/libcurl.4.dylib))
else ifeq ($(OS),AIX)
commit 0a9f1cf88a9e891c3e33e371b57e29364fd4f00b
Author: Michael Stahl <mstahl at redhat.com>
Date: Mon Jun 2 23:30:03 2014 +0200
openssl: stop (ab)using fix_end_of_line to break symlinks
Win32 make has problems because the command line gets too long.
Change-Id: I157b7b2b61353b158b1a3f412331e54aafec206c
diff --git a/external/openssl/UnpackedTarball_openssl.mk b/external/openssl/UnpackedTarball_openssl.mk
index 2509960..cf875f7 100644
--- a/external/openssl/UnpackedTarball_openssl.mk
+++ b/external/openssl/UnpackedTarball_openssl.mk
@@ -11,84 +11,15 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,openssl))
$(eval $(call gb_UnpackedTarball_set_tarball,openssl,$(OPENSSL_TARBALL),,openssl))
-# hack to fix symlinks with MSVC
-$(eval $(call gb_UnpackedTarball_fix_end_of_line,openssl,\
- include/openssl/aes.h \
- include/openssl/asn1.h \
- include/openssl/asn1_mac.h \
- include/openssl/asn1t.h \
- include/openssl/bio.h \
- include/openssl/blowfish.h \
- include/openssl/bn.h \
- include/openssl/buffer.h \
- include/openssl/camellia.h \
- include/openssl/cast.h \
- include/openssl/cmac.h \
- include/openssl/cms.h \
- include/openssl/comp.h \
- include/openssl/conf.h \
- include/openssl/conf_api.h \
- include/openssl/crypto.h \
- include/openssl/des.h \
- include/openssl/des_old.h \
- include/openssl/dh.h \
- include/openssl/dsa.h \
- include/openssl/dso.h \
- include/openssl/dtls1.h \
- include/openssl/e_os2.h \
- include/openssl/ebcdic.h \
- include/openssl/ec.h \
- include/openssl/ecdh.h \
- include/openssl/ecdsa.h \
- include/openssl/engine.h \
- include/openssl/err.h \
- include/openssl/evp.h \
- include/openssl/hmac.h \
- include/openssl/idea.h \
- include/openssl/krb5_asn.h \
- include/openssl/kssl.h \
- include/openssl/lhash.h \
- include/openssl/md4.h \
- include/openssl/md5.h \
- include/openssl/mdc2.h \
- include/openssl/modes.h \
- include/openssl/obj_mac.h \
- include/openssl/objects.h \
- include/openssl/ocsp.h \
- include/openssl/opensslconf.h \
- include/openssl/opensslv.h \
- include/openssl/ossl_typ.h \
- include/openssl/pem.h \
- include/openssl/pem2.h \
- include/openssl/pkcs12.h \
- include/openssl/pkcs7.h \
- include/openssl/pqueue.h \
- include/openssl/rand.h \
- include/openssl/rc2.h \
- include/openssl/rc4.h \
- include/openssl/ripemd.h \
- include/openssl/rsa.h \
- include/openssl/safestack.h \
- include/openssl/seed.h \
- include/openssl/sha.h \
- include/openssl/srp.h \
- include/openssl/srtp.h \
- include/openssl/ssl.h \
- include/openssl/ssl2.h \
- include/openssl/ssl23.h \
- include/openssl/ssl3.h \
- include/openssl/stack.h \
- include/openssl/symhacks.h \
- include/openssl/tls1.h \
- include/openssl/ts.h \
- include/openssl/txt_db.h \
- include/openssl/ui.h \
- include/openssl/ui_compat.h \
- include/openssl/whrlpool.h \
- include/openssl/x509.h \
- include/openssl/x509_vfy.h \
- include/openssl/x509v3.h \
-))
+# break symlinks after extracting tarball
+# note: escape \; because LO patched make 3.82 cuts off the command otherwise
+ifeq ($(OS_FOR_BUILD),WNT)
+$(eval $(call gb_UnpackedTarball_set_pre_action,openssl,\
+ cd include/openssl && \
+ for header in `find . -type l` \; do \
+ cp --remove-destination `readlink $$$$header` $$$$header \; \
+ done && cd -))
+endif
$(eval $(call gb_UnpackedTarball_add_patches,openssl,\
$(if $(filter LINUX FREEBSD ANDROID,$(OS)),external/openssl/openssllnx.patch) \
commit 1817366cb5f61337b34b5284615d3d4e0a8aa68a
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Jun 4 16:11:19 2014 +0200
gbuild: remove config_libraries.h and gb_Helper_generate_config_libraries
This much ugly complexity, generating a header on every gbuild startup
etc. is really not warranted for 6 callers of the generated macros.
Also, the Win32 make has problems with the quoting.
Change-Id: If945e09c1730e52174a6084677842dc611d66b2f
diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index 7ce2905..d1bb6eb 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -49,6 +49,7 @@ $(eval $(call gb_Library_set_include,sd,\
$(eval $(call gb_Library_add_defs,sd,\
-DSD_DLLIMPLEMENTATION \
+ -DSDUI_DLL_NAME=\"$(call gb_Library_get_runtime_filename,sdui)\" \
))
ifneq ($(strip $(dbg_anim_log)$(DBG_ANIM_LOG)),)
diff --git a/sd/inc/pch/precompiled_sd.hxx b/sd/inc/pch/precompiled_sd.hxx
index 2212085..8937ebb 100644
--- a/sd/inc/pch/precompiled_sd.hxx
+++ b/sd/inc/pch/precompiled_sd.hxx
@@ -369,7 +369,6 @@
#include <comphelper/storagehelper.hxx>
#include <comphelper/string.hxx>
#include <config_features.h>
-#include <config_libraries.h>
#include <config_options.h>
#include <cppcanvas/basegfxfactory.hxx>
#include <cppcanvas/vclfactory.hxx>
diff --git a/sd/source/ui/dlg/sdabstdlg.cxx b/sd/source/ui/dlg/sdabstdlg.cxx
index fc83a93..fb75b37 100644
--- a/sd/source/ui/dlg/sdabstdlg.cxx
+++ b/sd/source/ui/dlg/sdabstdlg.cxx
@@ -18,7 +18,6 @@
*/
#include <config_features.h>
-#include <config_libraries.h>
#include "sdabstdlg.hxx"
@@ -43,7 +42,7 @@ SdAbstractDialogFactory* SdAbstractDialogFactory::Create()
#if HAVE_FEATURE_DESKTOP
#ifndef DISABLE_DYNLOADING
static ::osl::Module aDialogLibrary;
- static const OUString sLibName(LIBO_LIBRARY(sdui));
+ static const OUString sLibName(SDUI_DLL_NAME);
if ( aDialogLibrary.is() || aDialogLibrary.loadRelative( &thisModule, sLibName ) )
fp = ( SdAbstractDialogFactory* (SAL_CALL*)() )
aDialogLibrary.getFunctionSymbol( "SdCreateDialogFactory" );
diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
index 8efba98..398b2f7 100644
--- a/solenv/gbuild/Helper.mk
+++ b/solenv/gbuild/Helper.mk
@@ -208,15 +208,6 @@ else mv $(1) $(2) $(if $(3),&& touch -r $(3) $(2)); \
fi
endef
-define gb_Helper_generate_config_libraries
-$(shell FILE=$(BUILDDIR)/config_$(gb_Side)/config_libraries.h && \
-printf "// This file is generated by gbuild: gb_Helper_generate_config_libraries.\n\n" >> $$FILE.tmp && \
-$(foreach lib,$(gb_Library_KNOWNLIBS), \
- printf "#define LIBO_LIB_$(subst -,_,$(lib)) \"$(call gb_Library_get_runtime_filename,$(call gb_Library__get_name,$(lib)))\"\n" >> $$FILE.tmp &&) \
-printf "\n#define LIBO_LIBRARY(name) LIBO_LIB_##name\n" >> $$FILE.tmp && \
-$(call gb_Helper_replace_if_different_and_touch,$$FILE.tmp,$$FILE))
-endef
-
define gb_Helper_define_if_set
$(foreach def,$(1),$(if $(filter TRUE YES,$($(def))),-D$(def)))
endef
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 23d5591..17a7d8f 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -325,8 +325,6 @@ include $(foreach class, \
$(eval $(call gb_Helper_process_executable_registrations))
$(eval $(call gb_Postprocess_make_targets))
-$(eval $(call gb_Helper_generate_config_libraries))
-
# optional extensions that should never be essential
ifneq ($(wildcard $(GBUILDDIR)/extensions/post_*.mk),)
include $(wildcard $(GBUILDDIR)/extensions/post_*.mk)
diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk
index aced49f..f2ff8aa 100644
--- a/sw/Library_sw.mk
+++ b/sw/Library_sw.mk
@@ -42,6 +42,7 @@ $(eval $(call gb_Library_use_sdk_api,sw))
$(eval $(call gb_Library_add_defs,sw,\
-DSW_DLLIMPLEMENTATION \
+ -DSWUI_DLL_NAME=\"$(call gb_Library_get_runtime_filename,swui)\" \
))
$(eval $(call gb_Library_use_libraries,sw,\
diff --git a/sw/inc/pch/precompiled_sw.hxx b/sw/inc/pch/precompiled_sw.hxx
index 94d5aa1..69ad7b3 100644
--- a/sw/inc/pch/precompiled_sw.hxx
+++ b/sw/inc/pch/precompiled_sw.hxx
@@ -466,7 +466,6 @@
#include <config_features.h>
#include <config_folders.h>
#include <config_graphite.h>
-#include <config_libraries.h>
#include <config_options.h>
#include <cppuhelper/basemutex.hxx>
#include <cppuhelper/bootstrap.hxx>
diff --git a/sw/source/uibase/dialog/swabstdlg.cxx b/sw/source/uibase/dialog/swabstdlg.cxx
index 8cf41aa..7b5ec71 100644
--- a/sw/source/uibase/dialog/swabstdlg.cxx
+++ b/sw/source/uibase/dialog/swabstdlg.cxx
@@ -18,7 +18,6 @@
*/
#include <config_features.h>
-#include <config_libraries.h>
#include "swabstdlg.hxx"
@@ -42,7 +41,7 @@ SwAbstractDialogFactory* SwAbstractDialogFactory::Create()
#if HAVE_FEATURE_DESKTOP
#ifndef DISABLE_DYNLOADING
static ::osl::Module aDialogLibrary;
- static const OUString sLibName(LIBO_LIBRARY(swui));
+ static const OUString sLibName(SWUI_DLL_NAME);
if ( aDialogLibrary.is() || aDialogLibrary.loadRelative( &thisModule, sLibName,
SAL_LOADMODULE_GLOBAL | SAL_LOADMODULE_LAZY ) )
fp = ( SwAbstractDialogFactory* (SAL_CALL*)() )
diff --git a/toolkit/Library_tk.mk b/toolkit/Library_tk.mk
index a8fbeb5..ddce52e 100644
--- a/toolkit/Library_tk.mk
+++ b/toolkit/Library_tk.mk
@@ -31,6 +31,7 @@ $(eval $(call gb_Library_set_include,tk,\
$(eval $(call gb_Library_add_defs,tk,\
-DTOOLKIT_DLLIMPLEMENTATION \
+ -DSVT_DLL_NAME=\"$(call gb_Library_get_runtime_filename,svt)\" \
))
$(eval $(call gb_Library_use_sdk_api,tk))
diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx
index 054ef94..4b66356 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -17,8 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <config_libraries.h>
-
#include <boost/ptr_container/ptr_vector.hpp>
#include <stdio.h>
@@ -1223,7 +1221,7 @@ css::uno::Reference< css::awt::XWindowPeer > VCLXToolkit::ImplCreateWindow(
)
{
#ifndef DISABLE_DYNLOADING
- OUString aLibName(LIBO_LIBRARY(svt));
+ OUString aLibName(SVT_DLL_NAME);
hSvToolsLib = osl_loadModuleRelative(
&thisModule, aLibName.pData, SAL_LOADMODULE_DEFAULT );
if ( hSvToolsLib )
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 72877b3..e271b3e 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -45,6 +45,9 @@ $(eval $(call gb_Library_set_include,vcl,\
$(eval $(call gb_Library_add_defs,vcl,\
-DVCL_DLLIMPLEMENTATION \
+ -DCUI_DLL_NAME=\"$(call gb_Library_get_runtime_filename,cui)\" \
+ -DDESKTOP_DETECTOR_DLL_NAME=\"$(call gb_Library_get_runtime_filename,desktop_detector)\" \
+ -DTK_DLL_NAME=\"$(call gb_Library_get_runtime_filename,tk)\" \
))
$(eval $(call gb_Library_use_sdk_api,vcl))
diff --git a/vcl/inc/pch/precompiled_vcl.hxx b/vcl/inc/pch/precompiled_vcl.hxx
index 7afd3f4..5428d2b 100644
--- a/vcl/inc/pch/precompiled_vcl.hxx
+++ b/vcl/inc/pch/precompiled_vcl.hxx
@@ -277,7 +277,6 @@
#include <config_features.h>
#include <config_folders.h>
#include <config_graphite.h>
-#include <config_libraries.h>
#include <cppuhelper/basemutex.hxx>
#include <cppuhelper/compbase1.hxx>
#include <cppuhelper/factory.hxx>
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index 50cda48..a1c59ef 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -18,7 +18,6 @@
*/
#include <config_features.h>
-#include <config_libraries.h>
#include "comphelper/processfactory.hxx"
@@ -1404,7 +1403,7 @@ UnoWrapperBase* Application::GetUnoWrapper( bool bCreateIfNotExist )
if ( !pSVData->mpUnoWrapper && bCreateIfNotExist && !bAlreadyTriedToCreate )
{
#ifndef DISABLE_DYNLOADING
- OUString aLibName(LIBO_LIBRARY(tk));
+ OUString aLibName(TK_DLL_NAME);
oslModule hTkLib = osl_loadModuleRelative(
&thisModule, aLibName.pData, SAL_LOADMODULE_DEFAULT );
if ( hTkLib )
diff --git a/vcl/source/window/abstdlg.cxx b/vcl/source/window/abstdlg.cxx
index 5cdb757..869800a 100644
--- a/vcl/source/window/abstdlg.cxx
+++ b/vcl/source/window/abstdlg.cxx
@@ -18,7 +18,6 @@
*/
#include <config_features.h>
-#include <config_libraries.h>
#include <rtl/ustring.hxx>
#include <osl/module.hxx>
@@ -38,10 +37,13 @@ VclAbstractDialogFactory* VclAbstractDialogFactory::Create()
#if HAVE_FEATURE_DESKTOP
#ifndef DISABLE_DYNLOADING
static ::osl::Module aDialogLibrary;
- if ( aDialogLibrary.is() || aDialogLibrary.loadRelative( &thisModule, LIBO_LIBRARY(cui),
- SAL_LOADMODULE_GLOBAL | SAL_LOADMODULE_LAZY ) )
+ if (aDialogLibrary.is() ||
+ aDialogLibrary.loadRelative(&thisModule, CUI_DLL_NAME,
+ SAL_LOADMODULE_GLOBAL | SAL_LOADMODULE_LAZY))
+ {
fp = ( VclAbstractDialogFactory* (SAL_CALL*)() )
aDialogLibrary.getFunctionSymbol( OUString("CreateDialogFactory") );
+ }
#else
fp = CreateDialogFactory;
#endif
diff --git a/vcl/unx/generic/plugadapt/salplug.cxx b/vcl/unx/generic/plugadapt/salplug.cxx
index 0fd81dc..ff0899d 100644
--- a/vcl/unx/generic/plugadapt/salplug.cxx
+++ b/vcl/unx/generic/plugadapt/salplug.cxx
@@ -17,8 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <config_libraries.h>
-
#include "osl/module.h"
#include "osl/process.h"
@@ -117,7 +115,7 @@ static SalInstance* tryInstance( const OUString& rModuleBase, bool bForce = fals
static DesktopType get_desktop_environment()
{
- OUString aModule(LIBO_LIBRARY(desktop_detector));
+ OUString aModule(DESKTOP_DETECTOR_DLL_NAME);
oslModule aMod = osl_loadModuleRelative(
reinterpret_cast< oslGenericFunction >( &tryInstance ), aModule.pData,
SAL_LOADMODULE_DEFAULT );
commit 2aab2f4b7b0736e19b76abad652bbb055b18b857
Author: Michael Stahl <mstahl at redhat.com>
Date: Thu May 29 20:31:57 2014 +0200
gbuild: partial_build.mk: avoid a problem with Win32 make
Somehow 2 successive / in a path result in $(wildcard) returning
nothing.
Change-Id: Ie8b84543d36fe50fa706b9ccabcd280a7e3913ab
diff --git a/solenv/gbuild/partial_build.mk b/solenv/gbuild/partial_build.mk
index 4d5e1db..3b4478f 100644
--- a/solenv/gbuild/partial_build.mk
+++ b/solenv/gbuild/partial_build.mk
@@ -35,6 +35,6 @@ endif
gb_PARTIAL_BUILD := T
include $(SRCDIR)/solenv/gbuild/gbuild.mk
-$(eval $(call gb_Module_make_global_targets,$(wildcard $(module_directory)/Module*.mk)))
+$(eval $(call gb_Module_make_global_targets,$(wildcard $(module_directory)Module*.mk)))
# vim: set noet sw=4 ts=4:
commit fe8c5f632cf88fa1a829473040e095e060b1217b
Author: Michael Stahl <mstahl at redhat.com>
Date: Mon Jun 2 00:18:08 2014 +0200
Makefile: prevent Win32 make from doing CreateProcess(autogen.sh)
Change-Id: I2ed9c346a8e9cfa26aa2b04f554c56f02c400829
diff --git a/Makefile.in b/Makefile.in
index f63dbe0..7d2de76 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -43,7 +43,7 @@ $(BUILDDIR)/config_host.mk : $(wildcard \
$(BUILDDIR)/autogen.input \
$(BUILDDIR)/autogen.lastrun \
)
- $(SRCDIR)/autogen.sh
+ sh -c $(SRCDIR)/autogen.sh
else # MAKE_RESTARTS
commit aa617a3a594e81d2e3ff679ed5e1a9c33fcb419f
Author: Michael Stahl <mstahl at redhat.com>
Date: Mon Jun 2 01:30:39 2014 +0200
concat-deps: Win32 make $(file) will end lines with CRLF
Change-Id: I3677de94e064c2f737cc7882b3cc4f42a6bf626a
diff --git a/solenv/bin/concat-deps.c b/solenv/bin/concat-deps.c
index f2e7617..d513430 100644
--- a/solenv/bin/concat-deps.c
+++ b/solenv/bin/concat-deps.c
@@ -1137,7 +1137,9 @@ const char *env_str;
/* extract filename of dep file from a 'space' separated list */
while(*in_list_cursor)
{
- if(*in_list_cursor == ' ' || *in_list_cursor == '\n')
+ /* the input here may contain Win32 \r\n EOL */
+ if(*in_list_cursor == ' '
+ || *in_list_cursor == '\n' || *in_list_cursor == '\r')
{
*in_list_cursor = 0;
if(in_list_base < in_list_cursor)
commit ed4a51b84b05eea24f9e1cb0bdc2058c2fe6f06f
Author: Michael Stahl <mstahl at redhat.com>
Date: Mon Jun 2 01:23:37 2014 +0200
svx: Pakage_gengal is not needed on WNT
Change-Id: Ia012b38485f002748133c4a5f0d32d5d87168549
diff --git a/svx/Module_svx.mk b/svx/Module_svx.mk
index 1981e92..492f6f7 100644
--- a/svx/Module_svx.mk
+++ b/svx/Module_svx.mk
@@ -35,8 +35,8 @@ $(eval $(call gb_Module_add_l10n_targets,svx,\
ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
$(eval $(call gb_Module_add_targets,svx,\
Executable_gengal \
- Package_gengal \
$(if $(filter-out WNT,$(OS)), \
+ Package_gengal \
Executable_pixelctl) \
))
endif
commit dbe2f8900fc5dc411abfe6e4e7e8c92cdd6892d1
Author: Michael Stahl <mstahl at redhat.com>
Date: Thu May 29 20:29:03 2014 +0200
python3: stop symlinking directories on WNT
Change-Id: I281d3dd66a8db8da44cce60bade4a0ee7d1df763
diff --git a/external/python3/ExternalPackage_python3.mk b/external/python3/ExternalPackage_python3.mk
index 1b83bd2..a2f51c1 100644
--- a/external/python3/ExternalPackage_python3.mk
+++ b/external/python3/ExternalPackage_python3.mk
@@ -15,26 +15,26 @@ ifeq ($(OS)-$(COM),WNT-MSC)
ifeq ($(CPUNAME),X86_64)
python_arch_subdir=amd64/
endif
-$(eval $(call gb_ExternalPackage_add_file,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/bin/python.exe,LO_lib/$(python_arch_subdir)python$(if $(MSVC_USE_DEBUG_RUNTIME),_d).exe))
-$(eval $(call gb_ExternalPackage_add_file,python3,$(LIBO_BIN_FOLDER)/python$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)$(if $(MSVC_USE_DEBUG_RUNTIME),_d).dll,LO_lib/$(python_arch_subdir)python$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)$(if $(MSVC_USE_DEBUG_RUNTIME),_d).dll))
+$(eval $(call gb_ExternalPackage_add_file,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/bin/python.exe,PCbuild/$(python_arch_subdir)python$(if $(MSVC_USE_DEBUG_RUNTIME),_d).exe))
+$(eval $(call gb_ExternalPackage_add_file,python3,$(LIBO_BIN_FOLDER)/python$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)$(if $(MSVC_USE_DEBUG_RUNTIME),_d).dll,PCbuild/$(python_arch_subdir)python$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)$(if $(MSVC_USE_DEBUG_RUNTIME),_d).dll))
ifeq ($(MSVC_USE_DEBUG_RUNTIME),)
-$(eval $(call gb_ExternalPackage_add_file,python3,$(LIBO_BIN_FOLDER)/python$(PYTHON_VERSION_MAJOR).dll,LO_lib/$(python_arch_subdir)python$(PYTHON_VERSION_MAJOR).dll))
+$(eval $(call gb_ExternalPackage_add_file,python3,$(LIBO_BIN_FOLDER)/python$(PYTHON_VERSION_MAJOR).dll,PCbuild/$(python_arch_subdir)python$(PYTHON_VERSION_MAJOR).dll))
endif
$(eval $(call gb_ExternalPackage_add_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib,\
- LO_lib/$(python_arch_subdir)_ctypes$(if $(MSVC_USE_DEBUG_RUNTIME),_d).pyd \
- LO_lib/$(python_arch_subdir)_ctypes_test$(if $(MSVC_USE_DEBUG_RUNTIME),_d).pyd \
- LO_lib/$(python_arch_subdir)_decimal$(if $(MSVC_USE_DEBUG_RUNTIME),_d).pyd \
- LO_lib/$(python_arch_subdir)_elementtree$(if $(MSVC_USE_DEBUG_RUNTIME),_d).pyd \
- LO_lib/$(python_arch_subdir)_msi$(if $(MSVC_USE_DEBUG_RUNTIME),_d).pyd \
- LO_lib/$(python_arch_subdir)_multiprocessing$(if $(MSVC_USE_DEBUG_RUNTIME),_d).pyd \
- LO_lib/$(python_arch_subdir)_socket$(if $(MSVC_USE_DEBUG_RUNTIME),_d).pyd \
- LO_lib/$(python_arch_subdir)_ssl$(if $(MSVC_USE_DEBUG_RUNTIME),_d).pyd \
- LO_lib/$(python_arch_subdir)_testbuffer$(if $(MSVC_USE_DEBUG_RUNTIME),_d).pyd \
- LO_lib/$(python_arch_subdir)_testcapi$(if $(MSVC_USE_DEBUG_RUNTIME),_d).pyd \
- LO_lib/$(python_arch_subdir)pyexpat$(if $(MSVC_USE_DEBUG_RUNTIME),_d).pyd \
- LO_lib/$(python_arch_subdir)select$(if $(MSVC_USE_DEBUG_RUNTIME),_d).pyd \
- LO_lib/$(python_arch_subdir)unicodedata$(if $(MSVC_USE_DEBUG_RUNTIME),_d).pyd \
- LO_lib/$(python_arch_subdir)winsound$(if $(MSVC_USE_DEBUG_RUNTIME),_d).pyd \
+ PCbuild/$(python_arch_subdir)_ctypes$(if $(MSVC_USE_DEBUG_RUNTIME),_d).pyd \
+ PCbuild/$(python_arch_subdir)_ctypes_test$(if $(MSVC_USE_DEBUG_RUNTIME),_d).pyd \
+ PCbuild/$(python_arch_subdir)_decimal$(if $(MSVC_USE_DEBUG_RUNTIME),_d).pyd \
+ PCbuild/$(python_arch_subdir)_elementtree$(if $(MSVC_USE_DEBUG_RUNTIME),_d).pyd \
+ PCbuild/$(python_arch_subdir)_msi$(if $(MSVC_USE_DEBUG_RUNTIME),_d).pyd \
+ PCbuild/$(python_arch_subdir)_multiprocessing$(if $(MSVC_USE_DEBUG_RUNTIME),_d).pyd \
+ PCbuild/$(python_arch_subdir)_socket$(if $(MSVC_USE_DEBUG_RUNTIME),_d).pyd \
+ PCbuild/$(python_arch_subdir)_ssl$(if $(MSVC_USE_DEBUG_RUNTIME),_d).pyd \
+ PCbuild/$(python_arch_subdir)_testbuffer$(if $(MSVC_USE_DEBUG_RUNTIME),_d).pyd \
+ PCbuild/$(python_arch_subdir)_testcapi$(if $(MSVC_USE_DEBUG_RUNTIME),_d).pyd \
+ PCbuild/$(python_arch_subdir)pyexpat$(if $(MSVC_USE_DEBUG_RUNTIME),_d).pyd \
+ PCbuild/$(python_arch_subdir)select$(if $(MSVC_USE_DEBUG_RUNTIME),_d).pyd \
+ PCbuild/$(python_arch_subdir)unicodedata$(if $(MSVC_USE_DEBUG_RUNTIME),_d).pyd \
+ PCbuild/$(python_arch_subdir)winsound$(if $(MSVC_USE_DEBUG_RUNTIME),_d).pyd \
))
else ifeq ($(OS),WNT) # MinGW
# TODO how are C modules called on this platform?
diff --git a/external/python3/ExternalProject_python3.mk b/external/python3/ExternalProject_python3.mk
index 42c3dff..f0b65ed 100644
--- a/external/python3/ExternalProject_python3.mk
+++ b/external/python3/ExternalProject_python3.mk
@@ -39,8 +39,6 @@ $(call gb_ExternalProject_get_state_target,python3,build) :
/ToolsVersion:4.0, \
/p:PlatformToolset=$(if $(filter 80,$(WINDOWS_SDK_VERSION)),v110,v110_xp) \
/p:VisualStudioVersion=11.0) \
- && cd $(EXTERNAL_WORKDIR) \
- && ln -s PCbuild LO_lib \
,PCBuild)
else
More information about the Libreoffice-commits
mailing list