diff options
| author | Michael Stahl <mstahl@redhat.com> | 2017-06-02 22:47:23 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2017-06-06 13:05:42 +0200 |
| commit | 9b50c4f63c2ecb95245511940dacb3e91027499f (patch) | |
| tree | 12e8c2e3a2187e5d2667af8b1c1b4765b7f145be /solenv | |
| parent | 2a39dc74724d3648ff76aa900edfebe0dd19b296 (diff) | |
scp2: package 64-bit MSVC runtimes for explorer extensions
... and add BUILD_X64 conditional.
Change-Id: Id512368dfd9dece583ead5aae1924db96f8a2a40
Reviewed-on: https://gerrit.libreoffice.org/38366
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/AutoInstall.mk | 1 | ||||
| -rw-r--r-- | solenv/gbuild/gen-autoinstall.py | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/solenv/gbuild/AutoInstall.mk b/solenv/gbuild/AutoInstall.mk index 9799fc6ecc44..8665644bea78 100644 --- a/solenv/gbuild/AutoInstall.mk +++ b/solenv/gbuild/AutoInstall.mk @@ -15,6 +15,7 @@ $(dir $(call gb_AutoInstall_get_target,%)).dir : $(call gb_AutoInstall_get_target,%) : $(GBUILDDIR)/AutoInstall.mk \ $(SRCDIR)/Repository.mk $(SRCDIR)/RepositoryExternal.mk \ $(BUILDDIR)/config_host.mk \ + $(GBUILDDIR)/gen-autoinstall.py \ $(call gb_ExternalExecutable_get_dependencies,python) $(call gb_Output_announce,$*,$(true),AIN,3) SDKLIBFILE=$(call var2file,$(shell $(gb_MKTEMP)),100,\ diff --git a/solenv/gbuild/gen-autoinstall.py b/solenv/gbuild/gen-autoinstall.py index b331638e7f5e..2feb1a92f406 100644 --- a/solenv/gbuild/gen-autoinstall.py +++ b/solenv/gbuild/gen-autoinstall.py @@ -91,10 +91,10 @@ for (gid, jarfile) in autojars: raise Exception("invalid scp2jartemplate \"" + scp2jartemplate + "\"") print(scp2jartemplate + "(" + gid + "," + jarfile + scp2componentcondition + ")") -scp2pkgtemplates = set([ "PACKAGE_FILELIST", "PACKAGE_FILELIST_FONT", "SDK_PACKAGE_FILELIST" ]) +scp2pkgtemplates = set([ "PACKAGE_FILELIST", "PACKAGE_FILELIST_COMPONENTCONDITION","PACKAGE_FILELIST_FONT", "SDK_PACKAGE_FILELIST" ]) for (gid, pkgfilelist) in autopkgs: if not(scp2pkgtemplate in scp2pkgtemplates): raise Exception("invalid scp2pkgtemplate \"" + scp2pkgtemplate + "\"") - print(scp2pkgtemplate + "(" + gid + "," + pkgfilelist + ")") + print(scp2pkgtemplate + "(" + gid + "," + pkgfilelist + scp2componentcondition + ")") # vim:set shiftwidth=4 softtabstop=4 expandtab: |