[Libreoffice-commits] .: 5 commits - config_host.mk.in configure.ac ct2n/delzip ct2n/description-en-US.txt ct2n/Extension_ct2n.mk ct2n/Makefile ct2n/makefile.mk ct2n/Module_ct2n.mk ct2n/prj ct2n/UnpackedTarball_ct2n.mk dictionaries Makefile.top nlpsolver/src ooo.lst.in reportbuilder/util RepositoryModule_ooo.mk scripting/source sdext/source solenv/gbuild swext/mediawiki
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Tue Oct 23 11:45:53 PDT 2012
Makefile.top | 2
RepositoryModule_ooo.mk | 1
config_host.mk.in | 1
configure.ac | 2
ct2n/Extension_ct2n.mk | 55 ++++++++
ct2n/Makefile | 7 +
ct2n/Module_ct2n.mk | 21 +++
ct2n/UnpackedTarball_ct2n.mk | 21 +++
ct2n/delzip | 2
ct2n/description-en-US.txt | 4
ct2n/makefile.mk | 66 ----------
ct2n/prj/build.lst | 5
ct2n/prj/d.lst | 1
dictionaries | 2
nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/META-INF/manifest.xml | 9 +
nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/manifest.xml | 9 -
ooo.lst.in | 2
reportbuilder/util/META-INF/manifest.xml | 53 ++++++++
reportbuilder/util/manifest.xml | 53 --------
scripting/source/pyprov/META-INF/manifest.xml | 24 +++
scripting/source/pyprov/manifest.xml | 24 ---
sdext/source/minimizer/META-INF/manifest.xml | 31 ++++
sdext/source/minimizer/manifest.xml | 31 ----
sdext/source/pdfimport/META-INF/manifest.xml | 31 ++++
sdext/source/pdfimport/manifest.xml | 31 ----
sdext/source/presenter/META-INF/manifest.xml | 33 +++++
sdext/source/presenter/manifest.xml | 33 -----
solenv/gbuild/Dictionary.mk | 2
solenv/gbuild/Extension.mk | 17 ++
solenv/gbuild/ExtensionTarget.mk | 42 +++++-
solenv/gbuild/UnpackedTarball.mk | 4
swext/mediawiki/src/META-INF/manifest.xml | 42 ++++++
swext/mediawiki/src/manifest.xml | 42 ------
33 files changed, 396 insertions(+), 307 deletions(-)
New commits:
commit e90e4df7ae3cad005932733dc46c61cef3ec38b3
Author: Michael Stahl <mstahl at redhat.com>
Date: Tue Oct 23 19:20:16 2012 +0200
gbuild: UnpackedTarball: clean final target too
Change-Id: I02b1935a50ad1befe9630be8bd07792370d83bfe
diff --git a/solenv/gbuild/UnpackedTarball.mk b/solenv/gbuild/UnpackedTarball.mk
index 53a4715..55113c2 100644
--- a/solenv/gbuild/UnpackedTarball.mk
+++ b/solenv/gbuild/UnpackedTarball.mk
@@ -180,6 +180,7 @@ $(call gb_UnpackedTarball_get_clean_target,%) :
$(call gb_Output_announce,$*,$(false),PAT,2)
$(call gb_Helper_abbreviate_dirs,\
rm -rf \
+ $(call gb_UnpackedTarball_get_final_target,$*) \
$(call gb_UnpackedTarball_get_target,$*) \
$(call gb_UnpackedTarball_get_preparation_target,$*) \
$(call gb_UnpackedTarball_get_dir,$*) \
commit 1a53b377d8423b1d214f0cbeacc98b0e9afe81c2
Author: Michael Stahl <mstahl at redhat.com>
Date: Tue Oct 23 20:07:10 2012 +0200
dictionaries
Change-Id: I6c909d2cc643c77b0d7d3ee0d426d42c9cafce83
diff --git a/dictionaries b/dictionaries
index a5162a2..c918f1d 160000
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit a5162a210e3ff07e44307dbf60717d5d5a40608d
+Subproject commit c918f1d4242d9fd9a8de284e6b32b8c00e59debe
commit 10f4e767f004dc464a244618fc611bc700c6cb74
Author: Michael Stahl <mstahl at redhat.com>
Date: Tue Oct 23 18:58:35 2012 +0200
gbuild: let ExtensionTarget expect manifest below META-INF
Change-Id: Ia07d3fd856578ab6976c02f8a0ec96273db19a2c
diff --git a/ct2n/UnpackedTarball_ct2n.mk b/ct2n/UnpackedTarball_ct2n.mk
index 633436c..f307046 100644
--- a/ct2n/UnpackedTarball_ct2n.mk
+++ b/ct2n/UnpackedTarball_ct2n.mk
@@ -16,13 +16,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,ConvertTextToNumber,\
ct2n/ConvertTextToNumber-1.3.2-no-visible-by-default.patch \
))
-# adjustments for using Extension class
-# 1. manifest.xml is expected in root directory
-$(eval $(call gb_UnpackedTarball_set_post_action,ConvertTextToNumber,\
- mv $(call gb_UnpackedTarball_get_dir,ConvertTextToNumber)/META-INF/manifest.xml \
- $(call gb_UnpackedTarball_get_dir,ConvertTextToNumber) \
-))
-
$(eval $(call gb_UnpackedTarball_mark_output_file,ConvertTextToNumber,description.xml))
# vim: set noet sw=4 ts=4:
diff --git a/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/META-INF/manifest.xml b/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/META-INF/manifest.xml
new file mode 100644
index 0000000..0867cdd
--- /dev/null
+++ b/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/META-INF/manifest.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<manifest:manifest xmlns:manifest="http://openoffice.org/2001/manifest">
+ <manifest:file-entry manifest:media-type="application/vnd.sun.star.uno-components"
+ manifest:full-path="components.rdb"/>
+ <manifest:file-entry manifest:media-type="application/vnd.sun.star.help"
+ manifest:full-path="help"/>
+ <manifest:file-entry manifest:media-type="application/vnd.sun.star.package-bundle-description"
+ manifest:full-path="description/extensiondescription.txt"/>
+</manifest:manifest>
\ No newline at end of file
diff --git a/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/manifest.xml b/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/manifest.xml
deleted file mode 100644
index 0867cdd..0000000
--- a/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/manifest.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<manifest:manifest xmlns:manifest="http://openoffice.org/2001/manifest">
- <manifest:file-entry manifest:media-type="application/vnd.sun.star.uno-components"
- manifest:full-path="components.rdb"/>
- <manifest:file-entry manifest:media-type="application/vnd.sun.star.help"
- manifest:full-path="help"/>
- <manifest:file-entry manifest:media-type="application/vnd.sun.star.package-bundle-description"
- manifest:full-path="description/extensiondescription.txt"/>
-</manifest:manifest>
\ No newline at end of file
diff --git a/reportbuilder/util/META-INF/manifest.xml b/reportbuilder/util/META-INF/manifest.xml
new file mode 100644
index 0000000..ee6b809
--- /dev/null
+++ b/reportbuilder/util/META-INF/manifest.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE manifest:manifest PUBLIC "-//OpenOffice.org//DTD Manifest 1.0//EN" "Manifest.dtd">
+<!--
+ * 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 .
+-->
+<manifest:manifest xmlns:manifest="http://openoffice.org/2001/manifest">
+ <manifest:file-entry manifest:media-type="application/vnd.sun.star.uno-components"
+ manifest:full-path="components.rdb"/>
+ <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
+ manifest:full-path="registry/data/org/openoffice/Office/Accelerators.xcu"/>
+ <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
+ manifest:full-path="registry/data/org/openoffice/Office/DataAccess.xcu"/>
+ <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
+ manifest:full-path="registry/data/org/openoffice/Office/Embedding.xcu"/>
+ <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
+ manifest:full-path="registry/data/org/openoffice/Office/ExtendedColorScheme.xcu"/>
+ <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
+ manifest:full-path="registry/data/org/openoffice/Office/Paths.xcu"/>
+ <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
+ manifest:full-path="registry/data/org/openoffice/Office/ReportDesign.xcu"/>
+ <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
+ manifest:full-path="registry/data/org/openoffice/Office/UI/Controller.xcu"/>
+ <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
+ manifest:full-path="registry/data/org/openoffice/Office/UI/DbReportWindowState.xcu"/>
+ <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
+ manifest:full-path="registry/data/org/openoffice/Office/UI/ReportCommands.xcu"/>
+ <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
+ manifest:full-path="registry/data/org/openoffice/Setup.xcu"/>
+ <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
+ manifest:full-path="registry/data/org/openoffice/TypeDetection/Filter.xcu"/>
+ <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
+ manifest:full-path="registry/data/org/openoffice/TypeDetection/Types.xcu"/>
+ <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-schema"
+ manifest:full-path="registry/schema/org/openoffice/Office/ReportDesign.xcs"/>
+ <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-schema"
+ manifest:full-path="registry/schema/org/openoffice/Office/UI/DbReportWindowState.xcs"/>
+ <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-schema"
+ manifest:full-path="registry/schema/org/openoffice/Office/UI/ReportCommands.xcs"/>
+</manifest:manifest>
diff --git a/reportbuilder/util/manifest.xml b/reportbuilder/util/manifest.xml
deleted file mode 100644
index ee6b809..0000000
--- a/reportbuilder/util/manifest.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE manifest:manifest PUBLIC "-//OpenOffice.org//DTD Manifest 1.0//EN" "Manifest.dtd">
-<!--
- * 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 .
--->
-<manifest:manifest xmlns:manifest="http://openoffice.org/2001/manifest">
- <manifest:file-entry manifest:media-type="application/vnd.sun.star.uno-components"
- manifest:full-path="components.rdb"/>
- <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
- manifest:full-path="registry/data/org/openoffice/Office/Accelerators.xcu"/>
- <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
- manifest:full-path="registry/data/org/openoffice/Office/DataAccess.xcu"/>
- <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
- manifest:full-path="registry/data/org/openoffice/Office/Embedding.xcu"/>
- <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
- manifest:full-path="registry/data/org/openoffice/Office/ExtendedColorScheme.xcu"/>
- <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
- manifest:full-path="registry/data/org/openoffice/Office/Paths.xcu"/>
- <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
- manifest:full-path="registry/data/org/openoffice/Office/ReportDesign.xcu"/>
- <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
- manifest:full-path="registry/data/org/openoffice/Office/UI/Controller.xcu"/>
- <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
- manifest:full-path="registry/data/org/openoffice/Office/UI/DbReportWindowState.xcu"/>
- <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
- manifest:full-path="registry/data/org/openoffice/Office/UI/ReportCommands.xcu"/>
- <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
- manifest:full-path="registry/data/org/openoffice/Setup.xcu"/>
- <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
- manifest:full-path="registry/data/org/openoffice/TypeDetection/Filter.xcu"/>
- <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
- manifest:full-path="registry/data/org/openoffice/TypeDetection/Types.xcu"/>
- <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-schema"
- manifest:full-path="registry/schema/org/openoffice/Office/ReportDesign.xcs"/>
- <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-schema"
- manifest:full-path="registry/schema/org/openoffice/Office/UI/DbReportWindowState.xcs"/>
- <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-schema"
- manifest:full-path="registry/schema/org/openoffice/Office/UI/ReportCommands.xcs"/>
-</manifest:manifest>
diff --git a/scripting/source/pyprov/META-INF/manifest.xml b/scripting/source/pyprov/META-INF/manifest.xml
new file mode 100644
index 0000000..7a8f084
--- /dev/null
+++ b/scripting/source/pyprov/META-INF/manifest.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE manifest:manifest PUBLIC "-//OpenOffice.org//DTD Manifest 1.0//EN" "Manifest.dtd">
+<!--
+ * 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 .
+-->
+<manifest:manifest xmlns:manifest="http://openoffice.org/2001/manifest">
+ <manifest:file-entry
+ manifest:media-type="application/vnd.sun.star.uno-components"
+ manifest:full-path="components.rdb"/>
+</manifest:manifest>
diff --git a/scripting/source/pyprov/manifest.xml b/scripting/source/pyprov/manifest.xml
deleted file mode 100644
index 7a8f084..0000000
--- a/scripting/source/pyprov/manifest.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE manifest:manifest PUBLIC "-//OpenOffice.org//DTD Manifest 1.0//EN" "Manifest.dtd">
-<!--
- * 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 .
--->
-<manifest:manifest xmlns:manifest="http://openoffice.org/2001/manifest">
- <manifest:file-entry
- manifest:media-type="application/vnd.sun.star.uno-components"
- manifest:full-path="components.rdb"/>
-</manifest:manifest>
diff --git a/sdext/source/minimizer/META-INF/manifest.xml b/sdext/source/minimizer/META-INF/manifest.xml
new file mode 100644
index 0000000..a70fe27
--- /dev/null
+++ b/sdext/source/minimizer/META-INF/manifest.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE manifest:manifest PUBLIC "-//OpenOffice.org//DTD Manifest 1.0//EN" "Manifest.dtd">
+<!--
+ * 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 .
+ -->
+<manifest:manifest xmlns:manifest="http://openoffice.org/2001/manifest">
+ <manifest:file-entry manifest:media-type="application/vnd.sun.star.uno-components;platform=@PLATFORM@"
+ manifest:full-path="components.rdb"/>
+ <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-schema"
+ manifest:full-path="registry/schema/org/openoffice/Office/extension/SunPresentationMinimizer.xcs"/>
+ <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
+ manifest:full-path="registry/data/org/openoffice/Office/extension/SunPresentationMinimizer.xcu"/>
+ <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
+ manifest:full-path="registry/data/org/openoffice/Office/Addons.xcu"/>
+ <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
+ manifest:full-path="registry/data/org/openoffice/Office/ProtocolHandler.xcu"/>
+</manifest:manifest>
diff --git a/sdext/source/minimizer/manifest.xml b/sdext/source/minimizer/manifest.xml
deleted file mode 100644
index a70fe27..0000000
--- a/sdext/source/minimizer/manifest.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE manifest:manifest PUBLIC "-//OpenOffice.org//DTD Manifest 1.0//EN" "Manifest.dtd">
-<!--
- * 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 .
- -->
-<manifest:manifest xmlns:manifest="http://openoffice.org/2001/manifest">
- <manifest:file-entry manifest:media-type="application/vnd.sun.star.uno-components;platform=@PLATFORM@"
- manifest:full-path="components.rdb"/>
- <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-schema"
- manifest:full-path="registry/schema/org/openoffice/Office/extension/SunPresentationMinimizer.xcs"/>
- <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
- manifest:full-path="registry/data/org/openoffice/Office/extension/SunPresentationMinimizer.xcu"/>
- <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
- manifest:full-path="registry/data/org/openoffice/Office/Addons.xcu"/>
- <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
- manifest:full-path="registry/data/org/openoffice/Office/ProtocolHandler.xcu"/>
-</manifest:manifest>
diff --git a/sdext/source/pdfimport/META-INF/manifest.xml b/sdext/source/pdfimport/META-INF/manifest.xml
new file mode 100644
index 0000000..2c23a78
--- /dev/null
+++ b/sdext/source/pdfimport/META-INF/manifest.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE manifest:manifest PUBLIC "-//OpenOffice.org//DTD Manifest 1.0//EN" "Manifest.dtd">
+<!--
+ * 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 .
+ -->
+<manifest:manifest xmlns:manifest="http://openoffice.org/2001/manifest">
+ <manifest:file-entry manifest:media-type="application/vnd.sun.star.uno-components;platform=@PLATFORM@"
+ manifest:full-path="components.rdb"/>
+ <manifest:file-entry manifest:media-type="application/vnd.sun.star.executable"
+ manifest:full-path="xpdfimport at EXEC_EXTENSION@"/>
+ <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
+ manifest:full-path="pdf_import_filter.xcu"/>
+ <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
+ manifest:full-path="pdf_types.xcu"/>
+ <manifest:file-entry manifest:media-type="application/vnd.sun.star.basic-library"
+ manifest:full-path="basic/"/>
+</manifest:manifest>
diff --git a/sdext/source/pdfimport/manifest.xml b/sdext/source/pdfimport/manifest.xml
deleted file mode 100644
index 2c23a78..0000000
--- a/sdext/source/pdfimport/manifest.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE manifest:manifest PUBLIC "-//OpenOffice.org//DTD Manifest 1.0//EN" "Manifest.dtd">
-<!--
- * 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 .
- -->
-<manifest:manifest xmlns:manifest="http://openoffice.org/2001/manifest">
- <manifest:file-entry manifest:media-type="application/vnd.sun.star.uno-components;platform=@PLATFORM@"
- manifest:full-path="components.rdb"/>
- <manifest:file-entry manifest:media-type="application/vnd.sun.star.executable"
- manifest:full-path="xpdfimport at EXEC_EXTENSION@"/>
- <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
- manifest:full-path="pdf_import_filter.xcu"/>
- <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
- manifest:full-path="pdf_types.xcu"/>
- <manifest:file-entry manifest:media-type="application/vnd.sun.star.basic-library"
- manifest:full-path="basic/"/>
-</manifest:manifest>
diff --git a/sdext/source/presenter/META-INF/manifest.xml b/sdext/source/presenter/META-INF/manifest.xml
new file mode 100644
index 0000000..a25f22f
--- /dev/null
+++ b/sdext/source/presenter/META-INF/manifest.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE manifest:manifest PUBLIC "-//OpenOffice.org//DTD Manifest 1.0//EN" "Manifest.dtd">
+<!--
+ * 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 .
+ -->
+<manifest:manifest xmlns:manifest="http://openoffice.org/2001/manifest">
+ <manifest:file-entry manifest:media-type="application/vnd.sun.star.uno-components;platform=@PLATFORM@"
+ manifest:full-path="components.rdb"/>
+ <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
+ manifest:full-path="registry/data/org/openoffice/Office/Jobs.xcu"/>
+ <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
+ manifest:full-path="registry/data/org/openoffice/Office/ProtocolHandler.xcu"/>
+ <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
+ manifest:full-path="registry/data/org/openoffice/Office/extension/PresenterScreen.xcu"/>
+ <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-schema"
+ manifest:full-path="registry/schema/org/openoffice/Office/extension/PresenterScreen.xcs"/>
+ <manifest:file-entry manifest:media-type="application/vnd.sun.star.help"
+ manifest:full-path="help"/>
+</manifest:manifest>
diff --git a/sdext/source/presenter/manifest.xml b/sdext/source/presenter/manifest.xml
deleted file mode 100644
index a25f22f..0000000
--- a/sdext/source/presenter/manifest.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE manifest:manifest PUBLIC "-//OpenOffice.org//DTD Manifest 1.0//EN" "Manifest.dtd">
-<!--
- * 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 .
- -->
-<manifest:manifest xmlns:manifest="http://openoffice.org/2001/manifest">
- <manifest:file-entry manifest:media-type="application/vnd.sun.star.uno-components;platform=@PLATFORM@"
- manifest:full-path="components.rdb"/>
- <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
- manifest:full-path="registry/data/org/openoffice/Office/Jobs.xcu"/>
- <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
- manifest:full-path="registry/data/org/openoffice/Office/ProtocolHandler.xcu"/>
- <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
- manifest:full-path="registry/data/org/openoffice/Office/extension/PresenterScreen.xcu"/>
- <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-schema"
- manifest:full-path="registry/schema/org/openoffice/Office/extension/PresenterScreen.xcs"/>
- <manifest:file-entry manifest:media-type="application/vnd.sun.star.help"
- manifest:full-path="help"/>
-</manifest:manifest>
diff --git a/solenv/gbuild/ExtensionTarget.mk b/solenv/gbuild/ExtensionTarget.mk
index 286e9d7..f9c1ec3 100644
--- a/solenv/gbuild/ExtensionTarget.mk
+++ b/solenv/gbuild/ExtensionTarget.mk
@@ -118,7 +118,7 @@ $(call gb_ExtensionTarget_get_target,%) : \
mkdir -p $(call gb_ExtensionTarget_get_rootdir,$*)/META-INF \
$(if $(LICENSE),$(call gb_ExtensionTarget_get_rootdir,$*)/registration) && \
$(call gb_ExtensionTarget__subst_platform,$(call gb_ExtensionTarget_get_workdir,$*)/description.xml,$(call gb_ExtensionTarget_get_rootdir,$*)/description.xml) && \
- $(call gb_ExtensionTarget__subst_platform,$(LOCATION)/manifest.xml,$(call gb_ExtensionTarget_get_rootdir,$*)/META-INF/manifest.xml) && \
+ $(call gb_ExtensionTarget__subst_platform,$(LOCATION)/META-INF/manifest.xml,$(call gb_ExtensionTarget_get_rootdir,$*)/META-INF/manifest.xml) && \
$(if $(LICENSE),cp -f $(LICENSE) $(call gb_ExtensionTarget_get_rootdir,$*)/registration &&) \
$(if $(and $(gb_ExtensionTarget_TRANS_LANGS),$(DESCRIPTION)),cp $(foreach lang,$(gb_ExtensionTarget_TRANS_LANGS),$(call gb_ExtensionTarget_get_workdir,$*)/description-$(lang).txt) $(call gb_ExtensionTarget_get_rootdir,$*) &&) \
cd $(call gb_ExtensionTarget_get_rootdir,$*) && \
@@ -138,7 +138,7 @@ $(call gb_ExtensionTarget_get_target,$(1)) : LOCATION := $(2)
$(call gb_ExtensionTarget_get_target,$(1)) : PLATFORM := $(PLATFORMID)
$(call gb_ExtensionTarget_get_target,$(1)) : PRJNAME := $(firstword $(subst /, ,$(2)))
$(call gb_ExtensionTarget_get_workdir,$(1))/description.xml : \
- $(SRCDIR)/$(2)/description.xml
+ $(2)/description.xml
$(call gb_ExtensionTarget_get_workdir,$(1))/description.xml :| \
$(call gb_ExtensionTarget__get_preparation_target,$(1))
diff --git a/swext/mediawiki/src/META-INF/manifest.xml b/swext/mediawiki/src/META-INF/manifest.xml
new file mode 100644
index 0000000..ab4d105
--- /dev/null
+++ b/swext/mediawiki/src/META-INF/manifest.xml
@@ -0,0 +1,42 @@
+<?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 .
+-->
+<manifest:manifest xmlns:manifest="http://openoffice.org/2001/manifest">
+ <manifest:file-entry manifest:media-type="application/vnd.sun.star.uno-components"
+ manifest:full-path="components.rdb"/>
+ <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
+ manifest:full-path="Addons.xcu"/>
+ <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
+ manifest:full-path="ProtocolHandler.xcu"/>
+ <manifest:file-entry manifest:full-path="WikiEditor/"
+ manifest:media-type="application/vnd.sun.star.basic-library"/>
+ <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-schema"
+ manifest:full-path="WikiExtension.xcs"/>
+ <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
+ manifest:full-path="WikiExtension.xcu"/>
+ <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
+ manifest:full-path="OptionsDialog.xcu"/>
+ <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
+ manifest:full-path="Filter.xcu"/>
+ <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
+ manifest:full-path="Types.xcu"/>
+ <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
+ manifest:full-path="Paths.xcu"/>
+ <manifest:file-entry manifest:media-type="application/vnd.sun.star.help"
+ manifest:full-path="help"/>
+</manifest:manifest>
diff --git a/swext/mediawiki/src/manifest.xml b/swext/mediawiki/src/manifest.xml
deleted file mode 100644
index ab4d105..0000000
--- a/swext/mediawiki/src/manifest.xml
+++ /dev/null
@@ -1,42 +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 .
--->
-<manifest:manifest xmlns:manifest="http://openoffice.org/2001/manifest">
- <manifest:file-entry manifest:media-type="application/vnd.sun.star.uno-components"
- manifest:full-path="components.rdb"/>
- <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
- manifest:full-path="Addons.xcu"/>
- <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
- manifest:full-path="ProtocolHandler.xcu"/>
- <manifest:file-entry manifest:full-path="WikiEditor/"
- manifest:media-type="application/vnd.sun.star.basic-library"/>
- <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-schema"
- manifest:full-path="WikiExtension.xcs"/>
- <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
- manifest:full-path="WikiExtension.xcu"/>
- <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
- manifest:full-path="OptionsDialog.xcu"/>
- <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
- manifest:full-path="Filter.xcu"/>
- <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
- manifest:full-path="Types.xcu"/>
- <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
- manifest:full-path="Paths.xcu"/>
- <manifest:file-entry manifest:media-type="application/vnd.sun.star.help"
- manifest:full-path="help"/>
-</manifest:manifest>
commit 76146f2f8d537c1942aa3a3288893363cadb1390
Author: Michael Stahl <mstahl at redhat.com>
Date: Tue Oct 23 18:46:31 2012 +0200
gbuild: make ct2n module work
- add a preparation target to ExtensionTarget so added files can depend
on unpacked tarball or custom target
- add a "nodefaults" mode to Extension to disable some stuff
Change-Id: I1fce6e948cef0a6d976e2e6555ef5c5f8e90cffb
diff --git a/ct2n/Extension_ct2n.mk b/ct2n/Extension_ct2n.mk
index 37c3187..c052cda 100644
--- a/ct2n/Extension_ct2n.mk
+++ b/ct2n/Extension_ct2n.mk
@@ -8,13 +8,14 @@
#
$(eval $(call gb_Extension_Extension,ConvertTextToNumber,\
- workdir/$(INPATH_FOR_BUILD)/UnpackedTarball/ConvertTextToNumber))
+ $(call gb_UnpackedTarball_get_dir,ConvertTextToNumber),nodefaults))
CT2N_DIR := $(call gb_UnpackedTarball_get_dir,ConvertTextToNumber)
+$(eval $(call gb_Extension_use_unpacked,ConvertTextToNumber,ConvertTextToNumber))
+
# we have our own LICENSE file; force using it instead of the default one
-$(call gb_ExtensionTarget_get_target,ConvertTextToNumber) : \
- LICENSE := $(CT2N_DIR)/registration/LICENSE
+$(call gb_Extension_set_license,ConvertTextToNumber,$(CT2N_DIR)/registration/COPYING)
$(eval $(call gb_Extension_add_files,ConvertTextToNumber,,\
$(CT2N_DIR)/Addons.xcu \
diff --git a/ct2n/UnpackedTarball_ct2n.mk b/ct2n/UnpackedTarball_ct2n.mk
index 7239d8a..633436c 100644
--- a/ct2n/UnpackedTarball_ct2n.mk
+++ b/ct2n/UnpackedTarball_ct2n.mk
@@ -11,10 +11,6 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,ConvertTextToNumber))
$(eval $(call gb_UnpackedTarball_set_tarball,ConvertTextToNumber,$(CT2N_TARBALL),0))
-# Extension class requires description-en-US.txt file
-$(eval $(call gb_UnpackedTarball_add_file,ConvertTextToNumber,\
- description-en-US.txt,ct2n/description-en-US.txt))
-
$(eval $(call gb_UnpackedTarball_add_patches,ConvertTextToNumber,\
ct2n/ConvertTextToNumber-1.3.2-no-license.patch \
ct2n/ConvertTextToNumber-1.3.2-no-visible-by-default.patch \
@@ -22,12 +18,11 @@ $(eval $(call gb_UnpackedTarball_add_patches,ConvertTextToNumber,\
# adjustments for using Extension class
# 1. manifest.xml is expected in root directory
-# 2. LICENSE file is required, reuse existing COPYING
$(eval $(call gb_UnpackedTarball_set_post_action,ConvertTextToNumber,\
mv $(call gb_UnpackedTarball_get_dir,ConvertTextToNumber)/META-INF/manifest.xml \
- $(call gb_UnpackedTarball_get_dir,ConvertTextToNumber) && \
- mv $(call gb_UnpackedTarball_get_dir,ConvertTextToNumber)/registration/COPYING \
- $(call gb_UnpackedTarball_get_dir,ConvertTextToNumber)/registration/LICENSE \
+ $(call gb_UnpackedTarball_get_dir,ConvertTextToNumber) \
))
+$(eval $(call gb_UnpackedTarball_mark_output_file,ConvertTextToNumber,description.xml))
+
# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/Dictionary.mk b/solenv/gbuild/Dictionary.mk
index c40e376..be81ef5 100644
--- a/solenv/gbuild/Dictionary.mk
+++ b/solenv/gbuild/Dictionary.mk
@@ -62,7 +62,7 @@ gb_Dictionary_extensionname = Dictionary/$(1)
#
# gb_Dictionary_Dictionary dictionary srcdir
define gb_Dictionary_Dictionary
-$(call gb_ExtensionTarget_ExtensionTarget,$(call gb_Dictionary_extensionname,$(1)),$(2))
+$(call gb_ExtensionTarget_ExtensionTarget,$(call gb_Dictionary_extensionname,$(1)),$(SRCDIR)/$(2))
$(call gb_Dictionary_add_root_file,$(1),$(2)/$(gb_Dictionary_CONFIGURATION_FILE))
$(call gb_Dictionary_get_target,$(1)) : $(call gb_ExtensionTarget_get_target,$(call gb_Dictionary_extensionname,$(1)))
diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk
index 281bac8..d2f29fc 100644
--- a/solenv/gbuild/Extension.mk
+++ b/solenv/gbuild/Extension.mk
@@ -28,9 +28,11 @@
# Extension class
define gb_Extension_Extension
-$(call gb_ExtensionTarget_ExtensionTarget,$(1),$(2))
-$(call gb_ExtensionTarget_use_default_license,$(1))
-$(call gb_ExtensionTarget_use_default_description,$(1),$(2))
+$(call gb_ExtensionTarget_ExtensionTarget,$(1),$(if $(filter nodefaults,$(3)),$(2),$(SRCDIR)/$(2)))
+$(if $(filter nodefaults,$(3)),,\
+ $(call gb_ExtensionTarget_use_default_license,$(1)))
+$(if $(filter nodefaults,$(3)),,\
+ $(call gb_ExtensionTarget_use_default_description,$(1),$(2)))
$(call gb_Extension_get_target,$(1)) : $(call gb_ExtensionTarget_get_target,$(1))
$(call gb_Extension_get_clean_target,$(1)) : $(call gb_ExtensionTarget_get_clean_target,$(1))
@@ -41,6 +43,10 @@ $$(eval $$(call gb_Module_register_target,$(call gb_Extension_get_target,$(1)),$
endef
+define gb_Extension_set_license
+$(call gb_ExtensionTarget_set_license,$(1),$(2))
+endef
+
define gb_Extension_add_file
$(call gb_ExtensionTarget_add_file,$(1),$(2),$(3))
@@ -122,6 +128,11 @@ $(call gb_ExtensionTarget_add_helptreefile,$(1),$(2),$(3),$(4),$(5))
endef
+define gb_Extension_use_unpacked
+$(call gb_ExtensionTarget_use_unpacked,$(1),$(2))
+
+endef
+
define gb_Extension_use_package
$(call gb_ExtensionTarget_use_package,$(1),$(2))
diff --git a/solenv/gbuild/ExtensionTarget.mk b/solenv/gbuild/ExtensionTarget.mk
index eb45785..286e9d7 100644
--- a/solenv/gbuild/ExtensionTarget.mk
+++ b/solenv/gbuild/ExtensionTarget.mk
@@ -30,6 +30,8 @@
# platform
# gb_ExtensionTarget_LICENSEFILE_DEFAULT
+gb_ExtensionTarget__get_preparation_target = $(WORKDIR)/ExtensionTarget/$(1).prepare
+
gb_ExtensionTarget_ZIPCOMMAND := zip $(if $(findstring s,$(MAKEFLAGS)),-q)
gb_ExtensionTarget_XRMEXTARGET := $(call gb_Executable_get_target_for_build,xrmex)
gb_ExtensionTarget_XRMEXCOMMAND := \
@@ -79,9 +81,15 @@ $(call gb_ExtensionTarget_get_clean_target,%) :
$(call gb_Output_announce,$*,$(false),OXT,3)
$(call gb_Helper_abbreviate_dirs,\
rm -f -r $(call gb_ExtensionTarget_get_workdir,$*) && \
- rm -f $(call gb_ExtensionTarget_get_target,$*) \
+ rm -f $(call gb_ExtensionTarget__get_preparation_target,$*) \
+ $(call gb_ExtensionTarget_get_target,$*) \
)
+# preparation target to delay adding files produced by e.g. UnpackedTarball
+$(call gb_ExtensionTarget__get_preparation_target,%) :
+ $(call gb_Helper_abbreviate_dirs,\
+ mkdir -p $(dir $@) && touch $@)
+
ifeq ($(strip $(gb_WITH_LANG)),)
$(call gb_ExtensionTarget_get_workdir,%)/description.xml :
$(call gb_Output_announce,$*/description.xml,$(true),CPY,3)
@@ -126,10 +134,14 @@ define gb_ExtensionTarget_ExtensionTarget
$(call gb_ExtensionTarget_get_target,$(1)) : DESCRIPTION :=
$(call gb_ExtensionTarget_get_target,$(1)) : FILES := META-INF description.xml
$(call gb_ExtensionTarget_get_target,$(1)) : LICENSE :=
-$(call gb_ExtensionTarget_get_target,$(1)) : LOCATION := $(SRCDIR)/$(2)
+$(call gb_ExtensionTarget_get_target,$(1)) : LOCATION := $(2)
$(call gb_ExtensionTarget_get_target,$(1)) : PLATFORM := $(PLATFORMID)
$(call gb_ExtensionTarget_get_target,$(1)) : PRJNAME := $(firstword $(subst /, ,$(2)))
-$(call gb_ExtensionTarget_get_workdir,$(1))/description.xml : $(SRCDIR)/$(2)/description.xml
+$(call gb_ExtensionTarget_get_workdir,$(1))/description.xml : \
+ $(SRCDIR)/$(2)/description.xml
+$(call gb_ExtensionTarget_get_workdir,$(1))/description.xml :| \
+ $(call gb_ExtensionTarget__get_preparation_target,$(1))
+
ifneq ($(strip $(gb_WITH_LANG)),)
$(call gb_ExtensionTarget_get_target,$(1)) : SDF := $(gb_SDFLOCATION)/$(2)/localize.sdf
$(call gb_ExtensionTarget_get_workdir,$(1))/description.xml : $(gb_SDFLOCATION)/$(2)/localize.sdf
@@ -147,6 +159,14 @@ $(call gb_ExtensionTarget_get_target,$(1)) : $(gb_ExtensionTarget_LICENSEFILE_DE
endef
+define gb_ExtensionTarget_add_license
+$(call gb_ExtensionTarget_get_target,$(1)) : FILES += registration
+$(call gb_ExtensionTarget_get_target,$(1)) : LICENSE := $(2)
+$(call gb_ExtensionTarget_get_target,$(1)) : $(2)
+$(2) :| $(call gb_ExtensionTarget__get_preparation_target,$(1))
+
+endef
+
# Use the default description file
define gb_ExtensionTarget_use_default_description
$(call gb_ExtensionTarget_add_file,$(1),description-en-US.txt,$(SRCDIR)/$(2)/description-en-US.txt)
@@ -165,6 +185,7 @@ endef
define gb_ExtensionTarget_add_file
$(call gb_ExtensionTarget_get_target,$(1)) : FILES += $(2)
$(call gb_ExtensionTarget_get_target,$(1)) : $(call gb_ExtensionTarget_get_rootdir,$(1))/$(2)
+$(3) :| $(call gb_ExtensionTarget__get_preparation_target,$(1))
$(call gb_ExtensionTarget_get_rootdir,$(1))/$(2) : $(3)
mkdir -p $$(dir $$@) && \
cp -f $(if $(4),$(4),$(3)) $$@
@@ -214,6 +235,8 @@ $(call gb_ExtensionTarget_get_rootdir,$(1))/$(2) : SDF := $(gb_SDFLOCATION)$(sub
$(call gb_ExtensionTarget_get_rootdir,$(1))/$(2) : $(gb_SDFLOCATION)$(subst $(SRCDIR),,$(dir $(3)))localize.sdf
endif
$(call gb_ExtensionTarget_get_target,$(1)) : $(call gb_ExtensionTarget_get_rootdir,$(1))/$(2)
+$(call gb_ExtensionTarget_get_rootdir,$(1))/$(2) \
+ :| $(call gb_ExtensionTarget__get_preparation_target,$(1))
$(call gb_ExtensionTarget_get_rootdir,$(1))/$(2) : $(3) \
$(gb_ExtensionTarget_PROPMERGETARGET)
$$(call gb_Output_announce,$(2),$(true),PRP,3)
@@ -377,12 +400,21 @@ define gb_ExtensionTarget__add_compiled_help_dependency_onelang
$(call gb_ExtensionTarget_get_target,$(1)) : FILES += help/$(2)
$(call gb_ExtensionTarget_get_target,$(1)) : \
$(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(2).done
+$(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(2).done \
+ :| $(call gb_ExtensionTarget__get_preparation_target,$(1))
endef
+define gb_ExtensionTarget_use_unpacked
+$(call gb_ExtensionTarget__get_preparation_target,$(1)) \
+ :| $(call gb_UnpackedTarball_get_final_target,$(2))
+
+endef
+
define gb_ExtensionTarget_use_package
-$(call gb_ExtensionTarget_get_target,$(1)) : $(call gb_Package_get_target,$(2))
+$(call gb_ExtensionTarget__get_preparation_target,$(1)) \
+ :| $(call gb_Package_get_target,$(2))
endef
commit 97d83c45faf42ada9993239c3835641d8bbd070f
Author: David Ostrovsky <david at ostrovsky.org>
Date: Sat Oct 20 10:05:45 2012 -0700
gbuildification of ct2n
Conflicts:
config_host.mk.in
Change-Id: I98ca1bb2af19d99a7a908991cf27a148ee84c543
diff --git a/Makefile.top b/Makefile.top
index 821631d..2b1acea 100644
--- a/Makefile.top
+++ b/Makefile.top
@@ -62,6 +62,7 @@ cppcanvas\
cppu\
cppuhelper\
cpputools\
+ct2n\
cui\
dbaccess\
desktop\
@@ -206,7 +207,6 @@ binfilter \
cairo\
cppunit\
crashrep\
-ct2n\
curl\
epm\
expat\
diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index ffc605b..557e179 100644
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@ -59,6 +59,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
cppu \
cppuhelper \
cpputools \
+ $(call gb_Helper_optional,CT2N,ct2n) \
cui \
dbaccess \
desktop \
diff --git a/config_host.mk.in b/config_host.mk.in
index e867c57..0ea224e 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -85,6 +85,7 @@ export CPUNAME=@CPUNAME@
export CPUNAME_FOR_BUILD=@CPUNAME_FOR_BUILD@
export CPU_FOR_BUILD=@CPU_FOR_BUILD@
export CROSS_COMPILING=@CROSS_COMPILING@
+export CT2N_TARBALL=@CT2N_TARBALL@
export CURL_CFLAGS=@CURL_CFLAGS@
export CURL_LIBS=@CURL_LIBS@
export CXX=@CXX@
diff --git a/configure.ac b/configure.ac
index 29804ec..a76c6b3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11060,10 +11060,12 @@ AC_MSG_CHECKING([for ConvertTextToNumber extension integration])
if test "x$enable_ext_ct2n" = "xyes" -a "x$enable_extension_integration" != "xno"; then
BUILD_TYPE="$BUILD_TYPE CT2N"
SCPDEFS="$SCPDEFS -DWITH_EXTENSION_CT2N"
+ CT2N_TARBALL="451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt"
AC_MSG_RESULT([yes])
else
AC_MSG_RESULT([no])
fi
+AC_SUBST([CT2N_TARBALL])
dnl ===================================================================
dnl Test whether to include Numbertext extension
diff --git a/ct2n/Extension_ct2n.mk b/ct2n/Extension_ct2n.mk
new file mode 100644
index 0000000..37c3187
--- /dev/null
+++ b/ct2n/Extension_ct2n.mk
@@ -0,0 +1,54 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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/.
+#
+
+$(eval $(call gb_Extension_Extension,ConvertTextToNumber,\
+ workdir/$(INPATH_FOR_BUILD)/UnpackedTarball/ConvertTextToNumber))
+
+CT2N_DIR := $(call gb_UnpackedTarball_get_dir,ConvertTextToNumber)
+
+# we have our own LICENSE file; force using it instead of the default one
+$(call gb_ExtensionTarget_get_target,ConvertTextToNumber) : \
+ LICENSE := $(CT2N_DIR)/registration/LICENSE
+
+$(eval $(call gb_Extension_add_files,ConvertTextToNumber,,\
+ $(CT2N_DIR)/Addons.xcu \
+))
+
+$(eval $(call gb_Extension_add_files,ConvertTextToNumber,CT2N,\
+ $(CT2N_DIR)/CT2N/MainCode.xba \
+ $(CT2N_DIR)/CT2N/ToClipbord.xba \
+ $(CT2N_DIR)/CT2N/Language.xba \
+ $(CT2N_DIR)/CT2N/dialog.xlb \
+ $(CT2N_DIR)/CT2N/dlgCode.xba \
+ $(CT2N_DIR)/CT2N/script.xlb \
+ $(CT2N_DIR)/CT2N/dlgCT2N.xdl \
+ $(CT2N_DIR)/CT2N/UserSettings.xba \
+))
+
+$(eval $(call gb_Extension_add_files,ConvertTextToNumber,Office/UI,\
+ $(CT2N_DIR)/Office/UI/BaseWindowState.xcu \
+ $(CT2N_DIR)/Office/UI/ImpressWindowState.xcu \
+ $(CT2N_DIR)/Office/UI/StartModuleWindowState.xcu \
+ $(CT2N_DIR)/Office/UI/BasicIDEWindowState.xcu \
+ $(CT2N_DIR)/Office/UI/CalcWindowState.xcu \
+ $(CT2N_DIR)/Office/UI/WriterWindowState.xcu \
+ $(CT2N_DIR)/Office/UI/DrawWindowState.xcu \
+ $(CT2N_DIR)/Office/UI/MathWindowState.xcu \
+))
+
+$(eval $(call gb_Extension_add_files,ConvertTextToNumber,icons,\
+ $(CT2N_DIR)/icons/image1_26.bmp \
+ $(CT2N_DIR)/icons/image1_16.bmp \
+))
+
+$(eval $(call gb_Extension_add_files,ConvertTextToNumber,pkg-desc,\
+ $(CT2N_DIR)/pkg-desc/pkg-description.txt \
+))
+
+# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/ct2n/Makefile b/ct2n/Makefile
new file mode 100644
index 0000000..ccb1c85
--- /dev/null
+++ b/ct2n/Makefile
@@ -0,0 +1,7 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
+
+include $(module_directory)/../solenv/gbuild/partial_build.mk
+
+# vim: set noet sw=4 ts=4:
diff --git a/ct2n/Module_ct2n.mk b/ct2n/Module_ct2n.mk
new file mode 100644
index 0000000..3fdb546
--- /dev/null
+++ b/ct2n/Module_ct2n.mk
@@ -0,0 +1,21 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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/.
+#
+
+$(eval $(call gb_Module_Module,ConvertTextToNumber))
+
+ifneq (,$(filter CT2N,$(BUILD_TYPE)))
+
+$(eval $(call gb_Module_add_targets,ConvertTextToNumber,\
+ UnpackedTarball_ct2n \
+ Extension_ct2n \
+))
+
+endif
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/ct2n/UnpackedTarball_ct2n.mk b/ct2n/UnpackedTarball_ct2n.mk
new file mode 100644
index 0000000..7239d8a
--- /dev/null
+++ b/ct2n/UnpackedTarball_ct2n.mk
@@ -0,0 +1,33 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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/.
+#
+
+$(eval $(call gb_UnpackedTarball_UnpackedTarball,ConvertTextToNumber))
+
+$(eval $(call gb_UnpackedTarball_set_tarball,ConvertTextToNumber,$(CT2N_TARBALL),0))
+
+# Extension class requires description-en-US.txt file
+$(eval $(call gb_UnpackedTarball_add_file,ConvertTextToNumber,\
+ description-en-US.txt,ct2n/description-en-US.txt))
+
+$(eval $(call gb_UnpackedTarball_add_patches,ConvertTextToNumber,\
+ ct2n/ConvertTextToNumber-1.3.2-no-license.patch \
+ ct2n/ConvertTextToNumber-1.3.2-no-visible-by-default.patch \
+))
+
+# adjustments for using Extension class
+# 1. manifest.xml is expected in root directory
+# 2. LICENSE file is required, reuse existing COPYING
+$(eval $(call gb_UnpackedTarball_set_post_action,ConvertTextToNumber,\
+ mv $(call gb_UnpackedTarball_get_dir,ConvertTextToNumber)/META-INF/manifest.xml \
+ $(call gb_UnpackedTarball_get_dir,ConvertTextToNumber) && \
+ mv $(call gb_UnpackedTarball_get_dir,ConvertTextToNumber)/registration/COPYING \
+ $(call gb_UnpackedTarball_get_dir,ConvertTextToNumber)/registration/LICENSE \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/ct2n/delzip b/ct2n/delzip
deleted file mode 100644
index 00d6fa1..0000000
--- a/ct2n/delzip
+++ /dev/null
@@ -1,2 +0,0 @@
-*.orig
-so_*_ct2n
diff --git a/ct2n/description-en-US.txt b/ct2n/description-en-US.txt
new file mode 100644
index 0000000..a91393b
--- /dev/null
+++ b/ct2n/description-en-US.txt
@@ -0,0 +1,4 @@
+From [http://extensions.libreoffice.org/extension-center/ct2n-convert-text-to-number-and-dates].
+
+ConvertTextToNumber replaces numbers and dates, formatted
+ as text, with real numbers.
diff --git a/ct2n/makefile.mk b/ct2n/makefile.mk
deleted file mode 100644
index 0a4a7b7..0000000
--- a/ct2n/makefile.mk
+++ /dev/null
@@ -1,66 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=.
-
-PRJNAME=ct2n
-TARGET=ct2n
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-
-TARFILE_MD5=451ccf439a36a568653b024534669971
-TARFILE_NAME=ConvertTextToNumber-1.3.2
-TARFILE_ROOTDIR=.
-BUILD_DIR=.
-
-PATCH_FILES=\
- ConvertTextToNumber-1.3.2-no-license.patch \
- ConvertTextToNumber-1.3.2-no-visible-by-default.patch
-
-CONFIGURE_DIR=
-CONFIGURE_ACTION=
-CONFIGURE_FLAGS=
-BUILD_ACTION=
-
-ZIP1TARGET=ConvertTextToNumber
-ZIP1EXT=.oxt
-ZIP1FLAGS=-u -r
-ZIP1DIR=$(MISC)/build$/$(TARFILE_ROOTDIR)
-ZIP1LIST= * -x "*.orig" -x "so_*_ct2n"
-ZIP1DEPS=$(PACKAGE_DIR)/$(PREDELIVER_FLAG_FILE)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : set_ext.mk
-.INCLUDE : tg_ext.mk
-.INCLUDE : target.mk
-
-ZIP1TARGET : $(PACKAGE_DIR)/$(PREDELIVER_FLAG_FILE)
diff --git a/ct2n/prj/build.lst b/ct2n/prj/build.lst
index 714d926..a594256 100644
--- a/ct2n/prj/build.lst
+++ b/ct2n/prj/build.lst
@@ -1,3 +1,2 @@
-ct2n ct2n : solenv NULL
-ct2n ct2n usr1 - all ct2n_mkout NULL
-ct2n ct2n nmake - all ct2n_ct2n NULL
+ct2n ct2n : solenv NULL
+ct2n ct2n\prj nmake - all ct2n_ct2n NULL
diff --git a/ct2n/prj/d.lst b/ct2n/prj/d.lst
index bb394d5..e69de29 100644
--- a/ct2n/prj/d.lst
+++ b/ct2n/prj/d.lst
@@ -1 +0,0 @@
-..\%__SRC%\bin\ConvertTextToNumber*.oxt %_DEST%\bin\*
diff --git a/ct2n/prj/dmake b/ct2n/prj/dmake
deleted file mode 100644
index e69de29..0000000
diff --git a/ooo.lst.in b/ooo.lst.in
index 0b64496..755daa9 100644
--- a/ooo.lst.in
+++ b/ooo.lst.in
@@ -45,7 +45,7 @@ a7d6c5f2fe2d481149ed3ba807b5c043-gdk-pixbuf-2.23.0.tar.gz
2ab442d169156f34c379c968f3f482dd-zlib-1.2.7.tar.bz2
0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
7c53f83e0327343f4060c0eb83842daf-icu4c-49_1_1-src.tgz
-451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt
+ at CT2N_TARBALL@
0f63ee487fda8f21fafa767b3c447ac9-ixion-0.2.0.tar.gz
a0a861f539f0e7a91d05e6b9457e4db1-nss-3.13.5-with-nspr-4.9.1.tar.gz
3121aaf3e13e5d88dfff13fb4a5f1ab8-hunspell-1.3.2.tar.gz
diff --git a/solenv/gbuild/UnpackedTarball.mk b/solenv/gbuild/UnpackedTarball.mk
index 7312362..53a4715 100644
--- a/solenv/gbuild/UnpackedTarball.mk
+++ b/solenv/gbuild/UnpackedTarball.mk
@@ -73,6 +73,9 @@ $(call gb_UnpackedTarget_get_target,%).tgz :
$(call gb_UnpackedTarget_get_target,%).zip :
$(call gb_UnpackedTarget__command,unzip,$@,$*)
+$(call gb_UnpackedTarget_get_target,%).oxt :
+ $(call gb_UnpackedTarget__command,unzip,$@,$*)
+
.PHONY : $(call gb_UnpackedTarget_get_clean_target,%)
$(call gb_UnpackedTarget_get_clean_target,%) :
$(call gb_Output_announce,$*,$(false),UPK,1)
More information about the Libreoffice-commits
mailing list