From 051fdda153d45789c6eb1a0ec32dbd32dfd8a978 Mon Sep 17 00:00:00 2001 From: Matúš Kukan Date: Sat, 17 Dec 2011 14:55:08 +0100 Subject: cppu: convert to gbuild Because of unit tests is here custom target where are idl files processed. --- cppu/qa/Makefile | 48 ++++++++++++++++++ cppu/qa/cppumaker/makefile.mk | 80 ------------------------------ cppu/qa/makefile.mk | 113 ------------------------------------------ 3 files changed, 48 insertions(+), 193 deletions(-) create mode 100644 cppu/qa/Makefile delete mode 100644 cppu/qa/cppumaker/makefile.mk delete mode 100644 cppu/qa/makefile.mk (limited to 'cppu/qa') diff --git a/cppu/qa/Makefile b/cppu/qa/Makefile new file mode 100644 index 000000000000..99a7eec22be3 --- /dev/null +++ b/cppu/qa/Makefile @@ -0,0 +1,48 @@ +# -*- Mode: makefile; 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) 2011 Matúš Kukan (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. + +gb_PARTIALBUILD:=T +include $(GBUILDDIR)/gbuild_simple.mk + +all: qa/cppumaker.flag qa/cppumaker/cppumaker.flag + +%/cppumaker.flag: %/cppumaker.rdb + $(call gb_Helper_abbreviate_dirs_native, \ + $(call gb_Helper_execute,cppumaker) -O. -BUCR -C $< $(OUTDIR_FOR_BUILD)/bin/udkapi.rdb) + touch $@ + +%/cppumaker.rdb: %/types.urd + $(call gb_Helper_abbreviate_dirs_native, \ + $(call gb_Helper_execute,regmerge) $@ /UCR $<) + +%/types.urd: $(SRCDIR)/cppu/%/types.idl + $(call gb_Helper_abbreviate_dirs_native, \ + $(call gb_Helper_execute,idlc) -O$* -I$(OUTDIR_FOR_BUILD)/idl -cid -we $<) + +.DEFAULT_GOAL:=all +.PHONY: all +# vim: set noet sw=4 ts=4: diff --git a/cppu/qa/cppumaker/makefile.mk b/cppu/qa/cppumaker/makefile.mk deleted file mode 100644 index e8f7d7dd4401..000000000000 --- a/cppu/qa/cppumaker/makefile.mk +++ /dev/null @@ -1,80 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# 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 -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ := ../.. -PRJNAME := cppu -TARGET := test_cppumaker - -ENABLE_EXCEPTIONS := TRUE -VISIBILITY_HIDDEN=TRUE - -.INCLUDE: settings.mk - -.IF "$(CROSS_COMPILING)"=="YES" -all: - @echo Nothing done when cross-compiling -.ENDIF - -CFLAGSCXX += $(CPPUNIT_CFLAGS) - -DLLPRE = # no leading "lib" on .so files - -INCPRE += $(MISC)/$(TARGET)/inc - -SHL1TARGET = $(TARGET) -SHL1OBJS = $(SLO)/test_cppumaker.obj -SHL1STDLIBS = $(CPPULIB) $(CPPUNITLIB) $(SALLIB) -SHL1USE_EXPORTS = name -SHL1IMPLIB = i$(SHL1TARGET) -DEF1NAME = $(SHL1TARGET) - -SLOFILES = $(SHL1OBJS) - -.INCLUDE: target.mk - -.IF "$(depend)" == "" -ALLTAR: test -.END - -$(SHL1OBJS): $(MISC)/$(TARGET).cppumaker.flag - -$(MISC)/$(TARGET).cppumaker.flag: $(MISC)/$(TARGET).rdb - - $(MKDIRHIER) $(MISC)/$(TARGET)/inc - $(CPPUMAKER) \ - -O$(MISC)/$(TARGET)/inc -BUCR -C $< $(SOLARBINDIR)/udkapi.rdb - $(TOUCH) $@ - -$(MISC)/$(TARGET).rdb: $(MISC)/$(TARGET)/types.urd - - rm -f $@ - $(REGMERGE) $@ /UCR $< - -$(MISC)/$(TARGET)/types.urd: types.idl - - $(MKDIR) $(MISC)/$(TARGET) - $(IDLC) -O$(MISC)/$(TARGET) -I$(SOLARIDLDIR) -cid -we $< - -test .PHONY: $(SHL1TARGETN) - $(CPPUNITTESTER) $< diff --git a/cppu/qa/makefile.mk b/cppu/qa/makefile.mk deleted file mode 100644 index d67184605a20..000000000000 --- a/cppu/qa/makefile.mk +++ /dev/null @@ -1,113 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# 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 -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ := .. -PRJNAME := cppu -TARGET := qa - -ENABLE_EXCEPTIONS := TRUE -VISIBILITY_HIDDEN=TRUE - -.INCLUDE: settings.mk - -CFLAGSCXX+=$(CPPUNIT_CFLAGS) - -.IF "$(OS)" == "IOS" -CFLAGSCXX += $(OBJCXXFLAGS) -.ENDIF - -DLLPRE=# no leading "lib" on .so files - -INCPRE+=$(MISC)$/$(TARGET)$/inc - -SHL1TARGET = $(TARGET)_any -SHL1OBJS = $(SLO)$/test_any.obj -SHL1STDLIBS = $(CPPULIB) $(CPPUNITLIB) $(SALLIB) -SHL1USE_EXPORTS = name -SHL1IMPLIB = i$(SHL1TARGET) -DEF1NAME = $(SHL1TARGET) - -SHL2TARGET = $(TARGET)_unotype -SHL2OBJS = $(SLO)$/test_unotype.obj -SHL2STDLIBS = $(CPPULIB) $(CPPUNITLIB) $(SALLIB) -SHL2USE_EXPORTS = name -SHL2IMPLIB = i$(SHL2TARGET) -DEF2NAME = $(SHL2TARGET) - -SHL3TARGET = $(TARGET)_reference -SHL3OBJS = $(SLO)$/test_reference.obj -SHL3STDLIBS = $(CPPULIB) $(CPPUNITLIB) $(SALLIB) -SHL3USE_EXPORTS = name -SHL3IMPLIB = i$(SHL3TARGET) -DEF3NAME = $(SHL3TARGET) - -SHL4TARGET = $(TARGET)_recursion -SHL4OBJS = $(SLO)$/test_recursion.obj -SHL4STDLIBS = $(CPPULIB) $(CPPUNITLIB) $(SALLIB) -SHL4USE_EXPORTS = name -SHL4IMPLIB = i$(SHL4TARGET) -DEF4NAME = $(SHL4TARGET) - -SLOFILES = $(SHL1OBJS) $(SHL2OBJS) $(SHL3OBJS) $(SHL4OBJS) - -.IF "$(OS)" == "IOS no thanks for now" -# Nah, we can't build this here for iOS after all, thanks to having to -# use static linking, we would need to link with -lgcc3_uno from -# bridges which has not been built yet (and which in fact depends on -# cppu...) Seems that any meaningful unit test for iOS actually needs -# to be built in the "subsequent" stage. -APP5OBJS = $(OBJ)/cppu_cppunittester_all.obj $(SHL1OBJS) $(SHL2OBJS) $(SHL3OBJS) $(SHL4OBJS) -APP5RPATH = NONE -APP5STDLIBS = $(CPPUNITLIB) $(CPPULIB) $(SALLIB) -APP5TARGET = cppu_cppunittester_all -.ENDIF - -.INCLUDE: target.mk - -$(SHL1OBJS): $(MISC)$/$(TARGET).cppumaker.flag - -$(SHL2OBJS): $(MISC)$/$(TARGET).cppumaker.flag - -$(SHL3OBJS): $(MISC)$/$(TARGET).cppumaker.flag - -$(SHL4OBJS): $(MISC)$/$(TARGET).cppumaker.flag - -$(MISC)$/$(TARGET).cppumaker.flag: $(MISC)$/$(TARGET).rdb - - $(MKDIRHIER) $(MISC)$/$(TARGET)$/inc - $(CPPUMAKER) -O$(MISC)$/$(TARGET)$/inc -BUCR -C $< \ - $(SOLARBINDIR)$/udkapi.rdb - $(TOUCH) $@ - -$(MISC)$/$(TARGET).rdb: $(MISC)$/$(TARGET)$/types.urd - - $(RM) $@ - $(REGMERGE) $@ /UCR $< - -$(MISC)$/$(TARGET)$/types.urd: types.idl - - $(MKDIR) $(MISC)$/$(TARGET) - $(IDLC) -O$(MISC)$/$(TARGET) -I$(SOLARIDLDIR) -cid -we $< - -.INCLUDE : _cppunit.mk -- cgit