[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - solenv/bin
solenv/bin/native-code.py |1 +
1 file changed, 1 insertion(+)
New commits:
commit 1a0bd0c6914bf93733c7ab3a27741fc1dc0e3f26
Author: Tor Lillqvist
AuthorDate: Mon Aug 26 14:10:20 2019 +0300
Commit: Tor Lillqvist
CommitDate: Mon Aug 26 13:40:41 2019 +0200
We need UNO components from libmswordlo.a
They are needed for .docx and .rtf export at least. No idea how we
have managed without it previously.
Change-Id: Iff9224f92520e19d9baa691a9e7cd3c944004eed
Reviewed-on: https://gerrit.libreoffice.org/78125
Reviewed-by: Tor Lillqvist
Tested-by: Tor Lillqvist
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 77e7bf85a009..58bd3929fdd2 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -365,6 +365,7 @@ draw_constructor_list = [
writer_factory_list = [
("libswlo.a", "sw_component_getFactory"),
+("libmswordlo.a", "msword_component_getFactory"),
]
writer_constructor_list = [
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - solenv/bin
solenv/bin/native-code.py |6 ++ 1 file changed, 6 insertions(+) New commits: commit 05eca1ba63a2eca5e6d6be0b7a05bb6f53354ec6 Author: Jan Holesovsky AuthorDate: Tue Jun 18 09:54:00 2019 +0200 Commit: Andras Timar CommitDate: Tue Jun 18 12:39:03 2019 +0200 android: Add the sidebar-related constructors to liblo-native-code.so. Change-Id: I25acb8965d190fc443d75357352e4d02c9b03cc2 Reviewed-on: https://gerrit.libreoffice.org/74265 Reviewed-by: Andras Timar Tested-by: Andras Timar diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py index af43b0672e66..77e7bf85a009 100755 --- a/solenv/bin/native-code.py +++ b/solenv/bin/native-code.py @@ -227,11 +227,16 @@ core_constructor_list = [ "com_sun_star_graphic_GraphicObject_get_implementation", "com_sun_star_comp_graphic_GraphicProvider_get_implementation", # svx/util/svx.component +"com_sun_star_comp_svx_NumberingToolBoxControl_get_implementation", "com_sun_star_drawing_EnhancedCustomShapeEngine_get_implementation", "com_sun_star_drawing_SvxShapeCollection_get_implementation", +"com_sun_star_svx_FontHeightToolBoxController_get_implementation", +"org_apache_openoffice_comp_svx_sidebar_PanelFactory_get_implementation", # svx/util/svxcore.component "com_sun_star_comp_graphic_PrimitiveFactory2D_get_implementation", "com_sun_star_comp_Draw_GraphicExporter_get_implementation", +"com_sun_star_comp_svx_ColorToolBoxControl_get_implementation", +"com_sun_star_comp_svx_FontNameToolBoxControl_get_implementation", "com_sun_star_comp_Svx_GraphicExportHelper_get_implementation", "com_sun_star_comp_Svx_GraphicImportHelper_get_implementation", # toolkit/util/tk.component @@ -277,6 +282,7 @@ edit_factory_list = [ edit_constructor_list = [ # framework/util/fwk.component "com_sun_star_comp_framework_GlobalAcceleratorConfiguration_get_implementation", +"com_sun_star_comp_framework_UICommandDescription_get_implementation", # i18npool/util/i18npool.component "com_sun_star_i18n_InputSequenceChecker_get_implementation", "com_sun_star_i18n_OrdinalSuffix_get_implementation", ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - solenv/bin
solenv/bin/native-code.py |2 ++ 1 file changed, 2 insertions(+) New commits: commit df91a0f2b3adad089982a07d80acddae17ba41c4 Author: Tor Lillqvist AuthorDate: Tue Jun 4 14:58:20 2019 +0300 Commit: Tor Lillqvist CommitDate: Tue Jun 4 14:58:20 2019 +0300 Add css_comp_Impress_oox_PowerPointExport Change-Id: I17d95cce0dd69e2ba8b4ebc7045544fc5659a249 diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py index 5d038e1f9080..7cafe1557d3f 100755 --- a/solenv/bin/native-code.py +++ b/solenv/bin/native-code.py @@ -351,6 +351,8 @@ draw_constructor_list = [ "com_sun_star_comp_Draw_framework_module_ModuleController_get_implementation", # sd/util/sdd.component "com_sun_star_comp_draw_FormatDetector_get_implementation", +# sd/util/sdfilt.component +"css_comp_Impress_oox_PowerPointExport", # writerperfect/source/draw/wpftdraw.component "com_sun_star_comp_Draw_VisioImportFilter_get_implementation", ] ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - solenv/bin
solenv/bin/native-code.py |4 1 file changed, 4 insertions(+) New commits: commit 82667af88e6b750f3e93bdf35897320e1bc111ec Author: Tor Lillqvist AuthorDate: Fri May 31 15:36:56 2019 +0300 Commit: Tor Lillqvist CommitDate: Fri May 31 15:36:56 2019 +0300 tdf#124364: Add some missing components from chart2, svtools, and xmloff Change-Id: Ie9efd1c5b4f5f6ffa66215df27a78027ba0dea39 diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py index f5d5a1351f0f..5d038e1f9080 100755 --- a/solenv/bin/native-code.py +++ b/solenv/bin/native-code.py @@ -124,6 +124,7 @@ core_constructor_list = [ # chart2/source/controller/chartcontroller.component "com_sun_star_comp_chart2_ChartDocumentWrapper_get_implementation", "com_sun_star_comp_chart2_ChartFrameLoader_get_implementation", +"com_sun_star_comp_chart2_WizardDialog_get_implementation", # comphelper/util/comphelp.component "com_sun_star_comp_MemoryStream", "com_sun_star_comp_task_OfficeRestartManager", @@ -222,6 +223,7 @@ core_constructor_list = [ "com_sun_star_comp_uri_UriSchemeParser_vndDOTsunDOTstarDOTexpand_get_implementation", "com_sun_star_comp_uri_UriSchemeParser_vndDOTsunDOTstarDOTscript_get_implementation", # svtools/util/svt.component +"com_sun_star_comp_embed_HatchWindowFactory_get_implementation", "com_sun_star_graphic_GraphicObject_get_implementation", "com_sun_star_comp_graphic_GraphicProvider_get_implementation", # svx/util/svx.component @@ -258,6 +260,8 @@ core_constructor_list = [ # uui/util/uui.component "com_sun_star_comp_uui_UUIInteractionHandler_get_implementation", # xmloff/util/xo.component +"XMLMetaExportComponent_get_implementation", +"XMLMetaImportComponent_get_implementation", "XMLVersionListPersistence_get_implementation", # xmlscript/util/xmlscript.component "com_sun_star_comp_xmlscript_XMLBasicExporter", ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - solenv/bin
solenv/bin/native-code.py |1 +
1 file changed, 1 insertion(+)
New commits:
commit 17570651f30c8504e83ae1a3fb99c350ce53a7de
Author: Tor Lillqvist
AuthorDate: Mon May 27 14:18:59 2019 +0300
Commit: Tor Lillqvist
CommitDate: Mon May 27 14:19:55 2019 +0300
The proxyfac component seems to be needed
Change-Id: Ib6ab095ea5c4b4a01afad5510208ad352dea5d76
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index c953d4733bcb..b1d1d3f5918a 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -67,6 +67,7 @@ core_factory_list = [
("libctllo.a", "ctl_component_getFactory"),
("libMacOSXSpelllo.a", "MacOSXSpell_component_getFactory", "#ifdef IOS"),
("libcuilo.a", "cui_component_getFactory"),
+("libproxyfaclo.a", "proxyfac_component_getFactory"),
]
core_constructor_list = [
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - solenv/bin
solenv/bin/native-code.py |1 +
1 file changed, 1 insertion(+)
New commits:
commit 67c9a2e95551f8432612fa6cb7e93f9dece120c3
Author: Tor Lillqvist
AuthorDate: Fri Apr 5 17:44:04 2019 +0300
Commit: Tor Lillqvist
CommitDate: Fri Apr 5 17:49:30 2019 +0300
tdf#124360: The cui component is needed in the iOS app
Used at least in the Edit > Edit Style... > Area > Color dialog for
the Pick button..
Change-Id: I864ec5918482a2f8ee5c5d80b79eacd6e8fcd88e
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index bc84b9d6cf42..c953d4733bcb 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -66,6 +66,7 @@ core_factory_list = [
("libsvtlo.a", "svt_component_getFactory"),
("libctllo.a", "ctl_component_getFactory"),
("libMacOSXSpelllo.a", "MacOSXSpell_component_getFactory", "#ifdef IOS"),
+("libcuilo.a", "cui_component_getFactory"),
]
core_constructor_list = [
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - solenv/bin
solenv/bin/native-code.py |1 +
1 file changed, 1 insertion(+)
New commits:
commit 50538a0489563920b319a33a3f04ba785d4262a3
Author: Mert Tumer
AuthorDate: Tue Aug 7 06:28:58 2018 -0700
Commit: Tor Lillqvist
CommitDate: Tue Feb 26 17:43:05 2019 +0200
added necessary library for pdf export on Android Viewer
(Also needed for printing in the iOS app.)
Change-Id: I01413493100fd110175ec85790899a130954c78e
Signed-off-by: Mert Tumer
Reviewed-on: https://gerrit.libreoffice.org/58688
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 008e732c84af..56824add0e56 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -62,6 +62,7 @@ core_factory_list = [
("libmcnttype.a", "mcnttype_component_getFactory"),
("libvcllo.a", "vcl_component_getFactory"),
("libspelllo.a", "spell_component_getFactory"),
+("libpdffilterlo.a", "pdffilter_component_getFactory"),
("libsvtlo.a", "svt_component_getFactory")
]
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - solenv/bin
solenv/bin/native-code.py |2 ++
1 file changed, 2 insertions(+)
New commits:
commit dacb97ecdd623d033fdd475131e3c7dc87c17f52
Author: Tor Lillqvist
AuthorDate: Mon Dec 3 15:16:48 2018 +0200
Commit: Tor Lillqvist
CommitDate: Fri Dec 7 14:40:23 2018 +0200
Add AnyCompareFactory_get_implementation and...
... com_sun_star_comp_util_OfficeInstallationDirectories.
Needed when loading a .ott document.
Change-Id: I6074869074b47d2fb679132975520b18659b5c67
(cherry picked from commit f0b83878c2781ab6aa24bd5995155850920f4339)
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index ab321135dd78..d5a582070daf 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -107,11 +107,13 @@ core_constructor_list = [
# comphelper/util/comphelp.component
"com_sun_star_comp_MemoryStream",
"com_sun_star_comp_task_OfficeRestartManager",
+"AnyCompareFactory_get_implementation",
"IndexedPropertyValuesContainer_get_implementation",
"NamedPropertyValuesContainer_get_implementation",
"com_sun_star_comp_comphelper_OPropertyBag",
"com_sun_star_comp_SequenceInputStreamService",
"com_sun_star_comp_SequenceOutputStreamService",
+"com_sun_star_comp_util_OfficeInstallationDirectories",
# dbaccess/util/dba.component
("com_sun_star_comp_dba_ORowSet_get_implementation", "#if
HAVE_FEATURE_DBCONNECTIVITY"),
# forms/util/frm.component
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - solenv/bin vcl/source
solenv/bin/native-code.py | 204 ++
vcl/source/window/builder.cxx | 12 +-
2 files changed, 212 insertions(+), 4 deletions(-)
New commits:
commit 2bc5ab312b1cdb8c299253a54fecdd3c64319fd2
Author: Tor Lillqvist
AuthorDate: Tue Nov 6 10:17:10 2018 +0200
Commit: Tor Lillqvist
CommitDate: Tue Nov 6 12:00:55 2018 +0100
Add function to map custom widget name to its function to native-code.py
Use that function in the dialog builder instead of looking up the
function dynamically, which won't work in a Release build as the
linker will filter out functions that aren't explicitly referenced.
For now this simply uses a manually curated list of custom widgets. I
used some command line tools to extract the names of custom widgets
used in our .ui files, and then filtered out some I guess (hope) will
not be needed in a mobile app.
For this to work the custom widgets need to have unique names.
Currently that is not the case. Unless I did some mistake, there is
just one case of duplicate name, NotebookbarTabControl, which exists
both in the sfx and vcl libraries. (I simply filtered out that one,
too, for now.)
Change-Id: I29bbf6dfef2b3bde03acfc322495d051a7f275a8
Reviewed-on: https://gerrit.libreoffice.org/62946
Reviewed-by: Tor Lillqvist
Tested-by: Tor Lillqvist
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 430a429e9b6d..82c030ff79b5 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -365,6 +365,192 @@ constructor_map = {
'writer' : writer_constructor_list,
}
+custom_widgets = [
+'ArgEdit',
+'AutoCompleteMultiListBox',
+'AutoCorrEdit',
+'AutoFormatPreview',
+'BackgroundPreview',
+'BmpWindow',
+'BookmarksBox',
+'CaptionComboBox',
+'CategoryListBox',
+'ClassificationEditView',
+'ColorConfigCtrl',
+'ColorFieldControl',
+'ColorPreviewControl',
+'ColorSliderControl',
+'ColumnEdit',
+'ColumnValueSet',
+'CommandCategoryListBox',
+'ConditionEdit',
+'ContentListBox',
+'ContextVBox',
+'CuiCustomMultilineEdit',
+'CustomPropertiesControl',
+'DataTreeListBox',
+'DialControl',
+'DriverListControl',
+'DropdownBox',
+'EditBox',
+'EmbossControl',
+'EmojiView',
+'ExtBoxWithBtns',
+'ExtensionBox',
+'FEdit',
+'FontNameBox',
+'FontSizeBox',
+'FontStyleBox',
+'FontStyleBox',
+'FormattedField',
+'FormulaListBox',
+'FrameDirectionListBox',
+'GalleryPreview',
+'GraphCtrl',
+'GraphicPreviewWindow',
+'HexColorControl',
+'HyphenEdit',
+'IndexBox',
+'IndexBox',
+'IntellectualPropertyPartEdit',
+'LightButton',
+'LineEndLB',
+'LineLB',
+'LineListBox',
+'LookUpComboBox',
+'MacroEventListBox',
+'ManagedMenuButton',
+'MultiLineEditSyntaxHighlight',
+'NumFormatListBox',
+'NumberingPreview',
+'OFileURLControl',
+'OptionalBox',
+'PageNumberListBox',
+'PaperSizeListBox',
+'PriorityHBox',
+'PriorityMergedHBox',
+'PropertyControl',
+'RecentDocsView',
+'RefButton',
+'RefEdit',
+'ReplaceEdit',
+'ReturnActionEdit',
+'RowEdit',
+'RubyEdit',
+'RubyPreview',
+'RubyRadioButton',
+'SFTreeListBox',
+'SameContentListBox',
+'ScAutoFmtPreview',
+'ScCondFormatList',
+'ScCsvTableBox',
+'ScCursorRefEdit',
+'ScDPFunctionListBox',
+'ScDataTableView',
+'ScDoubleField',
+'ScEditWindow',
+'ScExtIButton',
+'ScPivotLayoutTreeList',
+'ScPivotLayoutTreeListData',
+'ScPivotLayoutTreeListLabel',
+'ScRefButtonEx',
+'ScTabBgColorValueSet',
+'SdPageObjsTLB',
+'SearchBox',
+'SearchResultsBox',
+'SelectionListBox',
+'SentenceEditWindow',
+'SeriesListBox',
+'SfxAccCfgTabListBox',
+'SfxConfigFunctionListBox',
+'SfxConfigGroupListBox',
+'SfxPreviewWin',
+'ShowNupOrderWindow',
+'ShowNupOrderWindow',
+'SidebarDialControl',
+'SidebarToolBox',
+'SlideTransitionBox',
+'SmallButton',
+'SmallButton',
+'SpacingListBox',
+'StatusBar',
+'StructListBox',
+'SuggestionDisplay',
+'SuggestionEdit',
+'SvSimpleTableContainer',
+'SvTabListBox',
+'SvTreeListBox',
+'SvtFileView',
+'SvtIconChoiceCtrl',
+'SvtURLBox',
+'Svx3DPreviewControl',
+'SvxBmpNumValueSet',
+'SvxCharView',
+'SvxCheckListBox',
+'SvxColorListBox',
+'SvxColorValueSet',
+'SvxCropExample',
+'SvxDictEdit',
+'SvxFillAttrBox',
+'SvxFillTypeBox',
+'SvxFontListBox',
+'SvxFontPrevWindow',
+'SvxFrameSelector',
+'SvxHlmarkTreeLBox',
+'SvxHyperURLBox',
+'SvxLanguageBox',
+'SvxLanguageComboBox',
+'SvxLanguageComboBox',
+'SvxLightCtl3D',
+'SvxNoSpaceEdit',
+'SvxNumValueSet',
+'SvxNumberPreview',
+
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - solenv/bin
solenv/bin/modules/installer/windows/admin.pm |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 088e8bb9b7f2e60061bf1da56d83fb4537f40d67
Author: Andras Timar
AuthorDate: Thu Aug 30 12:21:38 2018 +0200
Commit: Andras Timar
CommitDate: Thu Aug 30 12:21:38 2018 +0200
x86 Win MSP build fix
Change-Id: I2580fe0eacd5834047b50f36384ad9ea6c9d0354
diff --git a/solenv/bin/modules/installer/windows/admin.pm
b/solenv/bin/modules/installer/windows/admin.pm
index f822afe7eaec..3dfba9e7a8de 100644
--- a/solenv/bin/modules/installer/windows/admin.pm
+++ b/solenv/bin/modules/installer/windows/admin.pm
@@ -287,8 +287,9 @@ sub create_directory_structure
{
if ( ! exists($fullpathhash{$dir}) ) { $fullpathhash{$dir} =
$targetdir; }
}
-# FIXME why is this hack needed? ERROR: Did not find full directory path
for dir: "ystemFolder_x86_VC.194841A2_D0F2_3B96_9F71_05BA91BEA0FA"
+# FIXME why is this hack needed? ERROR: Did not find full directory path
for dir: "SystemFolder_x86_VC.194841A2_D0F2_3B96_9F71_05BA91BEA0FA"
$fullpathhash{"SystemFolder_x86_VC.194841A2_D0F2_3B96_9F71_05BA91BEA0FA"}
= $targetdir . $installer::globals::separator . "System";
+$fullpathhash{"SystemFolder_x86_VC.E281B893_10D7_34CE_BB0E_B69D88E154A5"}
= $targetdir . $installer::globals::separator . "System";
$fullpathhash{"System64Folder_amd64_VC.AF4EABEE_4589_3789_BA0A_C83A71662E1D"} =
$targetdir . $installer::globals::separator . "System64";
return \%fullpathhash;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - solenv/bin
solenv/bin/modules/installer/windows/msp.pm |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit e82ba4850ed17d93f659de036feda6ebdd8012b4
Author: Andras Timar
Date: Thu Jul 5 23:27:53 2018 -0700
Take MsiMsp.Exe from Windows SDK 7.1A
Change-Id: I68914ca86fa9cabaac3ce28d9aa870a522cdb2da
diff --git a/solenv/bin/modules/installer/windows/msp.pm
b/solenv/bin/modules/installer/windows/msp.pm
index 75bcceefcdf8..e76d5da7ab7f 100644
--- a/solenv/bin/modules/installer/windows/msp.pm
+++ b/solenv/bin/modules/installer/windows/msp.pm
@@ -198,7 +198,7 @@ sub execute_msimsp
{
my ($fullpcpfilename, $mspfilename, $localmspdir) = @_;
-my $msimsp = "msimsp.exe"; # Has to be in the path
+my $msimsp = "/cygdrive/c/PROGRA~2/MICROS~1/Windows/v7.1A/Bin/MsiMsp.Exe";
# FIXME Higher versions of Windows SDK do not have mspatchc.dll :(
my $infoline = "";
my $systemcall = "";
my $returnvalue = "";
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - solenv/bin
solenv/bin/ooinstall |5 -
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 12d1b08aac8cc8c3176040efc7290377e380f0c4
Author: Tor Lillqvist
Date: Wed Nov 22 21:05:48 2017 +0200
Use the same solenv/bin/ooinstall as in the cp-5.3 branch
Specifically, pass the correct product name and not a hardcoded
"LibreOffice" for the make_installer.pl script's -p option.
As such, instsetoo_native/util/openoffice.lst.in hardcodes the product
name as "CollaboraOffice" so we could as well do that also in
ooinstall.
(cherry picked from commit 852ffcae172c8ce1536f847410d94b6fcb486b96)
Change-Id: I9b2d84bcc18e21b325960f7057e259daa37234a5
Reviewed-on: https://gerrit.libreoffice.org/55640
Reviewed-by: Andras Timar
Tested-by: Andras Timar
diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall
index 83507a7bf647..9495cb01a88b 100755
--- a/solenv/bin/ooinstall
+++ b/solenv/bin/ooinstall
@@ -89,11 +89,14 @@ if ($destdir && "$ENV{DESTDIR}" ne "/" && -d
"$ENV{DESTDIR}") {
print "Running LibreOffice installer\n";
+my $PRODUCTNAME_no_spaces = $ENV{PRODUCTNAME};
+$PRODUCTNAME_no_spaces =~ s/ //g;
+
system ("cd $ENV{SRC_ROOT}/instsetoo_native/util ; " .
"perl " .
(scalar keys(%DB::sub) ? "-d " : "") .
"-w $ENV{SRCDIR}/solenv/bin/make_installer.pl " .
-"-f $ENV{BUILDDIR}/instsetoo_native/util/openoffice.lst -l $langs -p
LibreOffice " .
+"-f $ENV{BUILDDIR}/instsetoo_native/util/openoffice.lst -l $langs -p
$PRODUCTNAME_no_spaces " .
"-u $tmp_dir " .
"-buildid $BUILD $destdir $strip $msi " .
"-simple $path") && die "Failed to install: $!";
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - solenv/bin
solenv/bin/modules/installer/windows/admin.pm |1 +
1 file changed, 1 insertion(+)
New commits:
commit d5b4196c987210e1163445cbe86e1bb49bcf1f8b
Author: Andras Timar
Date: Sun Jun 3 12:34:00 2018 -0700
MSP: add System64 folder path
Change-Id: I5dba3dfb3a68d33608f2c2a7db026063063982ec
diff --git a/solenv/bin/modules/installer/windows/admin.pm
b/solenv/bin/modules/installer/windows/admin.pm
index 54396ac27835..f822afe7eaec 100644
--- a/solenv/bin/modules/installer/windows/admin.pm
+++ b/solenv/bin/modules/installer/windows/admin.pm
@@ -289,6 +289,7 @@ sub create_directory_structure
}
# FIXME why is this hack needed? ERROR: Did not find full directory path
for dir: "ystemFolder_x86_VC.194841A2_D0F2_3B96_9F71_05BA91BEA0FA"
$fullpathhash{"SystemFolder_x86_VC.194841A2_D0F2_3B96_9F71_05BA91BEA0FA"}
= $targetdir . $installer::globals::separator . "System";
+
$fullpathhash{"System64Folder_amd64_VC.AF4EABEE_4589_3789_BA0A_C83A71662E1D"} =
$targetdir . $installer::globals::separator . "System64";
return \%fullpathhash;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
