smoketest/Extension_TestExtension.mk | 14 +++
smoketest/Module_smoketest.mk | 3
smoketest/Package_smoketestdoc.mk | 14 +++
smoketest/Zip_TestExtension.mk | 48 ----------
smoketest/Zip_smoketestdoc.mk | 10 --
smoketest/com/sun/star/comp/smoketest/META-INF/manifest.xml | 4
smoketest/com/sun/star/comp/smoketest/description.xml | 26 +++++
smoketest/com/sun/star/comp/smoketest/manifest.xml | 4
ure/Module_ure.mk | 2
ure/Package_uretest.mk | 32 -------
ure/Zip_uretest.mk | 53 ------------
11 files changed, 60 insertions(+), 150 deletions(-)
New commits:
commit f33b292d541a54c7d9033b04dc1de191c1513a3c
Author: David Tardon <dtar...@redhat.com>
Date: Sun Apr 21 12:22:12 2013 +0200
gbuild: use Package for delivering smoketestdoc.sxw
Change-Id: I056a9457aee725e1c8f992ee2553e79f536920ee
diff --git a/smoketest/Module_smoketest.mk b/smoketest/Module_smoketest.mk
index 25ca96c..61e93ae 100644
--- a/smoketest/Module_smoketest.mk
+++ b/smoketest/Module_smoketest.mk
@@ -32,6 +32,7 @@ ifeq ($(CROSS_COMPILING),)
$(eval $(call gb_Module_add_targets,smoketest,\
Library_smoketest \
Package_losmoketest \
+ Package_smoketestdoc \
Zip_smoketestdoc \
))
diff --git a/smoketest/Package_smoketestdoc.mk
b/smoketest/Package_smoketestdoc.mk
new file mode 100644
index 0000000..cac1d65
--- /dev/null
+++ b/smoketest/Package_smoketestdoc.mk
@@ -0,0 +1,14 @@
+# -*- 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_Package_Package,smoketestdoc,$(WORKDIR)/Zip))
+
+$(eval $(call
gb_Package_add_file,smoketestdoc,bin/smoketestdoc.sxw,smoketestdoc.zip))
+
+# vim: set noet sw=4 ts=4:
diff --git a/smoketest/Zip_smoketestdoc.mk b/smoketest/Zip_smoketestdoc.mk
index d39e9f1..6823e52 100644
--- a/smoketest/Zip_smoketestdoc.mk
+++ b/smoketest/Zip_smoketestdoc.mk
@@ -52,14 +52,4 @@ $(eval $(call
gb_Zip_add_file,smoketestdoc,Dialogs/dialog-lc.xml))
$(eval $(call gb_Zip_add_file,smoketestdoc,Dialogs/Standard/dialog-lb.xml))
$(eval $(call gb_Zip_add_file,smoketestdoc,Dialogs/Standard/OptionsDlg.xml))
-$(call gb_Zip_get_final_target,smoketestdoc) : $(OUTDIR)/bin/smoketestdoc.sxw
-$(call gb_Zip_get_clean_target,smoketestdoc) : Clean_smoketestdoc_sxw
-
-$(OUTDIR)/bin/smoketestdoc.sxw : $(call gb_Zip_get_target,smoketestdoc) |
$(OUTDIR)/bin/.dir
- $(call gb_Deliver_deliver,$<,$@)
-
-.PHONY : Clean_smoketestdoc_sxw
-Clean_smoketestdoc_sxw :
- rm -f $(OUTDIR)/bin/smoketestdoc.sxw
-
# vim: set noet sw=4 ts=4:
commit 940bc35696c9020c8afb134759eb6b7802df7246
Author: David Tardon <dtar...@redhat.com>
Date: Sun Apr 21 12:05:47 2013 +0200
gbuild: use Extension
Change-Id: Ibbcf0ea1744090e0108faf2a617a96177e934aec
diff --git a/smoketest/Extension_TestExtension.mk
b/smoketest/Extension_TestExtension.mk
new file mode 100644
index 0000000..454aede
--- /dev/null
+++ b/smoketest/Extension_TestExtension.mk
@@ -0,0 +1,14 @@
+# -*- 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,TestExtension,smoketest/com/sun/star/comp/smoketest))
+
+$(eval $(call gb_Extension_add_file,TestExtension,TestExtension.jar,$(call
gb_Jar_get_outdir_target,TestExtension)))
+
+# vim: set noet sw=4 ts=4:
diff --git a/smoketest/Module_smoketest.mk b/smoketest/Module_smoketest.mk
index 31efcce..25ca96c 100644
--- a/smoketest/Module_smoketest.mk
+++ b/smoketest/Module_smoketest.mk
@@ -37,8 +37,8 @@ $(eval $(call gb_Module_add_targets,smoketest,\
ifneq ($(SOLAR_JAVA),)
$(eval $(call gb_Module_add_targets,smoketest,\
+ Extension_TestExtension \
Jar_TestExtension \
- Zip_TestExtension \
))
endif
diff --git a/smoketest/Zip_TestExtension.mk b/smoketest/Zip_TestExtension.mk
deleted file mode 100644
index b332f43..0000000
--- a/smoketest/Zip_TestExtension.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Copyright (C) 2012 Matúš Kukan <matus.ku...@gmail.com> (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-$(eval $(call gb_Zip_Zip,TestExtension,$(WORKDIR)/Zip/TestExtension))
-
-$(eval $(call gb_Zip_add_file,TestExtension,TestExtension.jar,\
- $(call gb_Jar_get_outdir_target,TestExtension) \
-))
-
-$(eval $(call gb_Zip_add_file,TestExtension,META-INF/manifest.xml,\
- $(SRCDIR)/smoketest/com/sun/star/comp/smoketest/manifest.xml \
-))
-
-$(call gb_Zip_get_final_target,TestExtension) : $(OUTDIR)/bin/TestExtension.oxt
-$(call gb_Zip_get_clean_target,TestExtension) : Clean_TestExtension_oxt
-
-$(OUTDIR)/bin/TestExtension.oxt : $(call gb_Zip_get_target,TestExtension)
- $(call gb_Deliver_deliver,$<,$@)
-
-.PHONY : Clean_TestExtension_oxt
-Clean_TestExtension_oxt :
- rm -f $(OUTDIR)/bin/TestExtension.oxt
-
-# vim: set noet sw=4 ts=4:
diff --git a/smoketest/com/sun/star/comp/smoketest/manifest.xml
b/smoketest/com/sun/star/comp/smoketest/META-INF/manifest.xml
similarity index 100%
rename from smoketest/com/sun/star/comp/smoketest/manifest.xml
rename to smoketest/com/sun/star/comp/smoketest/META-INF/manifest.xml
diff --git a/smoketest/com/sun/star/comp/smoketest/description.xml
b/smoketest/com/sun/star/comp/smoketest/description.xml
new file mode 100644
index 0000000..7d25919
--- /dev/null
+++ b/smoketest/com/sun/star/comp/smoketest/description.xml
@@ -0,0 +1,26 @@
+<?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 .
+ -->
+
+<d:description xmlns:d="http://openoffice.org/extensions/description/2006";>
+ <d:identifier value="smoketest.TestExtension"/>
+ <d:version value="1"/>
+ <d:dependencies>
+ <d:OpenOffice.org-minimal-version d:name="OpenOffice.org 2.3" value="2.3"/>
+ </d:dependencies>
+</d:description>
commit 14fb27c209d9d9cf8bd75f87005da8a0a42eeb8f
Author: David Tardon <dtar...@redhat.com>
Date: Sun Apr 21 11:10:53 2013 +0200
uretest.zip is not installed -> don't build it
If anyone wants to do anything with it, there are the sources (but quick
look at ure/source/uretest/Makefile suggests it is dmake, so good luck
with that .-) Maybe it is just another relic of the past that can be
removed?
Change-Id: I44b4a36d89a5617d5dba9e063e8b8b19c1dba240
diff --git a/ure/Module_ure.mk b/ure/Module_ure.mk
index 169307a..3530e28 100644
--- a/ure/Module_ure.mk
+++ b/ure/Module_ure.mk
@@ -29,9 +29,7 @@ $(eval $(call gb_Module_Module,ure))
$(eval $(call gb_Module_add_targets,ure,\
Package_distribution \
- Package_uretest \
Rdb_ure \
- Zip_uretest \
))
# vim:set noet sw=4 ts=4:
diff --git a/ure/Package_uretest.mk b/ure/Package_uretest.mk
deleted file mode 100644
index 8589162..0000000
--- a/ure/Package_uretest.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtar...@redhat.com>
-# (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-$(eval $(call gb_Package_Package,ure_uretest,$(patsubst %/,%,$(dir $(call
gb_Zip_get_target,uretest)))))
-
-$(eval $(call gb_Package_add_file,ure_uretest,bin/uretest.zip,uretest.zip))
-
-# vim:set noet sw=4 ts=4:
diff --git a/ure/Zip_uretest.mk b/ure/Zip_uretest.mk
deleted file mode 100644
index 38c9871..0000000
--- a/ure/Zip_uretest.mk
+++ /dev/null
@@ -1,53 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtar...@redhat.com>
-# (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-$(eval $(call gb_Zip_Zip,uretest,$(SRCDIR)/ure/source))
-
-$(eval $(call gb_Zip_add_files,uretest,\
- uretest/JavaClient.java \
- uretest/JavaMain.java \
- uretest/JavaNative.java \
- uretest/JavaTest.java \
- uretest/Makefile \
- uretest/Makefile.pln \
- uretest/README \
- uretest/Runner.java \
- uretest/Tester.java \
- uretest/cppmain.cc \
- uretest/cppserver.cc \
- uretest/cpptest.cc \
- uretest/javaclient.mf.template \
- uretest/javamain.mf.template \
- uretest/javanative.mf.template \
- uretest/javatest.mf.template \
- uretest/runner.mf.template \
- uretest/tester.mf.template \
- uretest/types.idl \
- uretest/types.mf.template \
-))
-
-# vim:set noet sw=4 ts=4:
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
