[Libreoffice-commits] core.git: 2 commits - solenv/gbuild
Michael Stahl
mstahl at redhat.com
Mon Sep 30 03:55:21 PDT 2013
solenv/gbuild/processdelivered.awk | 27 ---------
solenv/gbuild/templates/AllLangResTarget.mk | 40 --------------
solenv/gbuild/templates/CppunitTest.mk | 32 -----------
solenv/gbuild/templates/Executable.mk | 39 --------------
solenv/gbuild/templates/JunitTest.mk | 40 --------------
solenv/gbuild/templates/Library.mk | 76 ----------------------------
solenv/gbuild/templates/Makefile | 15 -----
solenv/gbuild/templates/Module.mk | 36 -------------
solenv/gbuild/templates/Package.mk | 33 ------------
solenv/gbuild/templates/StaticLibrary.mk | 26 ---------
10 files changed, 364 deletions(-)
New commits:
commit 456b470e558b0cb995860b68f3d5fb2bab065423
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Sep 25 22:09:10 2013 +0200
gbuild: remove "templates"
Nobody uses those anyway.
Change-Id: Ifa20827c0526a6eb3c9f554e652a354327282f48
diff --git a/solenv/gbuild/templates/AllLangResTarget.mk b/solenv/gbuild/templates/AllLangResTarget.mk
deleted file mode 100644
index c1bc14d..0000000
--- a/solenv/gbuild/templates/AllLangResTarget.mk
+++ /dev/null
@@ -1,40 +0,0 @@
-#
-# 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 .
-#
-
-# RES is the name of the resource; its file name will be RES-LOCALE.res
-# MODULE is the name of the code module the makefile is located in
-
-$(eval $(call gb_AllLangResTarget_AllLangResTarget,RES))
-
-# declaration of images folder (e.g. icon-themes/(name of theme)/MODULE/res)
-$(eval $(call gb_AllLangResTarget_set_reslocation,RES,MODULE))
-
-# declaration of a resource intermediate file (srs)
-$(eval $(call gb_AllLangResTarget_add_srs,RES, RES/res))
-$(eval $(call gb_SrsTarget_SrsTarget,RES/res))
-
-# add any additional include paths here
-$(eval $(call gb_SrsTarget_set_include,RES/res,\
- $$(INCLUDE) \
-))
-
-# add src files here (complete path relative to repository root)
-$(eval $(call gb_SrsTarget_add_files,RES/res,\
-))
-
-# vim: set noet sw=4:
diff --git a/solenv/gbuild/templates/CppunitTest.mk b/solenv/gbuild/templates/CppunitTest.mk
deleted file mode 100644
index 246ef95..0000000
--- a/solenv/gbuild/templates/CppunitTest.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-# 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 .
-#
-
-$(eval $(call gb_CppunitTest_CppunitTest,MODULE_NAME))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,MODULE_NAME, \
-))
-
-$(eval $(call gb_CppunitTest_use_libraries,MODULE_NAME, \
- $(gb_STDLIBS) \
-))
-
-$(eval $(call gb_CppunitTest_set_include,MODULE_NAME,\
- $$(INCLUDE) \
-))
-
-# vim: set noet sw=4:
diff --git a/solenv/gbuild/templates/Executable.mk b/solenv/gbuild/templates/Executable.mk
deleted file mode 100644
index 35ef29d..0000000
--- a/solenv/gbuild/templates/Executable.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# 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 .
-#
-
-$(eval $(call gb_Executable_Executable,EXEC))
-
-$(eval $(call gb_Executable_set_include,EXEC,\
- $$(INCLUDE) \
-))
-
-#$(eval $(call gb_Executable_add_defs,EXEC,\
-# -Dfoo \
-#))
-
-$(eval $(call gb_Executable_use_libraries,EXEC,\
- $(gb_STDLIBS) \
-))
-
-$(eval $(call gb_Executable_add_exception_objects,EXEC,\
-))
-
-$(eval $(call gb_Executable_set_targettype_gui,EXEC,\
-))
-
-# vim: set noet sw=4:
diff --git a/solenv/gbuild/templates/JunitTest.mk b/solenv/gbuild/templates/JunitTest.mk
deleted file mode 100644
index cdbae77..0000000
--- a/solenv/gbuild/templates/JunitTest.mk
+++ /dev/null
@@ -1,40 +0,0 @@
-#
-# 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 .
-#
-
-$(eval $(call gb_JunitTest_JunitTest,MODULE_TYPE))
-
-$(eval $(call gb_JunitTest_set_defs,MODULE_TYPE,\
- $$(DEFS) \
- -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/MODULE/DOCUMENTPATH \
-))
-
-$(eval $(call gb_JunitTest_use_jars,MODULE_TYPE,\
- $(OUTDIR)/bin/OOoRunner.jar \
- $(OUTDIR)/bin/ridl.jar \
- $(OUTDIR)/bin/test.jar \
- $(OUTDIR)/bin/unoil.jar \
- $(OUTDIR)/bin/jurt.jar \
-))
-
-$(eval $(call gb_JunitTest_add_sourcefiles,MODULE_TYPE,\
-))
-
-$(eval $(call gb_JunitTest_add_classes,MODULE_COMPLEX,\
-))
-
-# vim: set noet sw=4:
diff --git a/solenv/gbuild/templates/Library.mk b/solenv/gbuild/templates/Library.mk
deleted file mode 100644
index a888cec..0000000
--- a/solenv/gbuild/templates/Library.mk
+++ /dev/null
@@ -1,76 +0,0 @@
-#
-# 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 .
-#
-
-# MODULE is the name of the module the makefile is located in
-
-# declare a library
-# LIB is the name of the library as it is found in Repository.mk
-$(eval $(call gb_Library_Library,LIB))
-
-# declare packages that will be delivered before compilation of LIB
-# learn more about TYPE in the Package.mk template
-$(eval $(call gb_Library_use_package,LIB,MODULE_TYPE))
-
-# for platforms supporting PCH: declare the location of the pch file
-# this is the name of the cxx file (without extension)
-$(eval $(call gb_Library_set_precompiled_header,LIB,$(SRCDIR)/MODULE/PCH_FILE))
-
-# in case UNO services are exported: declare location of component file
-$(eval $(call gb_Library_set_componentfile,LIB,MODULE/COMPONENT_FILE))
-
-# add any additional include paths for this library here
-$(eval $(call gb_Library_set_include,LIB,\
- $$(INCLUDE) \
-))
-
-# add any additional definitions to be set for compilation here
-# (e.g. -DLIB_DLLIMPLEMENTATION)
-#$(eval $(call gb_Library_add_defs,LIB,\
-#))
-
-# add libraries to be linked to LIB; again these names need to be given as
-# specified in Repository.mk
-$(eval $(call gb_Library_use_libraries,LIB,\
- $(gb_STDLIBS) \
-))
-
-# add all source files that shall be compiled with exceptions enabled
-# the name is relative to $(SRCROOT) and must not contain an extension
-$(eval $(call gb_Library_add_exception_objects,LIB,\
-))
-
-# in case sdi files need to be processed: declare "root" (main) sdi target and sdi header target
-# "ROOT_SDI_FILE" is the file that is handed over to svidl (all other sdi files are included in the root file)
-$(eval $(call gb_Library_add_sdi_headers,LIB,MODULE/sdi/ROOT_SDI_FILE))
-$(eval $(call gb_SdiTarget_SdiTarget,MODULE/sdi/ROOT_SDI_FILE,MODULE/sdi/LIB))
-
-# add any additional include paths for sdi processing here
-$(eval $(call gb_SdiTarget_set_include,MODULE/sdi/ROOT_SDI_FILE,\
- $$(INCLUDE) \
-))
-
-# this is an example how files can be added that require special compiler settings, e.g. building without optimizing
-ifeq ($(OS),WNT)
-$(eval $(call gb_Library_add_cxxobjects,LIB,\
- MODULE/source/foo/bar \
- , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \
-))
-
-endif
-
-# vim: set noet sw=4:
diff --git a/solenv/gbuild/templates/Makefile b/solenv/gbuild/templates/Makefile
deleted file mode 100644
index 9239582..0000000
--- a/solenv/gbuild/templates/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# -*- 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/.
-#
-
-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/solenv/gbuild/templates/Module.mk b/solenv/gbuild/templates/Module.mk
deleted file mode 100644
index a5bba4f..0000000
--- a/solenv/gbuild/templates/Module.mk
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# 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 .
-#
-
-# replace MODULE by the name of the module you are creating
-
-$(eval $(call gb_Module_Module,MODULE))
-
-# the targets to be inserted are their file names without .mk extension
-$(eval $(call gb_Module_add_targets,MODULE,\
-))
-
-# add any runtime tests (unit tests) here
-# remove if no tests
-$(eval $(call gb_Module_add_check_targets,MODULE,\
-))
-
-# add any subsequent checks (e.g. complex tests) here
-$(eval $(call gb_Module_add_subsequentcheck_targets,MODULE,\
-))
-
-# vim: set noet sw=4:
diff --git a/solenv/gbuild/templates/Package.mk b/solenv/gbuild/templates/Package.mk
deleted file mode 100644
index 4876b52..0000000
--- a/solenv/gbuild/templates/Package.mk
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# 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 .
-#
-
-# MODULE is the name of the module the makefile is located in
-
-# TYPE is an arbitrary name that should denote what is inside this package
-# typical names are "inc", "uiconfig", "xml" etc.
-# "MODULE_TYPE" is the package name
-# the file name of the corresponding makefile should be Package_TYPE.mk
-# SOURCE is the name of the root folder of the package that shall be delivered
-$(eval $(call gb_Package_Package,MODULE_TYPE,$(SRCDIR)/MODULE/SOURCE))
-
-# add files to the package
-# SOURCE_RELPATH/file.ext is the name of the source file (relative to the root give above)
-# DESTINATION_RELPATH/file.ext is the destination file (relative to $(OUTDIR))
-$(eval $(call gb_Package_add_file,MODULE_TYPE,DESTINATION_RELPATH/file.ext,SOURCE_RELPATH/file.ext))
-
-# vim: set noet sw=4:
diff --git a/solenv/gbuild/templates/StaticLibrary.mk b/solenv/gbuild/templates/StaticLibrary.mk
deleted file mode 100644
index 05528af..0000000
--- a/solenv/gbuild/templates/StaticLibrary.mk
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-# 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 .
-#
-
-$(eval $(call gb_StaticLibrary_StaticLibrary,LIB))
-
-$(eval $(call gb_StaticLibrary_use_package,LIB,MODULE_inc))
-
-$(eval $(call gb_StaticLibrary_add_exception_objects,LIB,\
-))
-
-# vim: set noet sw=4:
commit 28b543ce3df3399783f093bf4cff4a745be5ec02
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Sep 25 22:03:42 2013 +0200
gbuild: remove processdelivered.mk
obsolete since 6280f921050e6e879ca752abf4e8fb7553aba6f5.
Change-Id: Idab0c904f05da66956ecbd8a01f3e9d2e2d7c605
diff --git a/solenv/gbuild/processdelivered.awk b/solenv/gbuild/processdelivered.awk
deleted file mode 100644
index 3704a5e..0000000
--- a/solenv/gbuild/processdelivered.awk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# 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 .
-#
-
-BEGIN {
- RS=" "
- FS=":"
-}
-
-{
- if( NF == 2 )
- print "COPY " $1 " " $2;
-}
More information about the Libreoffice-commits
mailing list