diff options
author | David Tardon <dtardon@redhat.com> | 2013-04-21 12:05:47 +0200 |
---|---|---|
committer | David Tardon <dtardon@redhat.com> | 2013-04-21 17:44:22 +0200 |
commit | 940bc35696c9020c8afb134759eb6b7802df7246 (patch) | |
tree | afda08b2d42184b0391c10a20362e8882a1f314d /smoketest | |
parent | 14fb27c209d9d9cf8bd75f87005da8a0a42eeb8f (diff) |
gbuild: use Extension
Change-Id: Ibbcf0ea1744090e0108faf2a617a96177e934aec
Diffstat (limited to 'smoketest')
-rw-r--r-- | smoketest/Extension_TestExtension.mk | 14 | ||||
-rw-r--r-- | smoketest/Module_smoketest.mk | 2 | ||||
-rw-r--r-- | smoketest/Zip_TestExtension.mk | 48 | ||||
-rw-r--r-- | smoketest/com/sun/star/comp/smoketest/META-INF/manifest.xml (renamed from smoketest/com/sun/star/comp/smoketest/manifest.xml) | 0 | ||||
-rw-r--r-- | smoketest/com/sun/star/comp/smoketest/description.xml | 26 |
5 files changed, 41 insertions, 49 deletions
diff --git a/smoketest/Extension_TestExtension.mk b/smoketest/Extension_TestExtension.mk new file mode 100644 index 000000000000..454aede5a82c --- /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 31efcce58af5..25ca96c9cab3 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 b332f4352665..000000000000 --- 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.kukan@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 index 0e730444291c..0e730444291c 100644 --- a/smoketest/com/sun/star/comp/smoketest/manifest.xml +++ b/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 000000000000..7d25919a5d72 --- /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> |