[Libreoffice-commits] core.git: 4 commits - bin/verify-custom-widgets-libs filter/Configuration_filter.mk filter/source Makefile.in officecfg/Configuration_officecfg.mk officecfg/registry postprocess/CustomTarget_registry.mk solenv/bin
Michael Stahl
mstahl at redhat.com
Thu Nov 7 22:54:52 CET 2013
Makefile.in | 6
bin/verify-custom-widgets-libs | 2
filter/Configuration_filter.mk | 16 ++
filter/source/config/cache/filtercache.cxx | 6
filter/source/config/fragments/filters/StarBaseReport.xcu | 35 ++++
filter/source/config/fragments/filters/StarBaseReportChart.xcu | 37 +++++
filter/source/config/fragments/filters/StarBaseReportChart_ui.xcu | 22 +++
filter/source/config/fragments/filters/StarBaseReport_ui.xcu | 22 +++
filter/source/config/fragments/types/StarBaseReport.xcu | 43 +++++
filter/source/config/fragments/types/StarBaseReportChart.xcu | 41 +++++
officecfg/Configuration_officecfg.mk | 2
officecfg/registry/data/org/openoffice/TypeDetection/Filter.xcu | 66 ---------
officecfg/registry/data/org/openoffice/TypeDetection/Types.xcu | 72 ----------
postprocess/CustomTarget_registry.mk | 4
solenv/bin/callcatcher.Makefile | 2
solenv/bin/modules/installer/archivefiles.pm | 2
16 files changed, 227 insertions(+), 151 deletions(-)
New commits:
commit 28089fbecc27ab79ddd48f8240352c46b39523e0
Author: Michael Stahl <mstahl at redhat.com>
Date: Thu Nov 7 14:11:06 2013 +0100
officecfg: move the reportbuilder filter configuration to filter/
Change-Id: Ied496ddbc4d5341a8e1e15d760df775eee19f850
diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk
index bbb3892..4f7af96 100644
--- a/filter/Configuration_filter.mk
+++ b/filter/Configuration_filter.mk
@@ -290,6 +290,22 @@ $(call filter_Configuration_add_ui_filters,fcfg_langpack,filter/source/config/fr
StarOffice_XML__Base__ui \
)
+# fcfg_reportbuilder
+$(call filter_Configuration_add_types,fcfg_langpack,fcfg_reportbuilder_types.xcu,filter/source/config/fragments/types,\
+ StarBaseReport \
+ StarBaseReportChart \
+)
+
+$(call filter_Configuration_add_filters,fcfg_langpack,fcfg_reportbuilder_filters.xcu,filter/source/config/fragments/filters,\
+ StarBaseReport \
+ StarBaseReportChart \
+)
+
+$(call filter_Configuration_add_ui_filters,fcfg_langpack,filter/source/config/fragments/filters,\
+ StarBaseReport_ui \
+ StarBaseReportChart_ui \
+)
+
# fcfg_writer
$(call filter_Configuration_add_types,fcfg_langpack,fcfg_writer_types.xcu,filter/source/config/fragments/types,\
generic_HTML \
diff --git a/filter/source/config/fragments/filters/StarBaseReport.xcu b/filter/source/config/fragments/filters/StarBaseReport.xcu
new file mode 100644
index 0000000..7c15cb4
--- /dev/null
+++ b/filter/source/config/fragments/filters/StarBaseReport.xcu
@@ -0,0 +1,35 @@
+<!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+-->
+ <node oor:name="StarOffice XML (Base) Report" oor:op="replace">
+ <prop oor:name="Flags">
+ <value>IMPORT EXPORT OWN DEFAULT 3RDPARTYFILTER NOTINFILEDIALOG NOTINCHOOSER</value>
+ </prop>
+ <prop oor:name="UIComponent"/>
+ <prop oor:name="FilterService"/>
+ <prop oor:name="UserData"/>
+ <prop oor:name="FileFormatVersion">
+ <value>6800</value>
+ </prop>
+ <prop oor:name="Type">
+ <value>StarBaseReport</value>
+ </prop>
+ <prop oor:name="TemplateName"/>
+ <prop oor:name="DocumentService">
+ <value>com.sun.star.report.ReportDefinition</value>
+ </prop>
+ </node>
diff --git a/filter/source/config/fragments/filters/StarBaseReportChart.xcu b/filter/source/config/fragments/filters/StarBaseReportChart.xcu
new file mode 100644
index 0000000..738819c
--- /dev/null
+++ b/filter/source/config/fragments/filters/StarBaseReportChart.xcu
@@ -0,0 +1,37 @@
+<!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+-->
+ <node oor:name="StarOffice XML (Base) Report Chart" oor:op="replace">
+ <prop oor:name="Flags">
+ <value>IMPORT EXPORT OWN DEFAULT NOTINFILEDIALOG NOTINCHOOSER</value>
+ </prop>
+ <prop oor:name="UIComponent"/>
+ <prop oor:name="FilterService">
+ <value>com.sun.star.comp.chart2.report.XMLFilter</value>
+ </prop>
+ <prop oor:name="UserData"/>
+ <prop oor:name="FileFormatVersion">
+ <value>6800</value>
+ </prop>
+ <prop oor:name="Type">
+ <value>StarBaseReportChart</value>
+ </prop>
+ <prop oor:name="TemplateName"/>
+ <prop oor:name="DocumentService">
+ <value>com.sun.star.chart2.ChartDocument</value>
+ </prop>
+ </node>
diff --git a/filter/source/config/fragments/filters/StarBaseReportChart_ui.xcu b/filter/source/config/fragments/filters/StarBaseReportChart_ui.xcu
new file mode 100644
index 0000000..7f9efe9
--- /dev/null
+++ b/filter/source/config/fragments/filters/StarBaseReportChart_ui.xcu
@@ -0,0 +1,22 @@
+<!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+-->
+ <node oor:name="StarOffice XML (Base) Report Chart">
+ <prop oor:name="UIName">
+ <value xml:lang="en-US">OpenOffice.org 1.0 Report Chart</value>
+ </prop>
+ </node>
diff --git a/filter/source/config/fragments/filters/StarBaseReport_ui.xcu b/filter/source/config/fragments/filters/StarBaseReport_ui.xcu
new file mode 100644
index 0000000..d5f07fe
--- /dev/null
+++ b/filter/source/config/fragments/filters/StarBaseReport_ui.xcu
@@ -0,0 +1,22 @@
+<!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+-->
+ <node oor:name="StarOffice XML (Base) Report">
+ <prop oor:name="UIName">
+ <value xml:lang="en-US">ODF Database Report</value>
+ </prop>
+ </node>
diff --git a/filter/source/config/fragments/types/StarBaseReport.xcu b/filter/source/config/fragments/types/StarBaseReport.xcu
new file mode 100644
index 0000000..0489dc7
--- /dev/null
+++ b/filter/source/config/fragments/types/StarBaseReport.xcu
@@ -0,0 +1,43 @@
+<!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+-->
+ <node oor:name="StarBaseReport" oor:op="replace">
+ <prop oor:name="DetectService">
+ <value>com.sun.star.comp.report.ORptTypeDetection</value>
+ </prop>
+ <prop oor:name="URLPattern">
+ <value>private:factory/sreport*</value>
+ </prop>
+ <prop oor:name="Extensions">
+ <value>orp</value>
+ </prop>
+ <prop oor:name="MediaType">
+ <value>application/vnd.sun.xml.report</value>
+ </prop>
+ <prop oor:name="Preferred">
+ <value>false</value>
+ </prop>
+ <prop oor:name="PreferredFilter">
+ <value>StarOffice XML (Base) Report</value>
+ </prop>
+ <prop oor:name="UIName">
+ <value xml:lang="en-US">OpenDocument Database Report</value>
+ </prop>
+ <prop oor:name="ClipboardFormat">
+ <value>StarBaseReport 9.0</value>
+ </prop>
+ </node>
diff --git a/filter/source/config/fragments/types/StarBaseReportChart.xcu b/filter/source/config/fragments/types/StarBaseReportChart.xcu
new file mode 100644
index 0000000..0ef9a54
--- /dev/null
+++ b/filter/source/config/fragments/types/StarBaseReportChart.xcu
@@ -0,0 +1,41 @@
+<!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+-->
+ <node oor:name="StarBaseReportChart" oor:op="replace">
+ <prop oor:name="DetectService"/>
+ <prop oor:name="URLPattern">
+ <value/>
+ </prop>
+ <prop oor:name="Extensions">
+ <value>odc</value>
+ </prop>
+ <prop oor:name="MediaType">
+ <value>application/vnd.sun.xml.report.chart</value>
+ </prop>
+ <prop oor:name="Preferred">
+ <value>false</value>
+ </prop>
+ <prop oor:name="PreferredFilter">
+ <value>StarOffice XML (Base) Report Chart</value>
+ </prop>
+ <prop oor:name="UIName">
+ <value xml:lang="en-US">StarOffice XML (Base) Report Chart 9</value>
+ </prop>
+ <prop oor:name="ClipboardFormat">
+ <value>StarOffice XML (Base) Report Chart 9</value>
+ </prop>
+ </node>
diff --git a/officecfg/Configuration_officecfg.mk b/officecfg/Configuration_officecfg.mk
index 5f0d725..d0a7239 100644
--- a/officecfg/Configuration_officecfg.mk
+++ b/officecfg/Configuration_officecfg.mk
@@ -52,8 +52,6 @@ $(eval $(call gb_Configuration_add_datas,registry,officecfg/registry/data,\
org/openoffice/Office/UI/Controller.xcu \
org/openoffice/Office/UI/Factories.xcu \
org/openoffice/Office/UI/ReportCommands.xcu \
- org/openoffice/TypeDetection/Filter.xcu \
- org/openoffice/TypeDetection/Types.xcu \
org/openoffice/TypeDetection/UISort.xcu \
org/openoffice/ucb/Configuration.xcu \
))
diff --git a/officecfg/registry/data/org/openoffice/TypeDetection/Filter.xcu b/officecfg/registry/data/org/openoffice/TypeDetection/Filter.xcu
deleted file mode 100644
index 973d2e1..0000000
--- a/officecfg/registry/data/org/openoffice/TypeDetection/Filter.xcu
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- -->
-<oor:component-data xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" oor:package="org.openoffice.TypeDetection" oor:name="Filter">
- <node oor:name="Filters">
- <node oor:name="StarOffice XML (Base) Report" oor:op="replace" oor:finalized="false" oor:mandatory="false">
- <prop oor:name="Flags">
- <value>IMPORT EXPORT OWN DEFAULT 3RDPARTYFILTER NOTINFILEDIALOG NOTINCHOOSER</value>
- </prop>
- <prop oor:name="UIComponent"/>
- <prop oor:name="FilterService"/>
- <prop oor:name="UserData"/>
- <prop oor:name="FileFormatVersion">
- <value>6800</value>
- </prop>
- <prop oor:name="Type">
- <value>StarBaseReport</value>
- </prop>
- <prop oor:name="TemplateName"/>
- <prop oor:name="DocumentService">
- <value>com.sun.star.report.ReportDefinition</value>
- </prop>
- <prop oor:name="UIName">
- <value xml:lang="en-US">ODF Database Report</value>
- </prop>
- </node>
- <node oor:name="StarOffice XML (Base) Report Chart" oor:op="replace" oor:finalized="false" oor:mandatory="false">
- <prop oor:name="Flags">
- <value>IMPORT EXPORT OWN DEFAULT NOTINFILEDIALOG NOTINCHOOSER</value>
- </prop>
- <prop oor:name="UIComponent"/>
- <prop oor:name="FilterService">
- <value>com.sun.star.comp.chart2.report.XMLFilter</value>
- </prop>
- <prop oor:name="UserData"/>
- <prop oor:name="FileFormatVersion">
- <value>6800</value>
- </prop>
- <prop oor:name="Type">
- <value>StarBaseReportChart</value>
- </prop>
- <prop oor:name="TemplateName"/>
- <prop oor:name="DocumentService">
- <value>com.sun.star.chart2.ChartDocument</value>
- </prop>
- <prop oor:name="UIName">
- <value xml:lang="en-US">OpenOffice.org 1.0 Report Chart</value>
- </prop>
- </node>
- </node>
-</oor:component-data>
diff --git a/officecfg/registry/data/org/openoffice/TypeDetection/Types.xcu b/officecfg/registry/data/org/openoffice/TypeDetection/Types.xcu
deleted file mode 100644
index e03c730..0000000
--- a/officecfg/registry/data/org/openoffice/TypeDetection/Types.xcu
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- -->
-<oor:component-data xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" oor:package="org.openoffice.TypeDetection" oor:name="Types">
- <node oor:name="Types">
- <node oor:name="StarBaseReport" oor:op="replace">
- <prop oor:name="DetectService">
- <value>com.sun.star.comp.report.ORptTypeDetection</value>
- </prop>
- <prop oor:name="URLPattern">
- <value>private:factory/sreport*</value>
- </prop>
- <prop oor:name="Extensions">
- <value>orp</value>
- </prop>
- <prop oor:name="MediaType">
- <value>application/vnd.sun.xml.report</value>
- </prop>
- <prop oor:name="Preferred">
- <value>false</value>
- </prop>
- <prop oor:name="PreferredFilter">
- <value>StarOffice XML (Base) Report</value>
- </prop>
- <prop oor:name="UIName">
- <value xml:lang="en-US">OpenDocument Database Report</value>
- </prop>
- <prop oor:name="ClipboardFormat">
- <value>StarBaseReport 9.0</value>
- </prop>
- </node>
- <node oor:name="StarBaseReportChart" oor:op="replace">
- <prop oor:name="DetectService"/>
- <prop oor:name="URLPattern">
- <value/>
- </prop>
- <prop oor:name="Extensions">
- <value>odc</value>
- </prop>
- <prop oor:name="MediaType">
- <value>application/vnd.sun.xml.report.chart</value>
- </prop>
- <prop oor:name="Preferred">
- <value>false</value>
- </prop>
- <prop oor:name="PreferredFilter">
- <value>StarOffice XML (Base) Report Chart</value>
- </prop>
- <prop oor:name="UIName">
- <value xml:lang="en-US">StarOffice XML (Base) Report Chart 9</value>
- </prop>
- <prop oor:name="ClipboardFormat">
- <value>StarOffice XML (Base) Report Chart 9</value>
- </prop>
- </node>
- </node>
-</oor:component-data>
diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk
index 7f240b6..c48fdba 100644
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@@ -391,8 +391,8 @@ postprocess_FILES_reportbuilder := \
$(postprocess_XCU)/Office/ReportDesign.xcu \
$(postprocess_XCU)/Office/UI/DbReportWindowState.xcu \
$(postprocess_XCU)/Office/UI/ReportCommands.xcu \
- $(postprocess_XCU)/TypeDetection/Filter.xcu \
- $(postprocess_XCU)/TypeDetection/Types.xcu \
+ $(call gb_XcuFilterFiltersTarget_get_target,fcfg_reportbuilder_filters.xcu) \
+ $(call gb_XcuFilterTypesTarget_get_target,fcfg_reportbuilder_types.xcu) \
$(postprocess_MOD)/org/openoffice/Setup-reportbuilder.xcu \
$(postprocess_MOD)/org/openoffice/Office/Accelerators-reportbuilder.xcu \
$(postprocess_MOD)/org/openoffice/Office/DataAccess-reportbuilder.xcu \
commit 6ab99e0716091d5387ea3766d6917e580a56b8e4
Author: Michael Stahl <mstahl at redhat.com>
Date: Thu Nov 7 22:34:10 2013 +0100
filter: fix error message
Change-Id: I3590e6598371197a6c41977c46e05b9b5d30eb58
diff --git a/filter/source/config/cache/filtercache.cxx b/filter/source/config/cache/filtercache.cxx
index adbb01c..351517b 100644
--- a/filter/source/config/cache/filtercache.cxx
+++ b/filter/source/config/cache/filtercache.cxx
@@ -1162,8 +1162,10 @@ void FilterCache::impl_validateAndOptimize()
aPrefFilter[PROPNAME_TYPE] >>= sFilterTypeReg;
if (sFilterTypeReg != sType)
{
- sLog.append("error\t:\t" "The preferred filter \"" + sPrefFilter + "\" of type \"" + sType +
- "is registered for another type \"" + sFilterTypeReg + "\".\n");
+ sLog.append("error\t:\t" "The preferred filter \""
+ + sPrefFilter + "\" of type \"" + sType +
+ "\" is registered for another type \"" + sFilterTypeReg +
+ "\".\n");
++nErrors;
}
commit bd5a6c285cbfbc77c3daad481687a1287a097a87
Author: Michael Stahl <mstahl at redhat.com>
Date: Thu Nov 7 22:52:43 2013 +0100
a little instdir sub-dir cleanup
Change-Id: I97df3f949da7403e46951cf159a9fc1fca4cc23f
diff --git a/Makefile.in b/Makefile.in
index 4f25895..cb3efcb 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -275,11 +275,11 @@ dev-install:
@echo
@echo "dev-install is obsolete! Just build with \"make check\" and run"
ifeq ($(OS),MACOSX)
- @echo " open instdir/*/$(PRODUCTNAME).app"
+ @echo " open instdir/$(PRODUCTNAME).app"
@echo
- @echo "To debug: gdb instdir/*/$(PRODUCTNAME).app/Contents/MacOS/soffice"
+ @echo "To debug: gdb instdir/$(PRODUCTNAME).app/Contents/MacOS/soffice"
else
- @echo " instdir/*/program/soffice"
+ @echo " instdir/program/soffice"
endif
@echo
@echo "(only if you have good reason to test an actual installation: make test-install)"
diff --git a/bin/verify-custom-widgets-libs b/bin/verify-custom-widgets-libs
index 3337013..b0ea0a5 100755
--- a/bin/verify-custom-widgets-libs
+++ b/bin/verify-custom-widgets-libs
@@ -20,7 +20,7 @@ for foo in $FOO; do
lib=$(echo $foo | cut -f1 -d-)
symbol=$(echo $foo | cut -f2 -d-)
echo testing if lib$lib.so contains make$symbol
- nm -D instdir/unxlng*/program/lib$lib.so | grep make$symbol > /dev/null
+ nm -D instdir/program/lib$lib.so | grep make$symbol > /dev/null
if [ $? != 0 ]; then
echo "MISSING. Windows will crash"
else
diff --git a/solenv/bin/callcatcher.Makefile b/solenv/bin/callcatcher.Makefile
index 58bfe6f..10b09e3 100644
--- a/solenv/bin/callcatcher.Makefile
+++ b/solenv/bin/callcatcher.Makefile
@@ -26,7 +26,7 @@ findunusedcode:
$(GNUMAKE) BUILDDIR=callcatcher -j $(PARALLELISM) $(GMAKE_OPTIONS) -f Makefile.gbuild
$(GNUMAKE) BUILDDIR=callcatcher -j $(PARALLELISM) $(GMAKE_OPTIONS) -f Makefile.gbuild subsequentcheck
callanalyse \
- $(SRCDIR)/instdir/callcatcher/program/* \
+ $(INSTDIR)/program/* \
$(WORKDIR)/LinkTarget/*/* $(WORKDIR)/LinkTarget/*/*/* \
$(WORKDIR)/UnpackedTarball/cppunit/src/cppunit/.libs/libcppunit.so* \
> unusedcode.all
commit b38e996bcee13eacb61f340ccff787806c053ce8
Author: Michael Stahl <mstahl at redhat.com>
Date: Thu Nov 7 21:04:38 2013 +0100
installer: remove unused variable
Change-Id: I03648e07b6f1ab895254c4e2a02717a6a318c783
diff --git a/solenv/bin/modules/installer/archivefiles.pm b/solenv/bin/modules/installer/archivefiles.pm
index e309418..17a6a5f 100644
--- a/solenv/bin/modules/installer/archivefiles.pm
+++ b/solenv/bin/modules/installer/archivefiles.pm
@@ -141,8 +141,6 @@ sub resolving_archive_flag
my ($systemcall, $returnvalue, $infoline);
- my $unziplistfile = $loggingdir . "unziplist_" . $installer::globals::build . "_" . $installer::globals::compiler . "_" . $$languagestringref . ".txt";
-
my $platformunzipdirbase = installer::systemactions::create_directories("zip", $languagestringref);
push(@installer::globals::removedirs, $platformunzipdirbase);
More information about the Libreoffice-commits
mailing list